diff --git a/NuGet.config b/NuGet.config index 0fedd015e82..bd825a0a58e 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,10 +4,13 @@ + + + @@ -43,10 +46,13 @@ + + + diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0ccace20ee6..af8975bf8f5 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -206,17 +206,17 @@ - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 - + https://github.com/dotnet/arcade - ab5773ac30dce73227fa1dff6bf1a21eea67cbd0 + c85f9aceddaf85296e3efbc463daaa34fef5a375 diff --git a/eng/Versions.props b/eng/Versions.props index 36adf1d56ae..2a76fa2d78d 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -86,7 +86,7 @@ 9.0.12 - 9.0.0-beta.25626.6 + 9.0.0-beta.26063.2 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 6b5ff28cc70..3cb20fb5041 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/post-build/post-build.yml b/eng/common/core-templates/post-build/post-build.yml index 221d1ac6de1..864427d9694 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 e0b19c14a07..18693ea120d 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 c3b4988a49e..84d9e192c9e 100644 --- a/global.json +++ b/global.json @@ -20,7 +20,7 @@ "msbuild-sdks": { "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.2.0", - "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.26063.2", + "Microsoft.DotNet.Helix.Sdk": "9.0.0-beta.26063.2" } }