diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index bbe86b25c85ef883b37583a415663a8ea3ca19cb..85b638154c030677cd4f377c977bf5267fe86208 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + 0558f85d950fee2838bf02b9ba1f20d67f00b504 - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + 0558f85d950fee2838bf02b9ba1f20d67f00b504 - + https://github.com/dotnet/arcade - acde984116ccca032c345b782667a9a3ed9ba877 + 0558f85d950fee2838bf02b9ba1f20d67f00b504 diff --git a/eng/Versions.props b/eng/Versions.props index e376398d5943391e9fd3e001d6151bbd10ded464..e5ae56746446c2f7402d4cbae69df6a0f531cabe 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,7 +4,7 @@ false prerelease - 7.0.0-beta.21527.5 + 7.0.0-beta.21529.1 5.0.3 5.0.1 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 69eb67849d741db33a0e737cbfd667317c3d9313..3aafc82e4171a7262f7471374091393bb45878e9 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 a842886629bbd6a686dccbbef9ebff86dfdd3a1f..c4fc18b3ee77aa316c409fbb9a82c056a1795751 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 1cc0c29e4fdabcd1a50bc223892c908c4474a193..ae85a99a853f4b842a0a99f175828986aaae239d 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 a1f8fce96ca81d2ab91411c1c9c77f57f125930e..8dd1fdbd144a06e265057c2a0d2e7dc8c9b9031d 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 88f2e14184d93c3d881054e10d79e409651fa48c..9399d849321d70b3f3ff668b17c3b23b847fb92b 100644 --- a/global.json +++ b/global.json @@ -12,7 +12,7 @@ "version": "6.0.100-rc.1.21430.12" }, "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.21529.1", + "Microsoft.DotNet.Helix.Sdk": "7.0.0-beta.21529.1" } }