diff --git a/eng/Version.Details.props b/eng/Version.Details.props index 84866cc30e00..5597527a5d41 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -30,39 +30,39 @@ This file should be imported by eng/Versions.props 10.0.5 10.0.5-servicing.26153.111 10.0.5-servicing.26153.111 - 10.0.0-preview.26177.108 + 10.0.0-preview.26180.104 10.0.5 10.0.5 - 18.6.0-preview-26177-108 - 18.6.0-preview-26177-108 - 7.6.0-rc.17808 - 10.0.300-alpha.26177.108 - 5.6.0-2.26177.108 - 5.6.0-2.26177.108 - 5.6.0-2.26177.108 - 5.6.0-2.26177.108 - 5.6.0-2.26177.108 - 5.6.0-2.26177.108 - 5.6.0-2.26177.108 - 5.6.0-2.26177.108 - 10.0.0-preview.26177.108 - 5.6.0-2.26177.108 - 5.6.0-2.26177.108 - 5.6.0-2.26177.108 + 18.6.0-preview-26180-104 + 18.6.0-preview-26180-104 + 7.6.0-rc.18104 + 10.0.300-alpha.26180.104 + 5.6.0-2.26180.104 + 5.6.0-2.26180.104 + 5.6.0-2.26180.104 + 5.6.0-2.26180.104 + 5.6.0-2.26180.104 + 5.6.0-2.26180.104 + 5.6.0-2.26180.104 + 5.6.0-2.26180.104 + 10.0.0-preview.26180.104 + 5.6.0-2.26180.104 + 5.6.0-2.26180.104 + 5.6.0-2.26180.104 2.0.0-preview.1.26153.111 2.2.5 - 10.0.0-beta.26177.108 - 10.0.0-beta.26177.108 - 10.0.0-beta.26177.108 - 10.0.0-beta.26177.108 - 10.0.0-beta.26177.108 - 10.0.0-beta.26177.108 + 10.0.0-beta.26180.104 + 10.0.0-beta.26180.104 + 10.0.0-beta.26180.104 + 10.0.0-beta.26180.104 + 10.0.0-beta.26180.104 + 10.0.0-beta.26180.104 10.0.5 10.0.5 10.0.5-servicing.26153.111 10.0.5-servicing.26153.111 - 10.0.0-beta.26177.108 - 10.0.0-beta.26177.108 + 10.0.0-beta.26180.104 + 10.0.0-beta.26180.104 10.0.5 10.0.5 10.0.5 @@ -73,55 +73,55 @@ This file should be imported by eng/Versions.props 10.0.5 10.0.5 10.0.5 - 15.2.300-servicing.26177.108 + 15.2.300-servicing.26180.104 10.0.5 - 5.6.0-2.26177.108 - 5.6.0-2.26177.108 + 5.6.0-2.26180.104 + 5.6.0-2.26180.104 10.0.5-servicing.26153.111 10.0.5 10.0.5 10.0.0-preview.7.25377.103 - 10.0.0-preview.26177.108 + 10.0.0-preview.26180.104 10.0.5-servicing.26153.111 - 18.3.0-release-26177-108 + 18.3.0-release-26180-104 10.0.5 10.0.5-servicing.26153.111 - 10.0.300-alpha.26177.108 - 10.0.300-alpha.26177.108 - 10.0.300-alpha.26177.108 - 10.0.300-alpha.26177.108 - 10.0.300-alpha.26177.108 - 10.0.300-preview.26177.108 - 10.0.300-preview.26177.108 - 10.0.300-preview.26177.108 - 10.0.300-preview.26177.108 - 10.0.300-preview.26177.108 - 10.0.300-preview.26177.108 - 10.0.300-preview.26177.108 - 10.0.300-preview.26177.108 - 10.0.300-preview.26177.108 - 18.3.0-release-26177-108 - 18.3.0-release-26177-108 + 10.0.300-alpha.26180.104 + 10.0.300-alpha.26180.104 + 10.0.300-alpha.26180.104 + 10.0.300-alpha.26180.104 + 10.0.300-alpha.26180.104 + 10.0.300-preview.26180.104 + 10.0.300-preview.26180.104 + 10.0.300-preview.26180.104 + 10.0.300-preview.26180.104 + 10.0.300-preview.26180.104 + 10.0.300-preview.26180.104 + 10.0.300-preview.26180.104 + 10.0.300-preview.26180.104 + 10.0.300-preview.26180.104 + 18.3.0-release-26180-104 + 18.3.0-release-26180-104 3.2.5 10.0.5 10.0.5-servicing.26153.111 10.0.5 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 - 7.6.0-rc.17808 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 + 7.6.0-rc.18104 10.0.5 2.0.5 10.0.5 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a86870b4ccf5..09d45bf23ba1 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,42 +1,42 @@ - + - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -72,142 +72,142 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet a612c2a1056fe3265387ae3ff7c94eba1505caf9 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -374,25 +374,25 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet a612c2a1056fe3265387ae3ff7c94eba1505caf9 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet a612c2a1056fe3265387ae3ff7c94eba1505caf9 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -409,29 +409,29 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet a612c2a1056fe3265387ae3ff7c94eba1505caf9 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 @@ -523,9 +523,9 @@ https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet a612c2a1056fe3265387ae3ff7c94eba1505caf9 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet @@ -537,37 +537,37 @@ - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 - + https://github.com/dotnet/dotnet - cf1948f9c20bc33556719613def8cbbf05e9865f + 36b89c782bda10112c52396d9f0fe18171b60604 https://dev.azure.com/dnceng/internal/_git/dotnet-dotnet diff --git a/eng/common/core-templates/job/onelocbuild.yml b/eng/common/core-templates/job/onelocbuild.yml index c5788829a872..eefed3b667a4 100644 --- a/eng/common/core-templates/job/onelocbuild.yml +++ b/eng/common/core-templates/job/onelocbuild.yml @@ -52,13 +52,13 @@ jobs: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: windows.vs2026.amd64 os: windows steps: diff --git a/eng/common/core-templates/job/publish-build-assets.yml b/eng/common/core-templates/job/publish-build-assets.yml index b955fac6e13f..9afcb8ae1590 100644 --- a/eng/common/core-templates/job/publish-build-assets.yml +++ b/eng/common/core-templates/job/publish-build-assets.yml @@ -74,13 +74,13 @@ jobs: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng ${{ if ne(variables['System.TeamProject'], 'DevDiv') }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2026.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 b942a79ef02d..2df4acb76859 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -120,7 +120,7 @@ stages: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng @@ -164,14 +164,14 @@ stages: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: windows.vs2026.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) @@ -225,14 +225,14 @@ stages: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: 1es-windows-2022 + image: windows.vs2026.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) @@ -286,18 +286,18 @@ stages: # We don't use the collection uri here because it might vary (.visualstudio.com vs. dev.azure.com) ${{ if eq(variables['System.TeamProject'], 'DevDiv') }}: name: AzurePipelines-EO - image: 1ESPT-Windows2022 + image: 1ESPT-Windows2025 demands: Cmd os: windows # If it's not devdiv, it's dnceng ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: NetCore1ESPool-Publishing-Internal - image: windows.vs2022.amd64 + image: windows.vs2026.amd64 os: windows ${{ else }}: name: NetCore1ESPool-Publishing-Internal - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/templates-official/variables/pool-providers.yml b/eng/common/templates-official/variables/pool-providers.yml index 1f308b24efc4..2cc3ae305d5a 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 +# image: windows.vs2026.amd64 variables: # Coalesce the target and source branches so we know when a PR targets a release branch diff --git a/eng/common/templates/variables/pool-providers.yml b/eng/common/templates/variables/pool-providers.yml index 18693ea120d5..587770f0add4 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.vs2022.amd64 +# demands: ImageOverride -equals windows.vs2026.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 be9a12a56f75..d998ac645145 100644 --- a/global.json +++ b/global.json @@ -21,8 +21,8 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26177.108", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26177.108", + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.26180.104", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.26180.104", "Microsoft.Build.NoTargets": "3.7.0", "Microsoft.Build.Traversal": "3.4.0", "Microsoft.WixToolset.Sdk": "5.0.2-dotnet.2811440"