Skip to content

Commit 018c344

Browse files
dotnet-botdotnet-bot
committed
Merge in 'release/3.1' changes
2 parents 1399016 + 7e37207 commit 018c344

File tree

13 files changed

+363
-353
lines changed

13 files changed

+363
-353
lines changed

‎eng/Baseline.Designer.props

Lines changed: 211 additions & 211 deletions
Large diffs are not rendered by default.

‎eng/Baseline.xml

Lines changed: 72 additions & 72 deletions
Original file line numberDiff line numberDiff line change
@@ -4,87 +4,87 @@ This file contains a list of all the packages and their versions which were rele
44
Update this list when preparing for a new patch.
55
66
-->
7-
<Baseline Version="3.1.30">
7+
<Baseline Version="3.1.31">
88
<Package Id="AspNetCoreRuntime.3.0.x64" Version="3.0.3" />
99
<Package Id="AspNetCoreRuntime.3.0.x86" Version="3.0.3" />
10-
<Package Id="dotnet-sql-cache" Version="3.1.30" />
10+
<Package Id="dotnet-sql-cache" Version="3.1.31" />
1111
<Package Id="Microsoft.Authentication.WebAssembly.Msal" Version="3.2.1" />
12-
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.30" />
13-
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.30" />
14-
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.30" />
15-
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.30" />
16-
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.30" />
17-
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.30" />
18-
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.30" />
19-
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.30" />
20-
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.30" />
21-
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.30" />
22-
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.30" />
23-
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.30" />
24-
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.30" />
25-
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.30" />
26-
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.30" />
27-
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.30" />
28-
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.30" />
29-
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.30" />
30-
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.30" />
31-
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.30" />
32-
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.30" />
33-
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.30" />
12+
<Package Id="Microsoft.AspNetCore.ApiAuthorization.IdentityServer" Version="3.1.31" />
13+
<Package Id="Microsoft.AspNetCore.App.Runtime.win-x64" Version="3.1.31" />
14+
<Package Id="Microsoft.AspNetCore.Authentication.AzureAD.UI" Version="3.1.31" />
15+
<Package Id="Microsoft.AspNetCore.Authentication.AzureADB2C.UI" Version="3.1.31" />
16+
<Package Id="Microsoft.AspNetCore.Authentication.Certificate" Version="3.1.31" />
17+
<Package Id="Microsoft.AspNetCore.Authentication.Facebook" Version="3.1.31" />
18+
<Package Id="Microsoft.AspNetCore.Authentication.Google" Version="3.1.31" />
19+
<Package Id="Microsoft.AspNetCore.Authentication.JwtBearer" Version="3.1.31" />
20+
<Package Id="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="3.1.31" />
21+
<Package Id="Microsoft.AspNetCore.Authentication.Negotiate" Version="3.1.31" />
22+
<Package Id="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="3.1.31" />
23+
<Package Id="Microsoft.AspNetCore.Authentication.Twitter" Version="3.1.31" />
24+
<Package Id="Microsoft.AspNetCore.Authentication.WsFederation" Version="3.1.31" />
25+
<Package Id="Microsoft.AspNetCore.Authorization" Version="3.1.31" />
26+
<Package Id="Microsoft.AspNetCore.AzureAppServices.HostingStartup" Version="3.1.31" />
27+
<Package Id="Microsoft.AspNetCore.AzureAppServices.SiteExtension" Version="3.1.31" />
28+
<Package Id="Microsoft.AspNetCore.AzureAppServicesIntegration" Version="3.1.31" />
29+
<Package Id="Microsoft.AspNetCore.Components" Version="3.1.31" />
30+
<Package Id="Microsoft.AspNetCore.Components.Analyzers" Version="3.1.31" />
31+
<Package Id="Microsoft.AspNetCore.Components.Authorization" Version="3.1.31" />
32+
<Package Id="Microsoft.AspNetCore.Components.Forms" Version="3.1.31" />
33+
<Package Id="Microsoft.AspNetCore.Components.Web" Version="3.1.31" />
3434
<Package Id="Microsoft.AspNetCore.Components.WebAssembly" Version="3.2.1" />
3535
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Build" Version="3.2.1" />
3636
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="3.2.1" />
3737
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="3.2.1" />
3838
<Package Id="Microsoft.AspNetCore.Components.WebAssembly.HttpHandler" Version="3.2.1" />
3939
<Package Id="Microsoft.JSInterop.WebAssembly" Version="3.2.1" />
40-
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.30" />
41-
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.30" />
42-
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.30" />
43-
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.30" />
44-
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.30" />
45-
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.30" />
40+
<Package Id="Microsoft.AspNetCore.ConcurrencyLimiter" Version="3.1.31" />
41+
<Package Id="Microsoft.AspNetCore.Connections.Abstractions" Version="3.1.31" />
42+
<Package Id="Microsoft.AspNetCore.Cryptography.Internal" Version="3.1.31" />
43+
<Package Id="Microsoft.AspNetCore.Cryptography.KeyDerivation" Version="3.1.31" />
44+
<Package Id="Microsoft.AspNetCore.DataProtection" Version="3.1.31" />
45+
<Package Id="Microsoft.AspNetCore.DataProtection.Abstractions" Version="3.1.31" />
4646
<Package Id="Microsoft.AspNetCore.DataProtection.AzureKeyVault" Version="3.1.24" />
4747
<Package Id="Microsoft.AspNetCore.DataProtection.AzureStorage" Version="3.1.24" />
48-
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.30" />
49-
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.30" />
50-
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.30" />
51-
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.30" />
52-
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.30" />
53-
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.30" />
54-
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.30" />
55-
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.30" />
56-
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.30" />
57-
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.30" />
58-
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.30" />
59-
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.30" />
60-
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.30" />
61-
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.30" />
62-
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.30" />
63-
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.30" />
64-
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.30" />
65-
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.30" />
66-
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.30" />
67-
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.30" />
68-
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.30" />
69-
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.30" />
70-
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.30" />
71-
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.30" />
72-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.30" />
73-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.30" />
74-
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.30" />
75-
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.30" />
76-
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.30" />
77-
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.30" />
78-
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.30" />
79-
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.30" />
80-
<Package Id="Microsoft.dotnet-openapi" Version="3.1.30" />
81-
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.30" />
82-
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.30" />
83-
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.30" />
84-
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.30" />
85-
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.30" />
86-
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.30" />
87-
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.30" />
88-
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.30" />
89-
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.30" />
48+
<Package Id="Microsoft.AspNetCore.DataProtection.EntityFrameworkCore" Version="3.1.31" />
49+
<Package Id="Microsoft.AspNetCore.DataProtection.Extensions" Version="3.1.31" />
50+
<Package Id="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.1.31" />
51+
<Package Id="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="3.1.31" />
52+
<Package Id="Microsoft.AspNetCore.HeaderPropagation" Version="3.1.31" />
53+
<Package Id="Microsoft.AspNetCore.Hosting.WindowsServices" Version="3.1.31" />
54+
<Package Id="Microsoft.AspNetCore.Http.Connections.Client" Version="3.1.31" />
55+
<Package Id="Microsoft.AspNetCore.Http.Connections.Common" Version="3.1.31" />
56+
<Package Id="Microsoft.AspNetCore.Http.Features" Version="3.1.31" />
57+
<Package Id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.31" />
58+
<Package Id="Microsoft.AspNetCore.Identity.Specification.Tests" Version="3.1.31" />
59+
<Package Id="Microsoft.AspNetCore.Identity.UI" Version="3.1.31" />
60+
<Package Id="Microsoft.AspNetCore.JsonPatch" Version="3.1.31" />
61+
<Package Id="Microsoft.AspNetCore.Metadata" Version="3.1.31" />
62+
<Package Id="Microsoft.AspNetCore.MiddlewareAnalysis" Version="3.1.31" />
63+
<Package Id="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="3.1.31" />
64+
<Package Id="Microsoft.AspNetCore.Mvc.Razor.RuntimeCompilation" Version="3.1.31" />
65+
<Package Id="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.31" />
66+
<Package Id="Microsoft.AspNetCore.NodeServices" Version="3.1.31" />
67+
<Package Id="Microsoft.AspNetCore.Owin" Version="3.1.31" />
68+
<Package Id="Microsoft.AspNetCore.Server.Kestrel.Transport.Libuv" Version="3.1.31" />
69+
<Package Id="Microsoft.AspNetCore.SignalR.Client" Version="3.1.31" />
70+
<Package Id="Microsoft.AspNetCore.SignalR.Client.Core" Version="3.1.31" />
71+
<Package Id="Microsoft.AspNetCore.SignalR.Common" Version="3.1.31" />
72+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.Json" Version="3.1.31" />
73+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="3.1.31" />
74+
<Package Id="Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson" Version="3.1.31" />
75+
<Package Id="Microsoft.AspNetCore.SignalR.Specification.Tests" Version="3.1.31" />
76+
<Package Id="Microsoft.AspNetCore.SignalR.StackExchangeRedis" Version="3.1.31" />
77+
<Package Id="Microsoft.AspNetCore.SpaServices" Version="3.1.31" />
78+
<Package Id="Microsoft.AspNetCore.SpaServices.Extensions" Version="3.1.31" />
79+
<Package Id="Microsoft.AspNetCore.TestHost" Version="3.1.31" />
80+
<Package Id="Microsoft.dotnet-openapi" Version="3.1.31" />
81+
<Package Id="Microsoft.DotNet.Web.Client.ItemTemplates" Version="3.1.31" />
82+
<Package Id="Microsoft.DotNet.Web.ItemTemplates" Version="3.1.31" />
83+
<Package Id="Microsoft.DotNet.Web.ProjectTemplates.3.1" Version="3.1.31" />
84+
<Package Id="Microsoft.DotNet.Web.Spa.ProjectTemplates.3.1" Version="3.1.31" />
85+
<Package Id="Microsoft.Extensions.ApiDescription.Client" Version="3.1.31" />
86+
<Package Id="Microsoft.Extensions.ApiDescription.Server" Version="3.1.31" />
87+
<Package Id="Microsoft.Extensions.Diagnostics.HealthChecks.EntityFrameworkCore" Version="3.1.31" />
88+
<Package Id="Microsoft.Extensions.Identity.Core" Version="3.1.31" />
89+
<Package Id="Microsoft.Extensions.Identity.Stores" Version="3.1.31" />
9090
</Baseline>

