From d1e6e3e8442c914f22bf9fd52fb5ab73aad50a68 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Wed, 23 Feb 2022 11:20:01 -0800 Subject: [PATCH 1/7] Remove use of VS2019 machines from queues --- eng/common/templates/job/execute-sdl.yml | 4 ++-- eng/common/templates/job/onelocbuild.yml | 8 +++---- .../templates/job/source-index-stage1.yml | 4 ++-- eng/common/templates/jobs/jobs.yml | 8 +++---- .../templates/post-build/post-build.yml | 22 +++++++++---------- eng/native/gen-buildsys.cmd | 2 -- eng/native/init-vs-env.cmd | 7 +----- eng/pipelines/common/xplat-setup.yml | 4 ++-- eng/pipelines/libraries/stress/http.yml | 2 +- eng/pipelines/libraries/stress/ssl.yml | 8 +++---- .../jobs/prepare-signed-artifacts.yml | 2 +- eng/pipelines/official/stages/publish.yml | 2 +- 12 files changed, 33 insertions(+), 40 deletions(-) diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 24cec0424e5d64..f986327c14e517 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -54,7 +54,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals Build.Server.Amd64.VS2022 steps: - checkout: self clean: true @@ -120,7 +120,7 @@ jobs: -ExtractPath $(Build.ArtifactStagingDirectory)\artifacts displayName: Extract Archive Artifacts continueOnError: ${{ parameters.sdlContinueOnError }} - + - template: /eng/common/templates/steps/execute-sdl.yml parameters: overrideGuardianVersion: ${{ parameters.overrideGuardianVersion }} diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index 9d1e3042d8a6c0..ddb0d93d37d1e7 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -4,7 +4,7 @@ parameters: # Optional: A defined YAML pool - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#pool pool: '' - + CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) @@ -25,7 +25,7 @@ parameters: jobs: - job: OneLocBuild - + dependsOn: ${{ parameters.dependsOn }} displayName: OneLocBuild @@ -41,7 +41,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals Build.Server.Amd64.VS2022 variables: - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat @@ -52,7 +52,7 @@ jobs: - ${{ if eq(parameters.UseCheckedInLocProjectJson, 'true') }}: - name: _GenerateLocProjectArguments value: ${{ variables._GenerateLocProjectArguments }} -UseCheckedInLocProjectJson - + steps: - task: Powershell@2 diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 4af724eb1a9ec9..88e3b4b4e63d37 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -25,10 +25,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open + demands: ImageOverride -equals Build.Server.Amd64.VS2022.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals Build.Server.Amd64.VS2022 steps: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 554e71cfc436dd..b57ec54e0b6cf7 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -20,7 +20,7 @@ parameters: enabled: false # Optional: Include toolset dependencies in the generated graph files includeToolset: false - + # Required: A collection of jobs to run - https://docs.microsoft.com/en-us/azure/devops/pipelines/yaml-schema?view=vsts&tabs=schema#job jobs: [] @@ -40,7 +40,7 @@ parameters: jobs: - ${{ each job in parameters.jobs }}: - template: ../job/job.yml - parameters: + parameters: # pass along parameters ${{ each parameter in parameters }}: ${{ if ne(parameter.key, 'jobs') }}: @@ -68,7 +68,7 @@ jobs: ${{ parameter.key }}: ${{ parameter.value }} - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: - + - ${{ if or(eq(parameters.enablePublishBuildAssets, true), eq(parameters.artifacts.publish.manifests, 'true'), ne(parameters.artifacts.publish.manifests, '')) }}: - template: ../job/publish-build-assets.yml parameters: @@ -90,7 +90,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals Build.Server.Amd64.VS2022 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index 2f176571f020cf..ada09d4a61cb25 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -39,7 +39,7 @@ parameters: displayName: Enable NuGet validation type: boolean default: true - + - name: publishInstallersAndChecksums displayName: Publish installers and checksums type: boolean @@ -101,7 +101,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals Build.Server.Amd64.VS2022 steps: - template: setup-maestro-vars.yml @@ -124,8 +124,8 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/nuget-validation.ps1 - arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ - -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ + arguments: -PackagesPath $(Build.ArtifactStagingDirectory)/PackageArtifacts/ + -ToolDestinationPath $(Agent.BuildDirectory)/Extract/ - job: displayName: Signing Validation @@ -138,7 +138,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals Build.Server.Amd64.VS2022 steps: - template: setup-maestro-vars.yml parameters: @@ -198,7 +198,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals Build.Server.Amd64.VS2022 steps: - template: setup-maestro-vars.yml parameters: @@ -220,9 +220,9 @@ stages: displayName: Validate inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/sourcelink-validation.ps1 - arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ - -ExtractPath $(Agent.BuildDirectory)/Extract/ - -GHRepoName $(Build.Repository.Name) + arguments: -InputPath $(Build.ArtifactStagingDirectory)/BlobArtifacts/ + -ExtractPath $(Agent.BuildDirectory)/Extract/ + -GHRepoName $(Build.Repository.Name) -GHCommit $(Build.SourceVersion) -SourcelinkCliVersion $(SourceLinkCLIVersion) continueOnError: true @@ -255,7 +255,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2019 + demands: ImageOverride -equals Build.Server.Amd64.VS2022 steps: - template: setup-maestro-vars.yml parameters: @@ -268,7 +268,7 @@ stages: displayName: Publish Using Darc inputs: filePath: $(Build.SourcesDirectory)/eng/common/post-build/publish-using-darc.ps1 - arguments: -BuildId $(BARBuildId) + arguments: -BuildId $(BARBuildId) -PublishingInfraVersion ${{ parameters.publishingInfraVersion }} -AzdoToken '$(publishing-dnceng-devdiv-code-r-build-re)' -MaestroToken '$(MaestroApiAccessToken)' diff --git a/eng/native/gen-buildsys.cmd b/eng/native/gen-buildsys.cmd index 243921d93d4ce5..3701e639cee983 100644 --- a/eng/native/gen-buildsys.cmd +++ b/eng/native/gen-buildsys.cmd @@ -29,8 +29,6 @@ if /i "%__Ninja%" == "1" ( ) else ( if /i NOT "%__Arch%" == "wasm" ( if /i "%__VSVersion%" == "vs2022" (set __CmakeGenerator=%__CmakeGenerator% 17 2022) - if /i "%__VSVersion%" == "vs2019" (set __CmakeGenerator=%__CmakeGenerator% 16 2019) - if /i "%__VSVersion%" == "vs2017" (set __CmakeGenerator=%__CmakeGenerator% 15 2017) if /i "%__Arch%" == "x64" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A x64) if /i "%__Arch%" == "arm" (set __ExtraCmakeParams=%__ExtraCmakeParams% -A ARM) diff --git a/eng/native/init-vs-env.cmd b/eng/native/init-vs-env.cmd index 7eefeea1271556..54b4aa0db25de4 100644 --- a/eng/native/init-vs-env.cmd +++ b/eng/native/init-vs-env.cmd @@ -45,11 +45,6 @@ set "__VSCOMNTOOLS=" set "VSCMD_START_DIR=" :VSDetected -if "%VisualStudioVersion%"=="16.0" ( - set __VSVersion=vs2019 - set __PlatformToolset=v142 - goto :SetVCEnvironment -) if "%VisualStudioVersion%"=="17.0" ( set __VSVersion=vs2022 set __PlatformToolset=v142 @@ -57,7 +52,7 @@ if "%VisualStudioVersion%"=="17.0" ( ) :VSMissing -echo %__MsgPrefix%Error: Visual Studio 2019 or 2022 with C++ tools required. ^ +echo %__MsgPrefix%Error: Visual Studio 2022 with C++ tools required. ^ Please see https://github.com/dotnet/runtime/blob/main/docs/workflow/requirements/windows-requirements.md for build requirements. exit /b 1 diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index e6ac905afb0648..3533c95b1dec06 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -135,12 +135,12 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'windows'), ne(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019 + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022 # Public Windows Build Pool ${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019.Open + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022.Open ${{ if eq(parameters.helixQueuesTemplate, '') }}: diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index 0d76b4e09ec8b0..03ea34533107bf 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -97,7 +97,7 @@ jobs: DUMPS_SHARE_MOUNT_ROOT: "C:/dumps-share" pool: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open + demands: ImageOverride -equals Build.Server.Amd64.VS2022.Open steps: - checkout: self diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml index f3d294433af2dc..d28bd3595afc60 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -55,7 +55,7 @@ jobs: timeoutInMinutes: 120 pool: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open + demands: ImageOverride -equals Build.Server.Amd64.VS2022.Open steps: - checkout: self @@ -66,12 +66,12 @@ jobs: - powershell: | $(dockerfilesFolder)/build-docker-sdk.ps1 -w -t $(sdkBaseImage) -c $(BUILD_CONFIGURATION) displayName: Build CLR and Libraries - + - powershell: | $(sslStressProject)/run-docker-compose.ps1 -w -o -c $(BUILD_CONFIGURATION) -t $(sdkBaseImage) displayName: Build SslStress - + - powershell: | cd '$(sslStressProject)' docker-compose up --abort-on-container-exit --no-color - displayName: Run SslStress + displayName: Run SslStress diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml index 8df497b7720e4e..11d037adc1cccb 100644 --- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml +++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml @@ -10,7 +10,7 @@ jobs: dependsOn: ${{ parameters.dependsOn }} pool: name: NetCore1ESPool-Internal - demands: ImageOverride -equals build.windows.10.amd64.vs2019 + demands: ImageOverride -equals build.windows.10.amd64.vs2022 # Double the default timeout. timeoutInMinutes: 180 workspace: diff --git a/eng/pipelines/official/stages/publish.yml b/eng/pipelines/official/stages/publish.yml index cba9958b2f76e7..21fdeb986dda44 100644 --- a/eng/pipelines/official/stages/publish.yml +++ b/eng/pipelines/official/stages/publish.yml @@ -20,7 +20,7 @@ stages: dependsOn: PrepareSignedArtifacts pool: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2019 + demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022 # Stages-based publishing entry point - template: /eng/common/templates/post-build/post-build.yml From aa51eacf1f897bc622fbb60b4cafa2849225a907 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Wed, 23 Feb 2022 19:00:46 -0800 Subject: [PATCH 2/7] Revert changes to common --- eng/common/templates/job/execute-sdl.yml | 2 +- eng/common/templates/job/onelocbuild.yml | 2 +- eng/common/templates/job/source-index-stage1.yml | 4 ++-- eng/common/templates/jobs/jobs.yml | 2 +- eng/common/templates/post-build/post-build.yml | 8 ++++---- 5 files changed, 9 insertions(+), 9 deletions(-) diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index f986327c14e517..47d454534f2600 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -54,7 +54,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2022 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - checkout: self clean: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index ddb0d93d37d1e7..eb3c622c1a5c2a 100644 --- a/eng/common/templates/job/onelocbuild.yml +++ b/eng/common/templates/job/onelocbuild.yml @@ -41,7 +41,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2022 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 variables: - group: OneLocBuildVariables # Contains the CeapexPat and GithubPat diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 88e3b4b4e63d37..4af724eb1a9ec9 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -25,10 +25,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2022.Open + demands: ImageOverride -equals Build.Server.Amd64.VS2019.Open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2022 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - ${{ each preStep in parameters.preSteps }}: - ${{ preStep }} diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index b57ec54e0b6cf7..82635234f93b7d 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -90,7 +90,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2022 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} diff --git a/eng/common/templates/post-build/post-build.yml b/eng/common/templates/post-build/post-build.yml index ada09d4a61cb25..e967cca6480b88 100644 --- a/eng/common/templates/post-build/post-build.yml +++ b/eng/common/templates/post-build/post-build.yml @@ -101,7 +101,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2022 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - template: setup-maestro-vars.yml @@ -138,7 +138,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2022 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - template: setup-maestro-vars.yml parameters: @@ -198,7 +198,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2022 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - template: setup-maestro-vars.yml parameters: @@ -255,7 +255,7 @@ stages: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Server.Amd64.VS2022 + demands: ImageOverride -equals Build.Server.Amd64.VS2019 steps: - template: setup-maestro-vars.yml parameters: From 1f670d1d62ffc9ecf109555f08ed138358a6f111 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Wed, 23 Feb 2022 19:14:06 -0800 Subject: [PATCH 3/7] Use correct queue names --- eng/pipelines/common/xplat-setup.yml | 4 ++-- eng/pipelines/libraries/stress/http.yml | 2 +- eng/pipelines/libraries/stress/ssl.yml | 2 +- eng/pipelines/official/jobs/prepare-signed-artifacts.yml | 2 +- eng/pipelines/official/stages/publish.yml | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/eng/pipelines/common/xplat-setup.yml b/eng/pipelines/common/xplat-setup.yml index 3533c95b1dec06..6e8d8387948226 100644 --- a/eng/pipelines/common/xplat-setup.yml +++ b/eng/pipelines/common/xplat-setup.yml @@ -135,12 +135,12 @@ jobs: # Official Build Windows Pool ${{ if and(eq(parameters.osGroup, 'windows'), ne(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022 + demands: ImageOverride -equals Build.Windows.Amd64.VS2022 # Public Windows Build Pool ${{ if and(or(eq(parameters.osGroup, 'windows'), eq(parameters.jobParameters.hostedOs, 'windows')), eq(variables['System.TeamProject'], 'public')) }}: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open ${{ if eq(parameters.helixQueuesTemplate, '') }}: diff --git a/eng/pipelines/libraries/stress/http.yml b/eng/pipelines/libraries/stress/http.yml index 03ea34533107bf..2cb7417b8a8cb7 100644 --- a/eng/pipelines/libraries/stress/http.yml +++ b/eng/pipelines/libraries/stress/http.yml @@ -97,7 +97,7 @@ jobs: DUMPS_SHARE_MOUNT_ROOT: "C:/dumps-share" pool: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2022.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open steps: - checkout: self diff --git a/eng/pipelines/libraries/stress/ssl.yml b/eng/pipelines/libraries/stress/ssl.yml index d28bd3595afc60..8e83110542c54c 100644 --- a/eng/pipelines/libraries/stress/ssl.yml +++ b/eng/pipelines/libraries/stress/ssl.yml @@ -55,7 +55,7 @@ jobs: timeoutInMinutes: 120 pool: name: NetCore1ESPool-Public - demands: ImageOverride -equals Build.Server.Amd64.VS2022.Open + demands: ImageOverride -equals Build.Windows.Amd64.VS2022.Open steps: - checkout: self diff --git a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml index 11d037adc1cccb..0bed3269070ba7 100644 --- a/eng/pipelines/official/jobs/prepare-signed-artifacts.yml +++ b/eng/pipelines/official/jobs/prepare-signed-artifacts.yml @@ -10,7 +10,7 @@ jobs: dependsOn: ${{ parameters.dependsOn }} pool: name: NetCore1ESPool-Internal - demands: ImageOverride -equals build.windows.10.amd64.vs2022 + demands: ImageOverride -equals build.windows.amd64.vs2022 # Double the default timeout. timeoutInMinutes: 180 workspace: diff --git a/eng/pipelines/official/stages/publish.yml b/eng/pipelines/official/stages/publish.yml index 21fdeb986dda44..8b11c5eac48637 100644 --- a/eng/pipelines/official/stages/publish.yml +++ b/eng/pipelines/official/stages/publish.yml @@ -20,7 +20,7 @@ stages: dependsOn: PrepareSignedArtifacts pool: name: NetCore1ESPool-Internal - demands: ImageOverride -equals Build.Windows.10.Amd64.VS2022 + demands: ImageOverride -equals Build.Windows.Amd64.VS2022 # Stages-based publishing entry point - template: /eng/common/templates/post-build/post-build.yml From 572920d92e54d4b4de987b53b0b74c72f7396f23 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Thu, 24 Feb 2022 16:53:12 -0800 Subject: [PATCH 4/7] Add c11 target_compile_feature spec for coreclrpal --- src/coreclr/pal/src/CMakeLists.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/coreclr/pal/src/CMakeLists.txt b/src/coreclr/pal/src/CMakeLists.txt index be8d4d68b6e741..1a63ffcdec5587 100644 --- a/src/coreclr/pal/src/CMakeLists.txt +++ b/src/coreclr/pal/src/CMakeLists.txt @@ -230,6 +230,7 @@ add_library(coreclrpal ${PLATFORM_SOURCES} ${LIBUNWIND_OBJECTS} ) +target_compile_features(coreclrpal PRIVATE cxx_std_11) # Build separate pal library for DAC (addition to regular pal library) if(CLR_CMAKE_TARGET_OSX) From d394675c2ca6b45ddbe8f4e9d8af5ddfc026ae73 Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Thu, 24 Feb 2022 17:12:29 -0800 Subject: [PATCH 5/7] Revert "Add c11 target_compile_feature spec for coreclrpal" This reverts commit 2ad8f63ff2eed6dcff6dfab3028516ef0053190d. --- src/coreclr/pal/src/CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/coreclr/pal/src/CMakeLists.txt b/src/coreclr/pal/src/CMakeLists.txt index 1a63ffcdec5587..be8d4d68b6e741 100644 --- a/src/coreclr/pal/src/CMakeLists.txt +++ b/src/coreclr/pal/src/CMakeLists.txt @@ -230,7 +230,6 @@ add_library(coreclrpal ${PLATFORM_SOURCES} ${LIBUNWIND_OBJECTS} ) -target_compile_features(coreclrpal PRIVATE cxx_std_11) # Build separate pal library for DAC (addition to regular pal library) if(CLR_CMAKE_TARGET_OSX) From cd8826030ed5dc34e60033435137447e65bc41bd Mon Sep 17 00:00:00 2001 From: Andy Gocke Date: Thu, 24 Feb 2022 17:14:25 -0800 Subject: [PATCH 6/7] Try a different fix --- eng/native/configurecompiler.cmake | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index 60d2b2b80296f3..df85a5bdabf0bd 100644 --- a/eng/native/configurecompiler.cmake +++ b/eng/native/configurecompiler.cmake @@ -8,6 +8,14 @@ set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) +# Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/21069 +# TODO: delete this block once "cmake" in global.json: +# https://github.com/dotnet/runtime/blob/a82d92c36624e89e831e37515a9b0c95a4cfe183/global.json#L11 +# is bumped passed 3.18.2. +if (MSVC) + add_compile_options($<$:/std:c11>) +endif() + include(CheckCCompilerFlag) include(CheckCXXCompilerFlag) From c55c06694de1161472413e61d29dc15a92fce8ab Mon Sep 17 00:00:00 2001 From: Juan Sebastian Hoyos Ayala Date: Thu, 24 Feb 2022 21:34:11 -0800 Subject: [PATCH 7/7] Remove usage of native bootstrapping on Windows --- eng/native/configurecompiler.cmake | 8 -------- 1 file changed, 8 deletions(-) diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index df85a5bdabf0bd..60d2b2b80296f3 100644 --- a/eng/native/configurecompiler.cmake +++ b/eng/native/configurecompiler.cmake @@ -8,14 +8,6 @@ set(CMAKE_C_STANDARD_REQUIRED ON) set(CMAKE_CXX_STANDARD 11) set(CMAKE_CXX_STANDARD_REQUIRED ON) -# Workaround for https://gitlab.kitware.com/cmake/cmake/-/issues/21069 -# TODO: delete this block once "cmake" in global.json: -# https://github.com/dotnet/runtime/blob/a82d92c36624e89e831e37515a9b0c95a4cfe183/global.json#L11 -# is bumped passed 3.18.2. -if (MSVC) - add_compile_options($<$:/std:c11>) -endif() - include(CheckCCompilerFlag) include(CheckCXXCompilerFlag)