diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml index e408c815a..b92652a17 100644 --- a/eng/Version.Details.xml +++ b/eng/Version.Details.xml @@ -3,9 +3,9 @@ - + https://github.com/dotnet/arcade - 6baa6d3c20effeee3631eb33e9e08bcf698a799c + 663ead2cbcbc7ee3d5cb792a30209ad58d6ee971 diff --git a/eng/common/tools.ps1 b/eng/common/tools.ps1 index 1bf215525..daca90c0b 100644 --- a/eng/common/tools.ps1 +++ b/eng/common/tools.ps1 @@ -240,8 +240,8 @@ function GetDotNetInstallScript([string] $dotnetRoot) { return $installScript } -function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = '') { - InstallDotNet $dotnetRoot $version $architecture '' $false $runtimeSourceFeed $runtimeSourceFeedKey +function InstallDotNetSdk([string] $dotnetRoot, [string] $version, [string] $architecture = '', [switch] $noPath) { + InstallDotNet $dotnetRoot $version $architecture '' $false $runtimeSourceFeed $runtimeSourceFeedKey -noPath:$noPath } function InstallDotNet([string] $dotnetRoot, @@ -250,7 +250,8 @@ function InstallDotNet([string] $dotnetRoot, [string] $runtime = '', [bool] $skipNonVersionedFiles = $false, [string] $runtimeSourceFeed = '', - [string] $runtimeSourceFeedKey = '') { + [string] $runtimeSourceFeedKey = '', + [switch] $noPath) { $installScript = GetDotNetInstallScript $dotnetRoot $installParameters = @{ @@ -261,6 +262,7 @@ function InstallDotNet([string] $dotnetRoot, if ($architecture) { $installParameters.Architecture = $architecture } if ($runtime) { $installParameters.Runtime = $runtime } if ($skipNonVersionedFiles) { $installParameters.SkipNonVersionedFiles = $skipNonVersionedFiles } + if ($noPath) { $installParameters.NoPath = $True } try { & $installScript @installParameters diff --git a/global.json b/global.json index acb7f71a0..2aebf1d8a 100644 --- a/global.json +++ b/global.json @@ -12,6 +12,6 @@ "xcopy-msbuild": "16.6.5-alpha1" }, "msbuild-sdks": { - "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.4" + "Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20451.5" } }