Revert "Added force remove application cmdlet in case of failure of r…

…emove ap… (#6431)" This reverts commit 34d5dde.
microsoft · Feb 15, 2018 · 320a33f · 320a33f
1 parent 34d5dde
commit 320a33f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 7 deletions.
diff --git a/Tasks/ServiceFabricDeploy/ServiceFabricSDK/Publish-NewServiceFabricApplication.ps1 b/Tasks/ServiceFabricDeploy/ServiceFabricSDK/Publish-NewServiceFabricApplication.ps1
@@ -209,12 +209,17 @@
                 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)
                 {
-                    $app | Remove-ServiceFabricApplication -Force
-                }
-                catch [System.TimeoutException]
-                {
-                    $app | Remove-ServiceFabricApplication -Force -ForceRemove
+                    [void](Get-ServiceFabricDeployedReplica -NodeName $node.NodeName -ApplicationName $ApplicationName | Remove-ServiceFabricReplica -NodeName $node.NodeName -ForceRemove)
                 }
 
                 if($OverwriteBehavior.Equals("Always"))

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