diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 02919c4f384de6..a20601660440d5 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -89,13 +89,24 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), ne(variables['System.TeamProject'], 'public')) }}: - name: NetCoreInternal-Pool - queue: BuildPool.Windows.10.Amd64.VS2019 + ${{ if eq(parameters.jobParameters.useVsPreviewPool, true) }}: + name: NetCoreInternal-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre + + ${{ if ne(parameters.jobParameters.useVsPreviewPool, true) }}: + name: NetCoreInternal-Pool + queue: BuildPool.Windows.10.Amd64.VS2019 # Public Windows Build Pool ${{ if and(eq(parameters.osGroup, 'Windows_NT'), eq(variables['System.TeamProject'], 'public')) }}: - name: NetCorePublic-Pool - queue: BuildPool.Windows.10.Amd64.VS2019.Open + ${{ if eq(parameters.jobParameters.useVsPreviewPool, true) }}: + name: NetCorePublic-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Pre.Open + + ${{ if ne(parameters.jobParameters.useVsPreviewPool, true) }}: + name: NetCorePublic-Pool + queue: BuildPool.Windows.10.Amd64.VS2019.Open + ${{ if eq(parameters.helixQueuesTemplate, '') }}: ${{ insert }}: ${{ parameters.jobParameters }} diff --git a/eng/pipelines/coreclr/perf.yml b/eng/pipelines/coreclr/perf.yml index ffa22b8afc7515..e9782e257a1e07 100644 --- a/eng/pipelines/coreclr/perf.yml +++ b/eng/pipelines/coreclr/perf.yml @@ -52,7 +52,7 @@ jobs: - template: /eng/pipelines/common/platform-matrix.yml parameters: - jobTemplate: /eng/pipelines/common/build-coreclr-and-libraries-job.yml + jobTemplate: /eng/pipelines/coreclr/templates/build-job.yml buildConfig: release platforms: - Linux_x64 @@ -60,6 +60,20 @@ jobs: - Windows_NT_x86 jobParameters: testGroup: perf + useVsPreviewPool: false + +- template: /eng/pipelines/common/platform-matrix.yml + parameters: + jobTemplate: /eng/pipelines/libraries/build-job.yml + buildConfig: Release + platforms: + - Linux_x64 + - Windows_NT_x64 + - Windows_NT_x86 + jobParameters: + useVsPreviewPool: true + liveRuntimeBuildConfig: release + - template: /eng/pipelines/common/platform-matrix.yml parameters: diff --git a/eng/pipelines/libraries/base-job.yml b/eng/pipelines/libraries/base-job.yml index 0a7389aa23813a..85ea99f75c30f5 100644 --- a/eng/pipelines/libraries/base-job.yml +++ b/eng/pipelines/libraries/base-job.yml @@ -102,8 +102,6 @@ jobs: # Windows variables - ${{ if eq(parameters.osGroup, 'Windows_NT') }}: - _runtimeOSArg: /p:RuntimeOS=win10 - # Remove when: https://github.com/dotnet/runtime/issues/31888 is fixed. - - _warnAsErrorArg: -warnAsError:0 # Non-Windows variables - ${{ if ne(parameters.osGroup, 'Windows_NT') }}: diff --git a/eng/pipelines/runtime.yml b/eng/pipelines/runtime.yml index 66b42f95206e74..91035defd4c912 100644 --- a/eng/pipelines/runtime.yml +++ b/eng/pipelines/runtime.yml @@ -137,6 +137,7 @@ jobs: - Windows_NT_arm64 jobParameters: testGroup: innerloop + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), @@ -154,6 +155,7 @@ jobs: - OSX_x64 jobParameters: testGroup: innerloop + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), @@ -180,6 +182,7 @@ jobs: - Windows_NT_arm - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false testGroup: innerloop # @@ -193,6 +196,7 @@ jobs: - Linux_x64 - Windows_NT_x64 jobParameters: + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_coreclr.containsChange'], true), @@ -219,6 +223,7 @@ jobs: # - Windows_NT_arm # - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -246,6 +251,7 @@ jobs: # - Windows_NT_arm # - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -274,6 +280,7 @@ jobs: # - Windows_NT_arm64 jobParameters: llvm: true + useVsPreviewPool: false condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -301,6 +308,7 @@ jobs: # - Windows_NT_arm # - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false llvm: true condition: >- or( @@ -326,6 +334,7 @@ jobs: - Windows_NT_x86 jobParameters: liveRuntimeBuildConfig: release + useVsPreviewPool: true - template: /eng/pipelines/common/platform-matrix.yml parameters: @@ -339,6 +348,7 @@ jobs: - Windows_NT_x64 jobParameters: liveRuntimeBuildConfig: release + useVsPreviewPool: true # # Libraries Build that only run when libraries is changed # @@ -352,6 +362,7 @@ jobs: - Windows_NT_x86 jobParameters: liveRuntimeBuildConfig: release + useVsPreviewPool: true condition: >- or( eq(dependencies.checkout.outputs['SetPathVars_libraries.containsChange'], true), @@ -367,6 +378,7 @@ jobs: - Windows_NT_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: + useVsPreviewPool: true isFullMatrix: ${{ variables.isFullMatrix }} framework: net472 runTests: true @@ -384,6 +396,7 @@ jobs: - Windows_NT_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: + useVsPreviewPool: true isFullMatrix: ${{ variables.isFullMatrix }} framework: allConfigurations runTests: true @@ -408,6 +421,7 @@ jobs: - Windows_NT_arm - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false liveRuntimeBuildConfig: release liveLibrariesBuildConfig: Release @@ -421,6 +435,7 @@ jobs: - Linux_musl_x64 - Windows_NT_x64 jobParameters: + useVsPreviewPool: false liveRuntimeBuildConfig: release liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} @@ -437,6 +452,7 @@ jobs: - Linux_x64 - Windows_NT_x64 jobParameters: + useVsPreviewPool: false isOfficialBuild: false liveRuntimeBuildConfig: release testScope: innerloop @@ -460,6 +476,7 @@ jobs: helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false liveLibrariesBuildConfig: Release condition: >- or( @@ -480,6 +497,7 @@ jobs: - Windows_NT_arm - Windows_NT_arm64 jobParameters: + useVsPreviewPool: false testGroup: innerloop liveLibrariesBuildConfig: Release condition: >- @@ -501,6 +519,7 @@ jobs: - Linux_arm64 - Windows_NT_x64 jobParameters: + useVsPreviewPool: false testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} condition: >- @@ -524,6 +543,7 @@ jobs: helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false testGroup: innerloop liveLibrariesBuildConfig: Release condition: >- @@ -543,6 +563,7 @@ jobs: helixQueueGroup: pr helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false testGroup: innerloop liveLibrariesBuildConfig: ${{ variables.debugOnPrReleaseOnRolling }} condition: >- @@ -566,6 +587,7 @@ jobs: - Linux_x64 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false isOfficialBuild: false isFullMatrix: ${{ variables.isFullMatrix }} testScope: innerloop @@ -590,6 +612,7 @@ jobs: - Windows_NT_x86 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false isOfficialBuild: false isFullMatrix: ${{ variables.isFullMatrix }} testScope: innerloop @@ -622,6 +645,7 @@ jobs: - Windows_NT_x86 helixQueuesTemplate: /eng/pipelines/libraries/helix-queues-setup.yml jobParameters: + useVsPreviewPool: false isOfficialBuild: false isFullMatrix: ${{ variables.isFullMatrix }} testScope: innerloop @@ -647,6 +671,7 @@ jobs: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: + useVsPreviewPool: false testScope: innerloop liveRuntimeBuildConfig: checked dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }} @@ -667,6 +692,7 @@ jobs: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: + useVsPreviewPool: false testScope: innerloop liveRuntimeBuildConfig: checked dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }} @@ -689,6 +715,7 @@ jobs: helixQueuesTemplate: /eng/pipelines/coreclr/templates/helix-queues-setup.yml helixQueueGroup: libraries jobParameters: + useVsPreviewPool: false testScope: innerloop liveRuntimeBuildConfig: checked dependsOnTestBuildConfiguration: ${{ variables.debugOnPrReleaseOnRolling }}