Merge remote-tracking branch 'origin/main' into microbuild
This commit is contained in:
Коммит
0d16c29d9a
|
@ -9,7 +9,7 @@
|
|||
]
|
||||
},
|
||||
"dotnet-coverage": {
|
||||
"version": "17.9.6",
|
||||
"version": "17.10.1",
|
||||
"commands": [
|
||||
"dotnet-coverage"
|
||||
]
|
||||
|
|
11
init.ps1
11
init.ps1
|
@ -107,8 +107,7 @@ try {
|
|||
$HeaderColor = 'Green'
|
||||
|
||||
$RestoreArguments = @()
|
||||
if ($Interactive)
|
||||
{
|
||||
if ($Interactive) {
|
||||
$RestoreArguments += '--interactive'
|
||||
}
|
||||
|
||||
|
@ -121,10 +120,10 @@ try {
|
|||
}
|
||||
|
||||
if (!$NoToolRestore -and $PSCmdlet.ShouldProcess("dotnet tool", "restore")) {
|
||||
dotnet tool restore @RestoreArguments
|
||||
if ($lastexitcode -ne 0) {
|
||||
throw "Failure while restoring dotnet CLI tools."
|
||||
}
|
||||
dotnet tool restore @RestoreArguments
|
||||
if ($lastexitcode -ne 0) {
|
||||
throw "Failure while restoring dotnet CLI tools."
|
||||
}
|
||||
}
|
||||
|
||||
$InstallNuGetPkgScriptPath = "$PSScriptRoot\azure-pipelines\Install-NuGetPackage.ps1"
|
||||
|
|
Загрузка…
Ссылка в новой задаче