diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c104821efd..fd3d949547 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -56,7 +56,7 @@ jobs: - job: Windows timeoutInMinutes: 360 pool: - vmImage: 'vs2017-win2016' + name: 'windows-pool' steps: - template: ci/build-windows.yml - bash: | diff --git a/dev-env/windows/libexec/core.ps1 b/dev-env/windows/libexec/core.ps1 index da15afe2b0..5f758c6159 100644 --- a/dev-env/windows/libexec/core.ps1 +++ b/dev-env/windows/libexec/core.ps1 @@ -157,6 +157,27 @@ function da_install_all([String] $Directory) { da_error $msg throw $msg } + + $resetted,$out = da_reset_app $app + If (-not($resetted)) { + $msg = "<< Resetting $app failed: `r`n$out" + da_error $msg + throw $msg + } + } +} + +function da_reset_app([String] $app) { + $out = (scoop reset $app *>&1) + $out = $out -join "`r`n" | Out-String + + $resettingFound = $out -like "*Resetting*" + $errorFound = $out -like "*ERROR*" + + If (-not($resettingFound) -or $errorFound) { + return $False, $out + } Else { + return $True, $out } }