diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index 92772c0c4e..9cac02c710 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -1,17 +1,17 @@ - + https://github.com/dotnet/arcade - 8ccad075bbb0db445e03eed0a6073d27bdd4f31a + d8c2d041341ea7974fd3f2057e9d6afdd4f37598 - + https://github.com/dotnet/arcade - 8ccad075bbb0db445e03eed0a6073d27bdd4f31a + d8c2d041341ea7974fd3f2057e9d6afdd4f37598 - + https://github.com/dotnet/arcade - 8ccad075bbb0db445e03eed0a6073d27bdd4f31a + d8c2d041341ea7974fd3f2057e9d6afdd4f37598 diff --git a/eng/Versions.props b/eng/Versions.props index 44f00847a2..c611e99056 100644 --- a/eng/Versions.props +++ b/eng/Versions.props @@ -2,7 +2,7 @@ prerelease - 5.0.0-beta.20151.1 + 5.0.0-beta.20152.4 4.6.0 4.6.0 diff --git a/eng/common/build.ps1 b/eng/common/build.ps1 index 88814514d8..813d440d2a 100644 --- a/eng/common/build.ps1 +++ b/eng/common/build.ps1 @@ -26,6 +26,11 @@ Param( [Parameter(ValueFromRemainingArguments=$true)][String[]]$properties ) +# Unset 'Platform' environment variable to avoid unwanted collision in InstallDotNetCore.targets file +# some computer has this env var defined (e.g. Some HP) +if($env:Platform) { + $env:Platform="" +} function Print-Usage() { Write-Host "Common settings:" Write-Host " -configuration Build configuration: 'Debug' or 'Release' (short: -c)" diff --git a/global.json b/global.json index 468d9b4a7e..1d88492174 100644 --- a/global.json +++ b/global.json @@ -11,7 +11,7 @@ "version": "3.1.101" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20151.1", - "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20151.1" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20152.4", + "Microsoft.DotNet.Helix.Sdk": "5.0.0-beta.20152.4" } }