Merge pull request #2667 from Microsoft/Microsoft/users/raagra/removecustomscriptfix106

rajatagrawal-dev · web-flow · commit b0fdfbced7f0 · 2016-09-26T14:48:48.000+05:30
Microsoft/users/raagra/removecustomscriptfix106
diff --git a/Tasks/DeployAzureResourceGroup/AzureUtilityRest.ps1 b/Tasks/DeployAzureResourceGroup/AzureUtilityRest.ps1
@@ -57,7 +57,7 @@ function Remove-AzureMachineCustomScriptExtension
     if(-not [string]::IsNullOrEmpty($resourceGroupName) -and -not [string]::IsNullOrEmpty($vmName) -and -not [string]::IsNullOrEmpty($name))
     {
         Write-Host (Get-VstsLocString -Key "ARG_RemovingExtension" -ArgumentList $name, $vmName)
-        $response = Remove-AzRmVMCustomScriptExtension $resourceGroupName $vmName $name $endpoint -Force -ErrorAction SilentlyContinue -Verbose		
+        $response = Remove-AzRmVMCustomScriptExtension $resourceGroupName $vmName $name $endpoint -ErrorAction SilentlyContinue -Verbose		
         Write-Host (Get-VstsLocString -Key "ARG_RemovedExtension" -ArgumentList $name, $vmName)
     }
 
diff --git a/Tasks/DeployAzureResourceGroup/task.json b/Tasks/DeployAzureResourceGroup/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 89
+        "Patch": 90
     },
     "demands": [
         "azureps"
diff --git a/Tasks/DeployAzureResourceGroup/task.loc.json b/Tasks/DeployAzureResourceGroup/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 89
+    "Patch": 90
   },
   "demands": [
     "azureps"

Original file line number	Diff line number	Diff line change
`@@ -57,7 +57,7 @@ function Remove-AzureMachineCustomScriptExtension`
`57`	`57`	`if(-not [string]::IsNullOrEmpty($resourceGroupName) -and -not [string]::IsNullOrEmpty($vmName) -and -not [string]::IsNullOrEmpty($name))`
`58`	`58`	`{`
`59`	`59`	`Write-Host (Get-VstsLocString -Key "ARG_RemovingExtension" -ArgumentList $name, $vmName)`
`60`		`- $response = Remove-AzRmVMCustomScriptExtension $resourceGroupName $vmName $name $endpoint -Force -ErrorAction SilentlyContinue -Verbose`
	`60`	`+ $response = Remove-AzRmVMCustomScriptExtension $resourceGroupName $vmName $name $endpoint -ErrorAction SilentlyContinue -Verbose`
`61`	`61`	`Write-Host (Get-VstsLocString -Key "ARG_RemovedExtension" -ArgumentList $name, $vmName)`
`62`	`62`	`}`
`63`	`63`