Update dependencies from https://github.com/dotnet/arcade build 20190722.10 (#3391)

- Microsoft.DotNet.Arcade.Sdk - 1.0.0-beta.19372.10
This commit is contained in:
dotnet-maestro[bot] 2019-07-23 12:42:18 +00:00 committed by GitHub
parent 4a3bf0df53
commit 7c3980d383
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 10 additions and 4 deletions

View file

@ -65,9 +65,9 @@
</Dependency> </Dependency>
</ProductDependencies> </ProductDependencies>
<ToolsetDependencies> <ToolsetDependencies>
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19369.2"> <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.19372.10">
<Uri>https://github.com/dotnet/arcade</Uri> <Uri>https://github.com/dotnet/arcade</Uri>
<Sha>a190d4865fe3c86a168ec49c4fc61c90c96ae051</Sha> <Sha>0793e2df782efc9ccae387bc779b2549208fa4a1</Sha>
</Dependency> </Dependency>
</ToolsetDependencies> </ToolsetDependencies>
</Dependencies> </Dependencies>

View file

@ -103,7 +103,13 @@ try {
if ($LASTEXITCODE -Ne "0") { if ($LASTEXITCODE -Ne "0") {
$errMsg = "$ToolName installation failed" $errMsg = "$ToolName installation failed"
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) { if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
Write-Warning $errMsg $showNativeToolsWarning = $true
if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
$showNativeToolsWarning = $false
}
if ($showNativeToolsWarning) {
Write-Warning $errMsg
}
$toolInstallationFailure = $true $toolInstallationFailure = $true
} else { } else {
Write-Error $errMsg Write-Error $errMsg

View file

@ -3,6 +3,6 @@
"dotnet": "3.0.100-preview6-012264" "dotnet": "3.0.100-preview6-012264"
}, },
"msbuild-sdks": { "msbuild-sdks": {
"Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19369.2" "Microsoft.DotNet.Arcade.Sdk": "1.0.0-beta.19372.10"
} }
} }