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/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 537995561..47807a3c3 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 @@ -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.0.100 # .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