diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 131a419d975..5039275885c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -75,25 +75,25 @@ - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + b6e8b5b2cc97d5c802dff2dcc5f527193a5d50fd diff --git a/eng/Versions.props b/eng/Versions.props index 1ad49e2cb22..21c7e05ff78 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,9 +37,9 @@ - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 - 7.0.0-beta.21527.5 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 + 7.0.0-beta.21528.3 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 69eb67849d7..3aafc82e417 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -60,11 +60,7 @@ jobs: - name: GuardianPackagesConfigFile value: $(Build.SourcesDirectory)\eng\common\sdl\packages.config pool: - # To extract archives (.tar.gz, .zip), we need access to "tar", added in Windows 10/2019. - ${{ if eq(parameters.extractArchiveArtifacts, 'false') }}: - name: Hosted VS2017 - ${{ if ne(parameters.extractArchiveArtifacts, 'false') }}: - vmImage: windows-2019 + vmImage: windows-2019 steps: - checkout: self clean: true diff --git a/eng/common/templates/job/onelocbuild.yml b/eng/common/templates/job/onelocbuild.yml index a842886629b..c4fc18b3ee7 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: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' CeapexPat: $(dn-bot-ceapex-package-r) # PAT for the loc AzDO instance https://dev.azure.com/ceapex GithubPat: $(BotAccount-dotnet-bot-repo-PAT) diff --git a/eng/common/templates/job/source-index-stage1.yml b/eng/common/templates/job/source-index-stage1.yml index 1cc0c29e4fd..ae85a99a853 100644 --- a/eng/common/templates/job/source-index-stage1.yml +++ b/eng/common/templates/job/source-index-stage1.yml @@ -6,7 +6,7 @@ parameters: preSteps: [] binlogPath: artifacts/log/Debug/Build.binlog pool: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' condition: '' dependsOn: '' diff --git a/eng/common/templates/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index a1f8fce96ca..8dd1fdbd144 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -83,7 +83,7 @@ jobs: - ${{ if eq(parameters.enableSourceBuild, true) }}: - Source_Build_Complete pool: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} @@ -96,4 +96,4 @@ jobs: dependsOn: - Asset_Registry_Publish pool: - vmImage: vs2017-win2016 + vmImage: 'windows-2019' diff --git a/global.json b/global.json index c8311b2ee05..61341678821 100644 --- a/global.json +++ b/global.json @@ -12,8 +12,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21527.5", - "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21527.5" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.21528.3", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21528.3" }, "sdk": { "version": "6.0.100-rc.1.21430.12"