‎eng/Version.Details.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -418,13 +418,13 @@
418418
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>
419419
<Sha>cc9959c7f4ab9dcc97dae67ed48cb7226e75c67b</Sha>
420420
</Dependency>
421-
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22505.4">
421+
<Dependency Name="Microsoft.DotNet.GenAPI" Version="1.0.0-beta.22512.2">
422422
<Uri>https://github.com/dotnet/arcade</Uri>
423-
<Sha>ce5a281156dfae3c050e63c1f288b6a488e978fe</Sha>
423+
<Sha>869528d3af327eb6de19b414631280734dfe76e6</Sha>
424424
</Dependency>
425-
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22505.4">
425+
<Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="1.0.0-beta.22512.2">
426426
<Uri>https://github.com/dotnet/arcade</Uri>
427-
<Sha>ce5a281156dfae3c050e63c1f288b6a488e978fe</Sha>
427+
<Sha>869528d3af327eb6de19b414631280734dfe76e6</Sha>
428428
</Dependency>
429429
<Dependency Name="Microsoft.AspNetCore.Testing" Version="3.1.31-servicing.22514.1" CoherentParentDependency="Microsoft.EntityFrameworkCore">
430430
<Uri>https://dev.azure.com/dnceng/internal/_git/dotnet-extensions</Uri>

