diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 88c7a066c6..3c35cfa295 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + 9b9436a55a49bd58acb8ae95a57ad2185da26805 diff --git a/eng/Versions.props b/eng/Versions.props index 8903eebe53..768d146004 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -4,7 +4,7 @@ false prerelease - 9.0.0-beta.25626.6 + 9.0.0-beta.26070.1 8.0.8 8.0.0 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 6b5ff28cc7..3cb20fb504 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -74,7 +74,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows steps: - ${{ if eq(parameters.is1ESPipeline, '') }}: diff --git a/eng/common/core-templates/job/source-build.yml b/eng/common/core-templates/job/source-build.yml index 1037ccedcb..0e5458e1f4 100644 --- a/eng/common/core-templates/job/source-build.yml +++ b/eng/common/core-templates/job/source-build.yml @@ -65,7 +65,7 @@ jobs: demands: ImageOverride -equals build.ubuntu.2004.amd64 ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $[replace(replace(eq(contains(coalesce(variables['System.PullRequest.TargetBranch'], variables['Build.SourceBranch'], 'refs/heads/main'), 'release'), 'true'), True, 'NetCore1ESPool-Svc-Internal'), False, 'NetCore1ESPool-Internal')] - image: 1es-azurelinux-3 + image: Azure-Linux-3-Amd64 os: linux ${{ else }}: pool: diff --git a/eng/common/core-templates/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 221d1ac6de..864427d969 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -291,11 +291,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2019.amd64 + image: windows.vs2022.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2019.amd64 + demands: ImageOverride -equals windows.vs2022.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index e0b19c14a0..18693ea120 100644 --- a/eng/common/templates/variables/pool-providers.yml +++ b/eng/common/templates/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# demands: ImageOverride -equals windows.vs2019.amd64 +# demands: ImageOverride -equals windows.vs2022.amd64 variables: - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - template: /eng/common/templates-official/variables/pool-providers.yml diff --git a/global.json b/global.json index f9ecb825a9..a2672ae2b7 100644 --- a/global.json +++ b/global.json @@ -16,8 +16,8 @@ "rollForward": "major" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.25626.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.25626.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.26070.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26070.1", "Microsoft.Build.Traversal": "3.1.6" } }