Explorar el Código

Merge branch 'release/2.2'

Doug Bunting hace 7 años
padre
commit
f280465275

+ 6 - 0
.azure/pipelines/jobs/default-build.yml

@@ -139,9 +139,15 @@ jobs:
       - ${{ if eq(parameters.agentOs, 'Windows') }}:
         - script: .\$(BuildDirectory)\build.cmd -ci /p:SignType=$(_SignType) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
           displayName: Run build.cmd
+        - powershell: eng\scripts\KillProcesses.ps1
+          displayName: Kill processes
+          condition: always()
       - ${{ if ne(parameters.agentOs, 'Windows') }}:
         - script: ./$(BuildDirectory)/build.sh -ci -p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
           displayName: Run build.sh
+        - script: eng/scripts/KillProcesses.sh
+          displayName: Kill processes
+          condition: always()
     - ${{ if ne(parameters.buildScript, '') }}:
       - script: $(BuildScript) /p:Configuration=$(BuildConfiguration) $(BuildScriptArgs)
         displayName: run $(BuildScript)

+ 16 - 0
eng/scripts/KillProcesses.ps1

@@ -0,0 +1,16 @@
+$ErrorActionPreference = 'Continue'
+
+taskkill /T /F /IM dotnet.exe
+taskkill /T /F /IM testhost.exe
+taskkill /T /F /IM iisexpress.exe
+taskkill /T /F /IM iisexpresstray.exe
+taskkill /T /F /IM w3wp.exe
+taskkill /T /F /IM msbuild.exe
+taskkill /T /F /IM vbcscompiler.exe
+taskkill /T /F /IM git.exe
+taskkill /T /F /IM vctip.exe
+taskkill /T /F /IM chrome.exe
+taskkill /T /F /IM h2spec.exe
+iisreset /restart
+
+exit 0

+ 4 - 0
eng/scripts/KillProcesses.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+
+pkill dotnet || true
+exit 0