‎eng/Versions.props

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<AspNetCoreMinorVersion>1</AspNetCoreMinorVersion>
1111
<AspNetCorePatchVersion>32</AspNetCorePatchVersion>
1212
<!-- This property should be 'false' between branding & code-merging, 'true' the rest of the time -->
13-
<ValidateBaseline>false</ValidateBaseline>
13+
<ValidateBaseline>true</ValidateBaseline>
1414
<PreReleasePreviewNumber>0</PreReleasePreviewNumber>
1515
<ComponentsWebAssemblyMajorVersion>3</ComponentsWebAssemblyMajorVersion>
1616
<ComponentsWebAssemblyMinorVersion>2</ComponentsWebAssemblyMinorVersion>
@@ -64,7 +64,7 @@
6464
-->
6565
<PropertyGroup Label="Automated">
6666
<!-- Packages from dotnet/arcade -->
67-
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22505.4</MicrosoftDotNetGenAPIPackageVersion>
67+
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.22512.2</MicrosoftDotNetGenAPIPackageVersion>
6868
<!-- Packages from dotnet/roslyn -->
6969
<MicrosoftNetCompilersToolsetPackageVersion>3.4.1-beta4-20127-10</MicrosoftNetCompilersToolsetPackageVersion>
7070
<!-- Packages from dotnet/core-setup -->
@@ -242,7 +242,7 @@
242242
<CastleCorePackageVersion>4.2.1</CastleCorePackageVersion>
243243
<FSharpCorePackageVersion>4.2.1</FSharpCorePackageVersion>
244244
<GoogleProtobufPackageVersion>3.19.5</GoogleProtobufPackageVersion>
245-
<GrpcAspNetCorePackageVersion>2.27.0</GrpcAspNetCorePackageVersion>
245+
<GrpcAspNetCorePackageVersion>2.40.0</GrpcAspNetCorePackageVersion>
246246
<IdentityServer4AspNetIdentityPackageVersion>3.0.0</IdentityServer4AspNetIdentityPackageVersion>
247247
<IdentityServer4EntityFrameworkPackageVersion>3.0.0</IdentityServer4EntityFrameworkPackageVersion>
248248
<IdentityServer4PackageVersion>3.0.0</IdentityServer4PackageVersion>

