diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 3aba855572a71c..2b3256114ffa8f 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -92,87 +92,87 @@ - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 https://github.com/dotnet/runtime-assets @@ -332,9 +332,9 @@ https://github.com/dotnet/xharness 006ea312a94e8b7f5b7ae47a6470f733ddd1738a - + https://github.com/dotnet/arcade - b6fada3ec4fa37e08dcbafaa6ddf59213f3f8687 + 532f956a119bce77ca279994054d08dbc24418f7 https://dev.azure.com/dnceng/internal/_git/dotnet-optimization diff --git a/eng/Versions.props b/eng/Versions.props index 8d784dc5c59361..94759aabe94ad1 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -83,22 +83,22 @@ 9.0.100-preview.4.24175.4 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 - 2.6.7-beta.24176.6 - 9.0.0-beta.24176.6 - 2.6.7-beta.24176.6 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 - 9.0.0-beta.24176.6 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 + 2.6.7-beta.24203.1 + 9.0.0-beta.24203.1 + 2.6.7-beta.24203.1 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 + 9.0.0-beta.24203.1 1.4.0 diff --git a/eng/common/templates-official/job/onelocbuild.yml b/eng/common/templates-official/job/onelocbuild.yml index ba9ba49303292a..52b4d05d3f8dd6 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/publish-build-assets.yml b/eng/common/templates-official/job/publish-build-assets.yml index d72e4ea6d9f293..38340d3e38614a 100644 --- a/eng/common/templates-official/job/publish-build-assets.yml +++ b/eng/common/templates-official/job/publish-build-assets.yml @@ -60,8 +60,8 @@ jobs: os: windows # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 os: windows steps: - ${{ if and(eq(parameters.runAsPublic, 'false'), ne(variables['System.TeamProject'], 'public'), notin(variables['Build.Reason'], 'PullRequest')) }}: diff --git a/eng/common/templates-official/job/source-build.yml b/eng/common/templates-official/job/source-build.yml index 50f04e642a3543..50d4b98e201a31 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 5c98fe1c0f3a96..da1f40958b450d 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 @@ -261,8 +261,8 @@ stages: os: windows # If it's not devdiv, it's dnceng ${{ else }}: - name: $(DncEngInternalBuildPool) - image: 1es-windows-2022-pt + name: NetCore1ESPool-Publishing-Internal + image: windows.vs2019.amd64 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 beab7d1bfba062..1f308b24efc43d 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 c6da44ecdbcdf2..3f9d14a6e2e518 100644 --- a/global.json +++ b/global.json @@ -8,9 +8,9 @@ "dotnet": "9.0.100-preview.1.24101.2" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24176.6", - "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24176.6", - "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24176.6", + "Microsoft.DotNet.Arcade.Sdk": "9.0.0-beta.24203.1", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.24203.1", + "Microsoft.DotNet.SharedFramework.Sdk": "9.0.0-beta.24203.1", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.NET.Sdk.IL": "9.0.0-preview.4.24175.1"