From 55c2046f7c3cf6820eece11b49bbe7cb1b17b974 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 26 May 2026 16:30:17 -0500 Subject: [PATCH 1/2] Bump .NET SDK installer to 10.x in CI Updates the SDK version installed by Azure DevOps CI and the GitHub Actions Copilot setup workflow from 9.x to 10.x. Target frameworks (net9.0-android) are unchanged. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .github/workflows/copilot-setup-steps.yml | 2 +- build/ci/variables.yml | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/copilot-setup-steps.yml b/.github/workflows/copilot-setup-steps.yml index dc7d46e65..3e4ba762e 100644 --- a/.github/workflows/copilot-setup-steps.yml +++ b/.github/workflows/copilot-setup-steps.yml @@ -37,7 +37,7 @@ jobs: - name: Setup .NET uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.x' + dotnet-version: '10.x' - name: Log disk space (after .NET setup) uses: ./.github/workflows/log-disk-space diff --git a/build/ci/variables.yml b/build/ci/variables.yml index 537995561..9b8a667a0 100644 --- a/build/ci/variables.yml +++ b/build/ci/variables.yml @@ -19,7 +19,7 @@ variables: macosAgentPoolName: VSEng-VSMac-Xamarin-Shared # macOS VM pool name # Tool variables - dotnetVersion: '9.0.308' # .NET version to install on agent + dotnetVersion: '10.x' # .NET version to install on agent dotnetFrameworkVersion: 9 # The number to use for TF (eg: netX.0-android) dotnetNuGetOrgSource: 'https://api.nuget.org/v3/index.json' # NuGet.org URL to find workloads @@ -34,7 +34,7 @@ variables: extendedTestAssembly: tests/extended/bin/$(configuration)/net$(dotnetFrameworkVersion).0/ExtendedTests.dll # Extended tests compiled binary # dotnet-next test variables - dotnetNextVersion: 10.0.100 # .NET version to install + dotnetNextVersion: '10.x' # .NET version to install dotnetNextFrameworkVersion: 10 # The number to use for TF (eg: netX.0-android) # dnceng-public variables From a7b90f9b478b4d193b6c9b4aeae06065cc11d0a7 Mon Sep 17 00:00:00 2001 From: Jonathan Peppers Date: Tue, 26 May 2026 16:42:28 -0500 Subject: [PATCH 2/2] Remove unused dotnet-next CI variables and install step The dotnetNextVersion/dotnetNextFrameworkVersion variables existed to install a side-by-side preview SDK, but with the main dotnetVersion now on 10.x there's no preview to pair with, and neither variable is referenced elsewhere. Removing them also drops the redundant second UseDotNet@2 step. Addresses review feedback on #1424. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- build/ci/setup-environment.yml | 7 ------- build/ci/variables.yml | 4 ---- 2 files changed, 11 deletions(-) diff --git a/build/ci/setup-environment.yml b/build/ci/setup-environment.yml index ca137af08..f841ec812 100644 --- a/build/ci/setup-environment.yml +++ b/build/ci/setup-environment.yml @@ -18,13 +18,6 @@ steps: version: $(dotnetVersion) condition: ne('$(dotnetVersion)', '') - - task: UseDotNet@2 - displayName: 'Use dotnet $(dotnetNextVersion)' - inputs: - version: $(dotnetNextVersion) - performMultiLevelLookup: true - condition: ne('$(dotnetNextVersion)', '') - - script: dotnet --info displayName: Display dotnet info diff --git a/build/ci/variables.yml b/build/ci/variables.yml index 9b8a667a0..47807a3c3 100644 --- a/build/ci/variables.yml +++ b/build/ci/variables.yml @@ -33,10 +33,6 @@ variables: extendedTestProject: tests/extended/ExtendedTests.csproj # Extended tests project file extendedTestAssembly: tests/extended/bin/$(configuration)/net$(dotnetFrameworkVersion).0/ExtendedTests.dll # Extended tests compiled binary - # dotnet-next test variables - dotnetNextVersion: '10.x' # .NET version to install - dotnetNextFrameworkVersion: 10 # The number to use for TF (eg: netX.0-android) - # dnceng-public variables NetCorePublicPoolName: NetCore-Public-XL WindowsPoolImageNetCorePublic: windows.vs2022.amd64.open