diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e4822f24617..9b41743e15e 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,80 +1,80 @@ - + - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 - + https://github.com/dotnet/dotnet - 699b0116eb3df66c4dd7698af4f1cd24ac4547a3 + 1c92f346e02a8363def6f7bdbcc526d3c579dd74 diff --git a/eng/Versions.props b/eng/Versions.props index 0a871f3b7c4..8716d33c428 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -16,24 +16,24 @@ False - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 - 10.0.0-preview.7.25367.101 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 + 10.0.0-preview.7.25368.105 - 10.0.0-beta.25367.101 + 10.0.0-beta.25368.105 17.14.8 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 40f0aa86128..996a5f9c872 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 cb99e3d51a4..111b070336e 100644 --- a/global.json +++ b/global.json @@ -18,7 +18,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25367.101", - "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25367.101" + "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25368.105", + "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25368.105" } }