Update dependencies from https://github.com/dotnet/arcade build 20200901.5 (#8396)
[master] Update dependencies from dotnet/arcade - Updates: - Microsoft.DotNet.Build.Tasks.Installers: from 5.0.0-beta.20431.4 to 5.0.0-beta.20451.5 - Microsoft.DotNet.Arcade.Sdk: from 5.0.0-beta.20431.4 to 5.0.0-beta.20451.5
This commit is contained in:
parent
a3e8d05abe
commit
39b8b3f0a4
4 changed files with 11 additions and 9 deletions
|
@ -98,13 +98,13 @@
|
|||
</Dependency>
|
||||
</ProductDependencies>
|
||||
<ToolsetDependencies>
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20431.4">
|
||||
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="5.0.0-beta.20451.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>6baa6d3c20effeee3631eb33e9e08bcf698a799c</Sha>
|
||||
<Sha>663ead2cbcbc7ee3d5cb792a30209ad58d6ee971</Sha>
|
||||
</Dependency>
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20431.4">
|
||||
<Dependency Name="Microsoft.DotNet.Build.Tasks.Installers" Version="5.0.0-beta.20451.5">
|
||||
<Uri>https://github.com/dotnet/arcade</Uri>
|
||||
<Sha>6baa6d3c20effeee3631eb33e9e08bcf698a799c</Sha>
|
||||
<Sha>663ead2cbcbc7ee3d5cb792a30209ad58d6ee971</Sha>
|
||||
</Dependency>
|
||||
</ToolsetDependencies>
|
||||
</Dependencies>
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/arcade -->
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20431.4</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
<MicrosoftDotNetBuildTasksInstallersPackageVersion>5.0.0-beta.20451.5</MicrosoftDotNetBuildTasksInstallersPackageVersion>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup>
|
||||
<!-- Dependency from https://github.com/dotnet/winforms -->
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -8,6 +8,6 @@
|
|||
}
|
||||
},
|
||||
"msbuild-sdks": {
|
||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20431.4"
|
||||
"Microsoft.DotNet.Arcade.Sdk": "5.0.0-beta.20451.5"
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue