From 6782d7149d88ce4a1ed70c71ce5fd9b9b62346fa Mon Sep 17 00:00:00 2001 From: Jon Sequeira Date: Fri, 17 Jan 2025 15:09:50 -0800 Subject: [PATCH 1/5] update to net9.0 --- global.json | 4 ++-- .../Microsoft.TryDotNet.IntegrationTests.csproj | 2 +- .../Microsoft.TryDotNet.SimulatorGenerator.csproj | 2 +- .../Microsoft.TryDotNet.Tests.csproj | 2 +- .../Microsoft.TryDotNet.WasmRunner.csproj | 2 +- src/Microsoft.TryDotNet/Microsoft.TryDotNet.csproj | 2 +- 6 files changed, 7 insertions(+), 7 deletions(-) diff --git a/global.json b/global.json index c983cdb1a..e28fdd663 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "8.0.204", + "version": "9.0.100", "allowPrerelease": true, "rollForward": "latestMinor" }, "tools": { - "dotnet": "8.0.204", + "dotnet": "9.0.100", "rollForward": "latestMinor" }, "msbuild-sdks": { diff --git a/src/Microsoft.TryDotNet.IntegrationTests/Microsoft.TryDotNet.IntegrationTests.csproj b/src/Microsoft.TryDotNet.IntegrationTests/Microsoft.TryDotNet.IntegrationTests.csproj index aa8fda100..dd09f85f8 100644 --- a/src/Microsoft.TryDotNet.IntegrationTests/Microsoft.TryDotNet.IntegrationTests.csproj +++ b/src/Microsoft.TryDotNet.IntegrationTests/Microsoft.TryDotNet.IntegrationTests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable false GeneratedLocation.cs diff --git a/src/Microsoft.TryDotNet.SimulatorGenerator/Microsoft.TryDotNet.SimulatorGenerator.csproj b/src/Microsoft.TryDotNet.SimulatorGenerator/Microsoft.TryDotNet.SimulatorGenerator.csproj index 94565ca19..9a1817f23 100644 --- a/src/Microsoft.TryDotNet.SimulatorGenerator/Microsoft.TryDotNet.SimulatorGenerator.csproj +++ b/src/Microsoft.TryDotNet.SimulatorGenerator/Microsoft.TryDotNet.SimulatorGenerator.csproj @@ -2,7 +2,7 @@ Exe - net8.0 + net9.0 enable enable embedded diff --git a/src/Microsoft.TryDotNet.Tests/Microsoft.TryDotNet.Tests.csproj b/src/Microsoft.TryDotNet.Tests/Microsoft.TryDotNet.Tests.csproj index d88e88435..4c27adbed 100644 --- a/src/Microsoft.TryDotNet.Tests/Microsoft.TryDotNet.Tests.csproj +++ b/src/Microsoft.TryDotNet.Tests/Microsoft.TryDotNet.Tests.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable all diff --git a/src/Microsoft.TryDotNet.WasmRunner/Microsoft.TryDotNet.WasmRunner.csproj b/src/Microsoft.TryDotNet.WasmRunner/Microsoft.TryDotNet.WasmRunner.csproj index 46aa42a78..d675be24e 100644 --- a/src/Microsoft.TryDotNet.WasmRunner/Microsoft.TryDotNet.WasmRunner.csproj +++ b/src/Microsoft.TryDotNet.WasmRunner/Microsoft.TryDotNet.WasmRunner.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable wasmrunner diff --git a/src/Microsoft.TryDotNet/Microsoft.TryDotNet.csproj b/src/Microsoft.TryDotNet/Microsoft.TryDotNet.csproj index 658a058b0..5c6a3e467 100644 --- a/src/Microsoft.TryDotNet/Microsoft.TryDotNet.csproj +++ b/src/Microsoft.TryDotNet/Microsoft.TryDotNet.csproj @@ -1,7 +1,7 @@  - net8.0 + net9.0 enable enable true From 7bb67fa3266ccb9195a3fee3e41b9d146868a80c Mon Sep 17 00:00:00 2001 From: Jon Sequeira Date: Fri, 17 Jan 2025 15:18:44 -0800 Subject: [PATCH 2/5] update package versions --- Directory.Packages.props | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index a7991b6ff..eacbf7baf 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -7,11 +7,11 @@ - - - - - + + + + + @@ -20,11 +20,11 @@ - + - + From fedeef082012b9aaf4ba45f0f39bc238a280d4cb Mon Sep 17 00:00:00 2001 From: Jon Sequeira Date: Fri, 17 Jan 2025 17:23:36 -0800 Subject: [PATCH 3/5] update path in script file for new TFM --- eng/build.ps1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eng/build.ps1 b/eng/build.ps1 index d1ae7b747..fbfe4e521 100644 --- a/eng/build.ps1 +++ b/eng/build.ps1 @@ -48,7 +48,7 @@ try { # playwright if ($test) { - & $repoRoot\artifacts\bin\Microsoft.TryDotNet.IntegrationTests\$configuration\net8.0\playwright.ps1 install chromium + & $repoRoot\artifacts\bin\Microsoft.TryDotNet.IntegrationTests\$configuration\net9.0\playwright.ps1 install chromium } } } From 88e71494aeb18d299842b4c9c8bc2cfefb841868 Mon Sep 17 00:00:00 2001 From: Jon Sequeira Date: Thu, 23 Jan 2025 10:44:57 -0800 Subject: [PATCH 4/5] update azure-pipelines YAMLs to install .NET 9 --- azure-pipelines-CI.yml | 5 ++++- azure-pipelines.yml | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/azure-pipelines-CI.yml b/azure-pipelines-CI.yml index 02c38d579..fe32c762b 100644 --- a/azure-pipelines-CI.yml +++ b/azure-pipelines-CI.yml @@ -132,7 +132,10 @@ extends: skipTests: $(SkipTests) buildArgs: $(_BuildArgs) additionalArgs: $(additionalWindowsArgs) - + - task: UseDotNet@2 + inputs: + packageType: sdk + useGlobalJson: true - template: /eng/common/templates-official/jobs/jobs.yml@self parameters: enableMicrobuild: true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 68b623ff4..e48eb4f8f 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -83,7 +83,10 @@ stages: skipTests: $(SkipTests) buildArgs: $(_BuildArgs) additionalArgs: $(additionalWindowsArgs) - + - task: UseDotNet@2 + inputs: + packageType: sdk + useGlobalJson: true - task: PublishBuildArtifacts@1 displayName: Publish Windows artifacts inputs: From 70fc23aaea69a437672fcb0ceb44365e2541149c Mon Sep 17 00:00:00 2001 From: Osvaldo Calles Date: Thu, 23 Jan 2025 12:56:27 -0800 Subject: [PATCH 5/5] Install .Net Sdk before running tests --- azure-pipelines-CI.yml | 9 +++++---- azure-pipelines.yml | 9 +++++---- global.json | 4 ++-- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/azure-pipelines-CI.yml b/azure-pipelines-CI.yml index fe32c762b..9e0b238dc 100644 --- a/azure-pipelines-CI.yml +++ b/azure-pipelines-CI.yml @@ -126,16 +126,17 @@ extends: - name: _BuildArgs value: /p:SignType=$(_SignType) steps: + - task: UseDotNet@2 + displayName: Install SDK 9.0.102 + inputs: + packageType: sdk + version: 9.0.102 - template: /eng/templates/build-and-test-job-windows-templates.yml@self parameters: buildConfig: $(_BuildConfig) skipTests: $(SkipTests) buildArgs: $(_BuildArgs) additionalArgs: $(additionalWindowsArgs) - - task: UseDotNet@2 - inputs: - packageType: sdk - useGlobalJson: true - template: /eng/common/templates-official/jobs/jobs.yml@self parameters: enableMicrobuild: true diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e48eb4f8f..a9019d975 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -77,16 +77,17 @@ stages: - name: _BuildArgs value: /p:SignType=$(_SignType) steps: + - task: UseDotNet@2 + displayName: Install SDK 9.0.102 + inputs: + packageType: sdk + version: 9.0.102 - template: /eng/templates/build-and-test-job-windows-templates.yml@self parameters: buildConfig: $(_BuildConfig) skipTests: $(SkipTests) buildArgs: $(_BuildArgs) additionalArgs: $(additionalWindowsArgs) - - task: UseDotNet@2 - inputs: - packageType: sdk - useGlobalJson: true - task: PublishBuildArtifacts@1 displayName: Publish Windows artifacts inputs: diff --git a/global.json b/global.json index e28fdd663..830a4e8a3 100644 --- a/global.json +++ b/global.json @@ -1,11 +1,11 @@ { "sdk": { - "version": "9.0.100", + "version": "9.0.102", "allowPrerelease": true, "rollForward": "latestMinor" }, "tools": { - "dotnet": "9.0.100", + "dotnet": "9.0.102", "rollForward": "latestMinor" }, "msbuild-sdks": {