diff --git a/NuGet.config b/NuGet.config index 987508af3f59..612eb42698d2 100644 --- a/NuGet.config +++ b/NuGet.config @@ -4,7 +4,6 @@ - @@ -14,7 +13,6 @@ - @@ -22,13 +20,12 @@ - + - @@ -55,17 +52,14 @@ - - - diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index a8b6ae4d120b..37a70df5565b 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -491,22 +491,22 @@ - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da - + https://github.com/dotnet/arcade - 6e3320b5eaab29bd1bff1f398c7f4e18ef0ed57d + a73c08ec0de5a6e5e2a8668837df67edecb3a3da https://dev.azure.com/dnceng/internal/_git/dotnet-runtime diff --git a/eng/Versions.props b/eng/Versions.props index 672d28f70b6c..a414cc2f9232 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -36,7 +36,7 @@ 8.0.0 4.0.0 8.0.0 - 8.0.0-beta.25326.1 + 8.0.0-beta.25366.2 7.0.0-preview.22423.2 8.0.0 4.3.0 @@ -215,7 +215,7 @@ 6.12.0 6.1.0 - 8.0.0-beta.25326.1 + 8.0.0-beta.25366.2 4.18.4 1.3.2 8.0.0-beta.23607.1 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 82b2798ba307..bb048ad125a8 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 ed50dd9fa2e4..ba2c55db56f6 100644 --- a/global.json +++ b/global.json @@ -14,7 +14,7 @@ } }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25326.1", - "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25326.1" + "Microsoft.DotNet.Arcade.Sdk": "8.0.0-beta.25366.2", + "Microsoft.DotNet.Helix.Sdk": "8.0.0-beta.25366.2" } }