Added force remove application cmdlet in case of failure of remove (#…

…6444) * Added force remove application cmdlet in case of failure of remove ap… (#6431) * Added force remove application cmdlet in case of failure of remove application cmdlet (#6413) * Added force remove application cmdlet in case of failure of remove application cmdlet * Added -Force parameter to avoid confirmation prompt * Indentation * Updated version number * fix failing test on hosted agent * Typo while merging
microsoft · Feb 15, 2018 · 8c6e027 · 8c6e027
1 parent 320a33f
commit 8c6e027
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 13 deletions.
diff --git a/Tasks/ServiceFabricDeploy/ServiceFabricSDK/Publish-NewServiceFabricApplication.ps1 b/Tasks/ServiceFabricDeploy/ServiceFabricSDK/Publish-NewServiceFabricApplication.ps1
@@ -209,17 +209,12 @@
                 Write-Host (Get-VstsLocString -Key SFSDK_AppAlreadyExistsInfo -ArgumentList @($ApplicationName, $app.ApplicationTypeName, $app.ApplicationTypeVersion))
 
                 try
-				{
-				    $app | Remove-ServiceFabricApplication -Force
-			    }
-				catch [System.TimeoutException]
-				{
-					# Catch operation timeout and continue with force remove replica.
-				}
-
-                foreach ($node in Get-ServiceFabricNode)
                 {
-                    [void](Get-ServiceFabricDeployedReplica -NodeName $node.NodeName -ApplicationName $ApplicationName | Remove-ServiceFabricReplica -NodeName $node.NodeName -ForceRemove)
+                    $app | Remove-ServiceFabricApplication -Force
+                }
+                catch [System.TimeoutException]
+                {
+                    $app | Remove-ServiceFabricApplication -Force -ForceRemove
                 }
 
                 if($OverwriteBehavior.Equals("Always"))

diff --git a/Tasks/ServiceFabricDeploy/Tests/CreateDiffPkg.ps1 b/Tasks/ServiceFabricDeploy/Tests/CreateDiffPkg.ps1
@@ -5,7 +5,7 @@ param()
 
 $publishProfilePath = "$PSScriptRoot\data\NoAuthPublishProfile.xml"
 $applicationPackagePath = "$PSScriptRoot\data\DiffPkgAssets\AppPkg"
-$diffPackagePath = $env:TEMP + "\DiffPackage"
+$diffPackagePath = (Get-Item $env:TEMP).FullName + "\DiffPackage"
 $serviceConnectionName = "random connection name"
 $serviceFabricSdkModulePath = "$PSScriptRoot\data\ServiceFabricSDK.ps1"
 $appName = "AppName"

diff --git a/Tasks/ServiceFabricDeploy/task.json b/Tasks/ServiceFabricDeploy/task.json
@@ -17,7 +17,7 @@
     "version": {
         "Major": 1,
         "Minor": 6,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [
         "Cmd"

diff --git a/Tasks/ServiceFabricDeploy/task.loc.json b/Tasks/ServiceFabricDeploy/task.loc.json
@@ -17,7 +17,7 @@
   "version": {
     "Major": 1,
     "Minor": 6,
-    "Patch": 0
+    "Patch": 1
   },
   "demands": [
     "Cmd"