From a207347e2c9d748ee183fba991e88581ff249fc0 Mon Sep 17 00:00:00 2001 From: Anatoli Beliaev Date: Wed, 4 Dec 2019 15:54:49 -0800 Subject: [PATCH] Move to .NET Core 2.1 SDK --- README.md | 2 +- azure-pipelines-1.yml | 2 +- .../Microsoft.Azure.Functions.PowerShellWorker.Package.csproj | 2 +- src/Microsoft.Azure.Functions.PowerShellWorker.csproj | 2 +- test/E2E/Start-E2ETest.ps1 | 2 +- .../Unit/Microsoft.Azure.Functions.PowerShellWorker.Test.csproj | 2 +- tools/helper.psm1 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/README.md b/README.md index bd71d530..282327ea 100644 --- a/README.md +++ b/README.md @@ -84,7 +84,7 @@ On macOS if you installed via `brew` Copy the result of the `publish` directory into a `powershell` folder under `workers`: ```powershell -Copy-Item -Recurse -Force ./src/bin/Debug/netcoreapp2.2/publish/ "/usr/local/Cellar/azure-functions-core-tools/$(func --version)/workers/powershell" +Copy-Item -Recurse -Force ./src/bin/Debug/netcoreapp2.1/publish/ "/usr/local/Cellar/azure-functions-core-tools/$(func --version)/workers/powershell" ``` > NOTE: if the powershell folder already exists, you should delete it or debugging won't work. diff --git a/azure-pipelines-1.yml b/azure-pipelines-1.yml index bf4446c6..ef5bc488 100644 --- a/azure-pipelines-1.yml +++ b/azure-pipelines-1.yml @@ -34,7 +34,7 @@ steps: - pwsh: | $null = New-Item -Path ./E2ETestArtifacts -ItemType Directory -Force - Compress-Archive -Path ./src/bin/Release/netcoreapp2.2/publish/* -DestinationPath ./E2ETestArtifacts/powershellworker.zip -Verbose + Compress-Archive -Path ./src/bin/Release/netcoreapp2.1/publish/* -DestinationPath ./E2ETestArtifacts/powershellworker.zip -Verbose Compress-Archive -Path ./test/E2E/TestFunctionApp/* -DestinationPath ./E2ETestArtifacts/e2etestspowershell.zip -Verbose displayName: 'Create test app zip file' diff --git a/package/Microsoft.Azure.Functions.PowerShellWorker.Package.csproj b/package/Microsoft.Azure.Functions.PowerShellWorker.Package.csproj index ae20a6b8..0c6b6a6a 100644 --- a/package/Microsoft.Azure.Functions.PowerShellWorker.Package.csproj +++ b/package/Microsoft.Azure.Functions.PowerShellWorker.Package.csproj @@ -5,7 +5,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li - netcoreapp2.2 + netcoreapp2.1 true false true diff --git a/src/Microsoft.Azure.Functions.PowerShellWorker.csproj b/src/Microsoft.Azure.Functions.PowerShellWorker.csproj index 8916f981..ad1110ac 100644 --- a/src/Microsoft.Azure.Functions.PowerShellWorker.csproj +++ b/src/Microsoft.Azure.Functions.PowerShellWorker.csproj @@ -6,7 +6,7 @@ Licensed under the MIT license. See LICENSE file in the project root for full li Exe - netcoreapp2.2 + netcoreapp2.1 true Azure Function PowerShell Language Worker Microsoft.Azure.Functions.PowerShellWorker diff --git a/test/E2E/Start-E2ETest.ps1 b/test/E2E/Start-E2ETest.ps1 index f5d074b6..1f4b94ad 100644 --- a/test/E2E/Start-E2ETest.ps1 +++ b/test/E2E/Start-E2ETest.ps1 @@ -41,7 +41,7 @@ Write-Host "Copying azure-functions-powershell-worker to Functions Host workers $configuration = if ($env:CONFIGURATION) { $env:CONFIGURATION } else { 'Debug' } Remove-Item -Recurse -Force -Path "$FUNC_CLI_DIRECTORY/workers/powershell" -Copy-Item -Recurse -Force "$PSScriptRoot/../../src/bin/$configuration/netcoreapp2.2/publish/" "$FUNC_CLI_DIRECTORY/workers/powershell" +Copy-Item -Recurse -Force "$PSScriptRoot/../../src/bin/$configuration/netcoreapp2.1/publish/" "$FUNC_CLI_DIRECTORY/workers/powershell" Write-Host "Staring Functions Host..." diff --git a/test/Unit/Microsoft.Azure.Functions.PowerShellWorker.Test.csproj b/test/Unit/Microsoft.Azure.Functions.PowerShellWorker.Test.csproj index a9f61743..98667a3d 100644 --- a/test/Unit/Microsoft.Azure.Functions.PowerShellWorker.Test.csproj +++ b/test/Unit/Microsoft.Azure.Functions.PowerShellWorker.Test.csproj @@ -1,7 +1,7 @@ - netcoreapp2.2 + netcoreapp2.1 false diff --git a/tools/helper.psm1 b/tools/helper.psm1 index b2921bc9..9579e50a 100644 --- a/tools/helper.psm1 +++ b/tools/helper.psm1 @@ -49,7 +49,7 @@ function Install-Dotnet { [CmdletBinding()] param( [string]$Channel = 'release', - [string]$Version = '2.2.102' + [string]$Version = '2.1.401' ) try {