diff --git a/eng/Version.Details.props b/eng/Version.Details.props index fe01624e8c4..e9091c3973f 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -8,30 +8,30 @@ This file should be imported by eng/Versions.props 15.9.20 15.9.20 - 11.0.0-beta.25574.108 - 11.0.0-beta.25574.108 - 11.0.0-beta.25574.108 - 11.0.0-beta.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 + 11.0.0-beta.25576.105 + 11.0.0-beta.25576.105 + 11.0.0-beta.25576.105 + 11.0.0-beta.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 8.0.0-beta.23409.2 8.0.0-beta.23409.2 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 - 10.0.0-rc.3.25574.108 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 + 10.0.0-rc.3.25576.105 10.0.0-rc.1.25573.1 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 09479b28d69..9b505a5c4cd 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,78 +1,78 @@ - + - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f https://dev.azure.com/dnceng/internal/_git/dotnet-wpf-int 6728e84a57b452a39cbbeafd7979ab64f387ba23 - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f https://github.com/dotnet/dotnet @@ -84,21 +84,21 @@ - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f @@ -109,9 +109,9 @@ https://github.com/dotnet/dotnet e9f665e52848a3615736c099e5631af531b66a5c - + https://github.com/dotnet/dotnet - d119b40e8ff3b88f87ad60b04c807233a159b197 + 305623c3cd0df455e01b95ed3a8c347e650b315f diff --git a/eng/common/core-templates/job/source-index-stage1.yml b/eng/common/core-templates/job/source-index-stage1.yml index 30530359a5d..58b7a76814e 100644 --- a/eng/common/core-templates/job/source-index-stage1.yml +++ b/eng/common/core-templates/job/source-index-stage1.yml @@ -25,10 +25,10 @@ jobs: pool: ${{ if eq(variables['System.TeamProject'], 'public') }}: name: $(DncEngPublicBuildPool) - image: windows.vs2022.amd64.open + image: windows.vs2026preview.scout.amd64.open ${{ if eq(variables['System.TeamProject'], 'internal') }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 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 6f0929c039b..06864cd1feb 100644 --- a/eng/common/core-templates/post-build/post-build.yml +++ b/eng/common/core-templates/post-build/post-build.yml @@ -127,11 +127,11 @@ stages: ${{ else }}: ${{ if eq(parameters.is1ESPipeline, true) }}: name: $(DncEngInternalBuildPool) - image: windows.vs2022.amd64 + image: windows.vs2026preview.scout.amd64 os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml @@ -175,7 +175,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: @@ -236,7 +236,7 @@ stages: os: windows ${{ else }}: name: $(DncEngInternalBuildPool) - demands: ImageOverride -equals windows.vs2022.amd64 + demands: ImageOverride -equals windows.vs2026preview.scout.amd64 steps: - template: /eng/common/core-templates/post-build/setup-maestro-vars.yml parameters: diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 9ae443f1c36..b64b66a6275 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -70,7 +70,7 @@ try { $GlobalJson.tools | Add-Member -Name "vs" -Value (ConvertFrom-Json "{ `"version`": `"16.5`" }") -MemberType NoteProperty } if( -not ($GlobalJson.tools.PSObject.Properties.Name -match "xcopy-msbuild" )) { - $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.14.16" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "18.0.0" -MemberType NoteProperty } if ($GlobalJson.tools."xcopy-msbuild".Trim() -ine "none") { $xcopyMSBuildToolsFolder = InitializeXCopyMSBuild $GlobalJson.tools."xcopy-msbuild" -install $true diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 4bc50bd568c..578705ee4db 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -394,8 +394,8 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # If the version of msbuild is going to be xcopied, # use this version. Version matches a package here: - # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/17.14.16 - $defaultXCopyMSBuildVersion = '17.14.16' + # https://dev.azure.com/dnceng/public/_artifacts/feed/dotnet-eng/NuGet/Microsoft.DotNet.Arcade.MSBuild.Xcopy/versions/18.0.0 + $defaultXCopyMSBuildVersion = '18.0.0' if (!$vsRequirements) { if (Get-Member -InputObject $GlobalJson.tools -Name 'vs') { diff --git a/global.json b/global.json index 64871291cf8..b6282db9b89 100644 --- a/global.json +++ b/global.json @@ -1,6 +1,6 @@ { "sdk": { - "version": "10.0.100-rc.2.25502.107", + "version": "10.0.100", "allowPrerelease": true, "rollForward": "latestFeature", "paths": [ @@ -10,7 +10,7 @@ "errorMessage": "The required .NET SDK wasn't found. Please run ./eng/common/dotnet.cmd/sh to install it." }, "tools": { - "dotnet": "10.0.100-rc.2.25502.107", + "dotnet": "10.0.100", "runtimes": { "dotnet/x64": [ "$(MicrosoftNETCorePlatformsVersion)" @@ -27,8 +27,8 @@ "runner": "Microsoft.Testing.Platform" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25574.108", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25574.108", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25576.105", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25576.105", "Microsoft.Build.NoTargets": "3.7.56" }, "native-tools": {