diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4b23a85097b..8f4e7d4b1d8 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -67,14 +67,14 @@ - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da @@ -96,9 +96,9 @@ 919d4dbfb0dffb35a702417e28ceea652d248bc6 - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da diff --git a/eng/Versions.props b/eng/Versions.props index ae76ccc1bd0..5ac93b6a704 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ - 17.10.33 + 17.10.34 release 17.8.3 15.1.0.0 @@ -49,7 +49,7 @@ Otherwise, this version of dotnet will not be installed and the build will error out. --> $([System.Text.RegularExpressions.Regex]::Match($([System.IO.File]::ReadAllText('$(MSBuildThisFileDirectory)..\global.json')), '"dotnet": "([^"]*)"').Groups.get_Item(1)) 4.2.0-1.22102.8 - 8.0.0-beta.25326.1 + 8.0.0-beta.25366.2 7.0.0 6.0.0 4.10.0-3.24175.2 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 82b2798ba30..bb048ad125a 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -417,7 +417,7 @@ function InitializeVisualStudioMSBuild([bool]$install, [object]$vsRequirements = # Locate Visual Studio installation or download x-copy msbuild. $vsInfo = LocateVisualStudio $vsRequirements - if ($vsInfo -ne $null) { + if ($vsInfo -ne $null -and $env:ForceUseXCopyMSBuild -eq $null) { # Ensure vsInstallDir has a trailing slash $vsInstallDir = Join-Path $vsInfo.installationPath "\" $vsMajorVersion = $vsInfo.installationVersion.Split('.')[0] diff --git a/global.json b/global.json index cfdfd6becfc..cedb5989439 100644 --- a/global.json +++ b/global.json @@ -10,6 +10,6 @@ "xcopy-msbuild": "17.8.5" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2" } }