diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 4ad7294b2..dff56c907 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,17 +3,17 @@ - + https://github.com/dotnet/arcade - 4e526204e83e615efe8eb5743be7fbccfa4e492a + d777c20040bdc2e52b372fa98dcb84141ed692d3 - + https://github.com/dotnet/arcade - 4e526204e83e615efe8eb5743be7fbccfa4e492a + d777c20040bdc2e52b372fa98dcb84141ed692d3 - + https://github.com/dotnet/arcade - 4e526204e83e615efe8eb5743be7fbccfa4e492a + d777c20040bdc2e52b372fa98dcb84141ed692d3 diff --git a/eng/Versions.props b/eng/Versions.props index 5bb5b6f94..abf5114fc 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -15,7 +15,7 @@ 8.0.0 6.0.36 0.2.0-alpha.24576.2 - 10.0.0-beta.25358.3 + 10.0.0-beta.25367.5 6.0.0 4.18.4 4.9.4 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 40f0aa861..996a5f9c8 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -414,7 +414,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 4440cc7e0..b71be29b9 100644 --- a/global.json +++ b/global.json @@ -1,9 +1,9 @@ { "sdk": { - "version": "10.0.100-preview.6.25315.102" + "version": "10.0.100-preview.7.25322.101" }, "tools": { - "dotnet": "10.0.100-preview.6.25315.102", + "dotnet": "10.0.100-preview.7.25322.101", "runtimes": { "dotnet": [ "8.0.13", @@ -16,7 +16,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25358.3", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25358.3" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.5", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25367.5" } }