diff --git a/eng/Version.Details.props b/eng/Version.Details.props index c17c4dc2c47be..164bc2f08c356 100644 --- a/eng/Version.Details.props +++ b/eng/Version.Details.props @@ -39,9 +39,9 @@ This file should be imported by eng/Versions.props 9.0.0 9.0.0 - 11.0.0-beta.25571.8 - 11.0.0-beta.25571.8 - 11.0.0-beta.25571.8 + 11.0.0-beta.25574.6 + 11.0.0-beta.25574.6 + 11.0.0-beta.25574.6 2.0.0 diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index ea553e4199e86..fa5735d417fd4 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -115,13 +115,13 @@ - + https://github.com/dotnet/arcade - a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 + 9a99542f9b72dbcd0e07baec5166909ab756788a - + https://github.com/dotnet/arcade - a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 + 9a99542f9b72dbcd0e07baec5166909ab756788a https://github.com/dotnet/symreader @@ -131,9 +131,9 @@ https://github.com/dotnet/roslyn 5d10d428050c0d6afef30a072c4ae68776621877 - + https://github.com/dotnet/arcade - a8b9e73f56e84dcb4c7ed0f23f79b308b4f83a01 + 9a99542f9b72dbcd0e07baec5166909ab756788a https://github.com/dotnet/arcade-services diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index 9ae443f1c36b3..b64b66a6275bb 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 4bc50bd568cae..578705ee4dbde 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 24425ead336ab..7773bc942eb10 100644 --- a/global.json +++ b/global.json @@ -13,8 +13,8 @@ "xcopy-msbuild": "17.14.16" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25571.8", - "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25571.8", + "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25574.6", + "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25574.6", "Microsoft.Build.Traversal": "3.4.0" } }