diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 39bf2f2c610a1..0f26c4fff3483 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -53,6 +53,12 @@ variables: ${{ else }}: value: windows.vs2022preview.amd64 + - name: Vs2022RegularQueueName + ${{ if eq(variables['System.TeamProject'], 'public') }}: + value: windows.vs2022.amd64.open + ${{ else }}: + value: windows.vs2022.amd64 + - name: UbuntuQueueName ${{ if eq(variables['System.TeamProject'], 'public') }}: value: Build.Ubuntu.2004.Amd64.Open @@ -107,6 +113,11 @@ parameters: default: name: $(PoolName) demands: ImageOverride -equals $(Vs2022PreviewQueueName) + - name: vs2022RegularPool + type: object + default: + name: $(PoolName) + demands: ImageOverride -equals $(Vs2022RegularQueueName) stages: - stage: Windows_Debug_Build @@ -271,7 +282,7 @@ stages: jobName: Test_Windows_CoreClr_Debug_Single_Machine testArtifactName: Transport_Artifacts_Windows_Debug configuration: Debug - poolParameters: ${{ parameters.vs2022PreviewPool }} + poolParameters: ${{ parameters.vs2022RegularPool }} testArguments: -testCoreClr - template: eng/pipelines/test-windows-job.yml diff --git a/eng/pipelines/test-windows-job-single-machine.yml b/eng/pipelines/test-windows-job-single-machine.yml index 75acc4af38da4..975bdb744f2f0 100644 --- a/eng/pipelines/test-windows-job-single-machine.yml +++ b/eng/pipelines/test-windows-job-single-machine.yml @@ -33,7 +33,7 @@ jobs: displayName: 'Install .NET 9 Runtime' inputs: packageType: runtime - version: 9.0.0-preview.3.24172.9 + version: 9.0.0-rc.2.24473.5 includePreviewVersions: true installationPath: '$(Build.SourcesDirectory)/.dotnet'