From 08d63275f51d387d11c0762db1c8562b904ee6c7 Mon Sep 17 00:00:00 2001 From: kaibocai <89094811+kaibocai@users.noreply.github.com> Date: Mon, 12 Dec 2022 12:41:29 -0600 Subject: [PATCH 1/3] update task to install .NET --- azure-pipelines.yml | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 9098e694..61abf90b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -139,15 +139,19 @@ jobs: - pwsh: | .\package-pipeline.ps1 -buildNumber $(buildNumber) displayName: 'Executing build script' - - pwsh: | - Invoke-WebRequest 'https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1' -OutFile 'dotnet-install.ps1' - ./dotnet-install.ps1 -InstallDir "$env:ProgramFiles/dotnet" -Version "6.0.100-rc.2.21505.57" -Channel 'release' - displayName: 'Install the .Net version used by the Core Tools for Windows' - condition: eq( variables['Agent.OS'], 'Windows_NT' ) - - bash: | - curl -sSL https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin -v '6.0.100-rc.2.21505.57' -c 'release' --install-dir /usr/share/dotnet - displayName: 'Install the .Net version used by the Core Tools for Linux' - condition: eq( variables['Agent.OS'], 'Linux' ) + - task: UseDotNet@2 + displayName: 'Install .NET 6' + inputs: + version: 6.0.x +# - pwsh: | +# Invoke-WebRequest 'https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1' -OutFile 'dotnet-install.ps1' +# ./dotnet-install.ps1 -InstallDir "$env:ProgramFiles/dotnet" -Version "6.0.100-rc.2.21505.57" -Channel 'release' +# displayName: 'Install the .Net version used by the Core Tools for Windows' +# condition: eq( variables['Agent.OS'], 'Windows_NT' ) +# - bash: | +# curl -sSL https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin -v '6.0.100-rc.2.21505.57' -c 'release' --install-dir /usr/share/dotnet +# displayName: 'Install the .Net version used by the Core Tools for Linux' +# condition: eq( variables['Agent.OS'], 'Linux' ) - pwsh: | # Download JDK for later installation Invoke-WebRequest $(JDK_DOWNLOAD_LINK) -O "$(JAVA_VERSION).tar.gz" $current = get-location | select -ExpandProperty Path From 53d2de3f3f4219ba1beee7ab8c30c0bc8129e952 Mon Sep 17 00:00:00 2001 From: kaibocai <89094811+kaibocai@users.noreply.github.com> Date: Mon, 12 Dec 2022 13:37:38 -0600 Subject: [PATCH 2/3] update e2e test project to .net6.0 --- azure-pipelines.yml | 2 -- .../Azure.Functions.Java.Tests.E2E.csproj | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 61abf90b..949915ed 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -184,14 +184,12 @@ jobs: - pwsh: | $currDir = Get-Location $Env:Path = $Env:Path+";$currDir/Azure.Functions.Cli" - ls $currDir/Azure.Functions.Cli func --version condition: eq( variables['Agent.OS'], 'Windows_NT' ) displayName: 'Setup Core Tools - Windows' - bash: | chmod +x ./Azure.Functions.Cli/func chmod +x ./Azure.Functions.Cli/gozip - ls ./Azure.Functions.Cli export PATH=$PATH:./Azure.Functions.Cli func --version condition: eq( variables['Agent.OS'], 'Linux' ) diff --git a/endtoendtests/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E.csproj b/endtoendtests/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E.csproj index 75dbecca..6f1e0aeb 100644 --- a/endtoendtests/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E.csproj +++ b/endtoendtests/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E/Azure.Functions.Java.Tests.E2E.csproj @@ -1,7 +1,7 @@  - netcoreapp3.1 + net6.0 false From 142a8962977fc0c12a374d94b8436c2bcdea2896 Mon Sep 17 00:00:00 2001 From: kaibocai <89094811+kaibocai@users.noreply.github.com> Date: Mon, 12 Dec 2022 14:43:40 -0600 Subject: [PATCH 3/3] update e2e .net version --- azure-pipelines-e2e-integration-tests.yml | 13 ++++--------- azure-pipelines.yml | 9 --------- 2 files changed, 4 insertions(+), 18 deletions(-) diff --git a/azure-pipelines-e2e-integration-tests.yml b/azure-pipelines-e2e-integration-tests.yml index c45ce0d8..a442b1d8 100644 --- a/azure-pipelines-e2e-integration-tests.yml +++ b/azure-pipelines-e2e-integration-tests.yml @@ -70,15 +70,10 @@ jobs: java -version displayName: 'Check default java version' - - pwsh: | - Invoke-WebRequest 'https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1' -OutFile 'dotnet-install.ps1' - ./dotnet-install.ps1 -InstallDir "$env:ProgramFiles/dotnet" -Version "6.0.100-rc.2.21505.57" -Channel 'release' - displayName: 'Install the .Net version used by the Core Tools for Windows' - condition: eq( variables['Agent.OS'], 'Windows_NT' ) - - bash: | - curl -sSL https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin -v '6.0.100-rc.2.21505.57' -c 'release' --install-dir /usr/share/dotnet - displayName: 'Install the .Net version used by the Core Tools for Linux' - condition: eq( variables['Agent.OS'], 'Linux' ) + - task: UseDotNet@2 + displayName: 'Install .NET 6' + inputs: + version: 6.0.x - pwsh: | .\setup-tests-pipeline.ps1 -UseCoreToolsBuildFromIntegrationTests diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 949915ed..5cfcbe82 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -143,15 +143,6 @@ jobs: displayName: 'Install .NET 6' inputs: version: 6.0.x -# - pwsh: | -# Invoke-WebRequest 'https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.ps1' -OutFile 'dotnet-install.ps1' -# ./dotnet-install.ps1 -InstallDir "$env:ProgramFiles/dotnet" -Version "6.0.100-rc.2.21505.57" -Channel 'release' -# displayName: 'Install the .Net version used by the Core Tools for Windows' -# condition: eq( variables['Agent.OS'], 'Windows_NT' ) -# - bash: | -# curl -sSL https://raw.githubusercontent.com/dotnet/cli/master/scripts/obtain/dotnet-install.sh | bash /dev/stdin -v '6.0.100-rc.2.21505.57' -c 'release' --install-dir /usr/share/dotnet -# displayName: 'Install the .Net version used by the Core Tools for Linux' -# condition: eq( variables['Agent.OS'], 'Linux' ) - pwsh: | # Download JDK for later installation Invoke-WebRequest $(JDK_DOWNLOAD_LINK) -O "$(JAVA_VERSION).tar.gz" $current = get-location | select -ExpandProperty Path