Merge remote-tracking branch 'origin/5.13' into dev

 Conflicts:
	coin/provisioning/common/windows/helpers.ps1

Change-Id: If35fe38af7b7b1c4bba5009180fe51f37a90aa5c

1 files changed, 19 insertions, 0 deletions

diff --git a/coin/provisioning/common/windows/helpers.ps1 b/coin/provisioning/common/windows/helpers.ps1
index 9cd8567e..5a7eb674 100644
--- a/coin/provisioning/common/windows/helpers.ps1
+++ b/coin/provisioning/common/windows/helpers.ps1
@@ -191,3 +191,22 @@ function Retry{
         Throw("Failed to run command successfully in $retry_count tries")
     }
 }
+
+function Remove {
+
+    Param (
+        [string]$Path = $(BadParam("a path"))
+    )
+    Write-Host "Removing $Path"
+    $i = 0
+    While ( Test-Path($Path) ){
+        Try{
+            remove-item -Force -Recurse -Path $Path -ErrorAction Stop
+        }catch{
+            $i +=1
+            if ($i -eq 5) {exit 1}
+            Write-Verbose "$Path locked, trying again in 5"
+            Start-Sleep -seconds 5
+        }
+    }
+}