diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a70d8eec8..dd3c75317 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -243,17 +243,17 @@ - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 https://github.com/dotnet/arcade-services @@ -263,14 +263,14 @@ https://github.com/dotnet/arcade-services 0e9abfee048404d9b994fc64235b42216ce68dad - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 - + https://github.com/dotnet/arcade - 4345e14684eab24fa2f8217706756dd7c0787d84 + 986a55a9c7f1ef547bc705d6adada5e0c2217819 diff --git a/eng/Versions.props b/eng/Versions.props index 51fbef1cb..794306ffd 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -39,7 +39,7 @@ - 9.0.0-beta.24178.6 + 9.0.0-beta.24179.6 diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index ba9ba4930..52b4d05d3 100644 --- a/eng/common/templates-official/job/onelocbuild.yml +++ b/eng/common/templates-official/job/onelocbuild.yml @@ -56,7 +56,7 @@ jobs: # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 50f04e642..50d4b98e2 100644 --- a/eng/common/templates-official/job/source-build.yml +++ b/eng/common/templates-official/job/source-build.yml @@ -52,7 +52,7 @@ jobs: ${{ 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-mariner-2-pt + image: 1es-mariner-2 os: linux ${{ if ne(parameters.platform.pool, '') }}: diff --git a/eng/common/templates-official/post-build/post-build.yml b/eng/common/templates-official/post-build/post-build.yml index d286e956b..da1f40958 100644 --- a/eng/common/templates-official/post-build/post-build.yml +++ b/eng/common/templates-official/post-build/post-build.yml @@ -110,7 +110,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: @@ -150,7 +150,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml @@ -208,7 +208,7 @@ stages: # If it's not devdiv, it's dnceng ${{ else }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + image: 1es-windows-2022 os: windows steps: - template: setup-maestro-vars.yml diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index beab7d1bf..1f308b24e 100644 --- a/eng/common/templates-official/variables/pool-providers.yml +++ b/eng/common/templates-official/variables/pool-providers.yml @@ -23,7 +23,7 @@ # # pool: # name: $(DncEngInternalBuildPool) -# image: 1es-windows-2022-pt +# image: 1es-windows-2022 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/global.json b/global.json index af5d294f0..d68de8bf1 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "cmake": "latest" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24178.6", - "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24178.6" + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24179.6", + "Microsoft.DotNet.CMake.Sdk": "9.0.0-beta.24179.6" } }