‎eng/common/init-tools-native.ps1

Lines changed: 49 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -120,52 +120,61 @@ try {
120120
$NativeTools.PSObject.Properties | ForEach-Object {
121121
$ToolName = $_.Name
122122
$ToolVersion = $_.Value
123-
$LocalInstallerArguments = @{ ToolName = "$ToolName" }
124-
$LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
125-
$LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
126-
$LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
127-
$LocalInstallerArguments += @{ Version = "$ToolVersion" }
128-
129-
if ($Verbose) {
130-
$LocalInstallerArguments += @{ Verbose = $True }
131-
}
132-
if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
133-
if($Force) {
134-
$LocalInstallerArguments += @{ Force = $True }
135-
}
136-
}
137-
if ($Clean) {
138-
$LocalInstallerArguments += @{ Clean = $True }
123+
124+
if ((Get-Command "$ToolName" -ErrorAction SilentlyContinue) -eq $null) {
125+
Write-PipelineTelemetryError -Category 'NativeToolsBootstrap' -Message "$ToolName not found on path. Please install $ToolName $ToolVersion before proceeding."
139126
}
140-
141-
Write-Verbose "Installing $ToolName version $ToolVersion"
142-
Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
143-
& $InstallerPath @LocalInstallerArguments
144-
if ($LASTEXITCODE -Ne "0") {
145-
$errMsg = "$ToolName installation failed"
146-
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
147-
$showNativeToolsWarning = $true
148-
if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
149-
$showNativeToolsWarning = $false
150-
}
151-
if ($showNativeToolsWarning) {
152-
Write-Warning $errMsg
153-
}
154-
$toolInstallationFailure = $true
155-
} else {
156-
Write-Error $errMsg
157-
exit 1
158-
}
127+
}
128+
exit 0
129+
}
130+
} else {
131+
$NativeTools.PSObject.Properties | ForEach-Object {
132+
$ToolName = $_.Name
133+
$ToolVersion = $_.Value
134+
$LocalInstallerArguments = @{ ToolName = "$ToolName" }
135+
$LocalInstallerArguments += @{ InstallPath = "$InstallBin" }
136+
$LocalInstallerArguments += @{ BaseUri = "$BaseUri" }
137+
$LocalInstallerArguments += @{ CommonLibraryDirectory = "$EngCommonBaseDir" }
138+
$LocalInstallerArguments += @{ Version = "$ToolVersion" }
139+
140+
if ($Verbose) {
141+
$LocalInstallerArguments += @{ Verbose = $True }
142+
}
143+
if (Get-Variable 'Force' -ErrorAction 'SilentlyContinue') {
144+
if($Force) {
145+
$LocalInstallerArguments += @{ Force = $True }
159146
}
160147
}
161-
162-
if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
163-
exit 1
148+
if ($Clean) {
149+
$LocalInstallerArguments += @{ Clean = $True }
164150
}
151+
152+
Write-Verbose "Installing $ToolName version $ToolVersion"
153+
Write-Verbose "Executing '$InstallerPath $($LocalInstallerArguments.Keys.ForEach({"-$_ '$($LocalInstallerArguments.$_)'"}) -join ' ')'"
154+
& $InstallerPath @LocalInstallerArguments
155+
if ($LASTEXITCODE -Ne "0") {
156+
$errMsg = "$ToolName installation failed"
157+
if ((Get-Variable 'DoNotAbortNativeToolsInstallationOnFailure' -ErrorAction 'SilentlyContinue') -and $DoNotAbortNativeToolsInstallationOnFailure) {
158+
$showNativeToolsWarning = $true
159+
if ((Get-Variable 'DoNotDisplayNativeToolsInstallationWarnings' -ErrorAction 'SilentlyContinue') -and $DoNotDisplayNativeToolsInstallationWarnings) {
160+
$showNativeToolsWarning = $false
161+
}
162+
if ($showNativeToolsWarning) {
163+
Write-Warning $errMsg
164+
}
165+
$toolInstallationFailure = $true
166+
} else {
167+
Write-Error $errMsg
168+
exit 1
169+
}
170+
}
171+
}
172+
173+
if ((Get-Variable 'toolInstallationFailure' -ErrorAction 'SilentlyContinue') -and $toolInstallationFailure) {
174+
exit 1
165175
}
166176
}
167-
}
168-
else {
177+
} else {
169178
Write-Host "No native tools defined in global.json"
170179
exit 0
171180
}

0 commit comments

Comments
 (0)