diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 090c6ec355a..2b0d0807107 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -65,21 +65,21 @@ Note: if the Uri is a new place, you will need to add a subscription from that p c2e8c9f71737d87a95610851587e2a1eaf18c91c - + https://github.com/dotnet/arcade - 98e2fbaad9f2f7bbe091bb0b9dd37d03206becc9 + afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7 - + https://github.com/dotnet/arcade - 98e2fbaad9f2f7bbe091bb0b9dd37d03206becc9 + afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7 - + https://github.com/dotnet/arcade - 98e2fbaad9f2f7bbe091bb0b9dd37d03206becc9 + afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7 - + https://github.com/dotnet/arcade - 98e2fbaad9f2f7bbe091bb0b9dd37d03206becc9 + afb79612f8e0b62603d9c1a614d7e4cf3f54a1e7 diff --git a/eng/Versions.props b/eng/Versions.props index 792358b77a4..67d60a60a3a 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -37,8 +37,8 @@ - 1.0.0-beta.21427.4 - 2.4.1-beta.21427.4 + 1.0.0-beta.21552.6 + 2.4.1-beta.21552.6 diff --git a/eng/common/templates/job/execute-sdl.yml b/eng/common/templates/job/execute-sdl.yml index 34ea015684c..459f21c878e 100644 --- a/eng/common/templates/job/execute-sdl.yml +++ b/eng/common/templates/job/execute-sdl.yml @@ -19,7 +19,7 @@ jobs: variables: - group: DotNet-VSTS-Bot pool: - name: Hosted VS2017 + 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 b27d6faf303..e804cf3f38d 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/jobs/jobs.yml b/eng/common/templates/jobs/jobs.yml index 6a2f98c036f..a5c6ad2940d 100644 --- a/eng/common/templates/jobs/jobs.yml +++ b/eng/common/templates/jobs/jobs.yml @@ -74,7 +74,7 @@ jobs: - ${{ each job in parameters.jobs }}: - ${{ job.job }} pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 runAsPublic: ${{ parameters.runAsPublic }} publishUsingPipelines: ${{ parameters.enablePublishUsingPipelines }} enablePublishBuildArtifacts: ${{ parameters.enablePublishBuildArtifacts }} @@ -87,4 +87,4 @@ jobs: dependsOn: - Asset_Registry_Publish pool: - vmImage: vs2017-win2016 + vmImage: windows-2019 diff --git a/global.json b/global.json index d28d8be339f..585c2fa55d0 100644 --- a/global.json +++ b/global.json @@ -15,8 +15,8 @@ "version": "3.1.100" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21427.4", - "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21427.4", + "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.21552.6", + "Microsoft.DotNet.Helix.Sdk": "2.0.0-beta.21552.6", "Microsoft.NET.Sdk.IL": "3.1.9-servicing.20458.2" }, "native-tools": {