diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 0275aa7c..42fb1435 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,25 +3,25 @@ - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 - + https://github.com/dotnet/arcade - 5f04b602a86b74f6cdd12f48aca2d1868e6425f3 + 5145e86df0c491e082b589aa31d69eea300adc02 https://github.com/dotnet/arcade-services diff --git a/eng/common/sdk-task.ps1 b/eng/common/sdk-task.ps1 index b1bca63a..119a6c66 100644 --- a/eng/common/sdk-task.ps1 +++ b/eng/common/sdk-task.ps1 @@ -64,7 +64,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 "16.10.0-preview2" -MemberType NoteProperty + $GlobalJson.tools | Add-Member -Name "xcopy-msbuild" -Value "17.1.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 f1e1cb53..797f0529 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -365,8 +365,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/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=16.10.0-preview2&view=overview - $defaultXCopyMSBuildVersion = '16.10.0-preview2' + # https://dev.azure.com/dnceng/public/_packaging?_a=package&feed=dotnet-eng&package=RoslynTools.MSBuild&protocolType=NuGet&version=17.1.0&view=overview + $defaultXCopyMSBuildVersion = '17.1.0' if (!$vsRequirements) { $vsRequirements = $GlobalJson.tools.vs } $vsMinVersionStr = if ($vsRequirements.version) { $vsRequirements.version } else { $vsMinVersionReqdStr } diff --git a/global.json b/global.json index df111075..ed9265b0 100644 --- a/global.json +++ b/global.json @@ -14,6 +14,6 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22222.4" + "Microsoft.DotNet.Arcade.Sdk": "7.0.0-beta.22225.6" } }