diff --git a/NuGet.config b/NuGet.config index 7c1d67a02a9..8fb6689b1b1 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,7 @@ - + @@ -21,7 +21,7 @@ - + diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 0c5a5f6d1db..f968ebaf556 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -6,18 +6,18 @@ This file should be imported by eng/Versions.props - 10.0.0-beta.26057.111 - 10.0.0-beta.26057.111 - 10.0.0-beta.26057.111 - 10.0.0-beta.26057.111 - 10.0.0-beta.26057.111 - 10.0.0-beta.26057.111 - 10.0.0-beta.26057.111 + 10.0.0-beta.26062.108 + 10.0.0-beta.26062.108 + 10.0.0-beta.26062.108 + 10.0.0-beta.26062.108 + 10.0.0-beta.26062.108 + 10.0.0-beta.26062.108 + 10.0.0-beta.26062.108 10.0.3 10.0.3 10.0.3 10.0.3 - 10.0.3-servicing.26057.111 + 10.0.3-servicing.26062.108 10.0.3 10.0.3 10.0.3 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index deffbe9560d..a78dba3cb9c 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -6,110 +6,110 @@ Note: if the Uri is a new place, you will need to add a subscription from that p And you can check these with "darc get-dependencies target-repo "winforms" --> - + - + https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 - + https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 - + https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 - + https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 - + https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 - + https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 - + https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 - + https://github.com/dotnet/dotnet - 4ef9fba1ed958b047163527960c27baf2883f835 + 976695d40cfde0801c78b8fed85ca80e997da085 diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index 3437087c80f..b955fac6e13 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -80,7 +80,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 9423d71ca3a..b942a79ef02 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -293,11 +293,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 33602751f92..9ad8f98bccc 100644 --- a/global.json +++ b/global.json @@ -21,9 +21,9 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26057.111", - "Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.26057.111", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26057.111", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26062.108", + "Microsoft.DotNet.CMake.Sdk": "10.0.0-beta.26062.108", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26062.108", "FIX-85B6-MERGE-9C38-CONFLICT": "1.0.0", "Microsoft.NET.Sdk.IL": "10.0.3" },