fixed AFC and Azure RG deployment get-azrmvmcustomscriptextension

Rajat Agrawal · Rajat Agrawal · commit 53881be9b642 · 2016-09-21T17:42:49.000+05:30
diff --git a/Tasks/AzureFileCopy/Utility.ps1 b/Tasks/AzureFileCopy/Utility.ps1
@@ -1259,7 +1259,7 @@ function Is-WinRMCustomScriptExtensionExists
 
         if($customScriptExtension)
         {
-            if($customScriptExtension.properties.ProvisioningState -ne "Succeeded")
+            if($customScriptExtension.ProvisioningState -ne "Succeeded")
             {	
                 $removeExtension = $true  
             }
diff --git a/Tasks/AzureFileCopy/task.json b/Tasks/AzureFileCopy/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 77
+        "Patch": 78
     },
     "demands": [
         "azureps"
diff --git a/Tasks/AzureFileCopy/task.loc.json b/Tasks/AzureFileCopy/task.loc.json
@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 77
+    "Patch": 78
   },
   "demands": [
     "azureps"
diff --git a/Tasks/Common/VstsAzureRestHelpers_/VstsAzureRestHelpers_.psm1 b/Tasks/Common/VstsAzureRestHelpers_/VstsAzureRestHelpers_.psm1
@@ -289,13 +289,13 @@ function Get-AzRmVmCustomScriptExtension
         {
             $customScriptExt=Invoke-RestMethod -Uri $uri -Method $method -Headers $headers
             Write-Verbose "No proxy settings"
-            return $customScriptExt
+            return $customScriptExt.properties
         }
         else
         {
             $customScriptExt=Invoke-RestMethod -Uri $uri -Method $method -Headers $headers -UseDefaultCredentials -Proxy $proxyUri -ProxyUseDefaultCredentials
             Write-Verbose "Using proxy settings"
-            return $customScriptExt
+            return $customScriptExt.properties
         }
     }
     catch
diff --git a/Tasks/DeployAzureResourceGroup/Utility.ps1 b/Tasks/DeployAzureResourceGroup/Utility.ps1
@@ -949,7 +949,7 @@ function Is-WinRMCustomScriptExtensionExists
 
         if($customScriptExtension)
         {
-            if($customScriptExtension.properties.ProvisioningState -ne "Succeeded")
+            if($customScriptExtension.ProvisioningState -ne "Succeeded")
             {	
                 $removeExtension = $true		    
             }
diff --git a/Tasks/DeployAzureResourceGroup/task.json b/Tasks/DeployAzureResourceGroup/task.json
@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 88
+        "Patch": 89
     },
     "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": 88
+    "Patch": 89
   },
   "demands": [
     "azureps"

Original file line number	Diff line number	Diff line change
`@@ -1259,7 +1259,7 @@ function Is-WinRMCustomScriptExtensionExists`
`1259`	`1259`
`1260`	`1260`	`if($customScriptExtension)`
`1261`	`1261`	`{`
`1262`		`- if($customScriptExtension.properties.ProvisioningState -ne "Succeeded")`
	`1262`	`+ if($customScriptExtension.ProvisioningState -ne "Succeeded")`
`1263`	`1263`	`{`
`1264`	`1264`	`$removeExtension = $true`
`1265`	`1265`	`}`
Original file line number	Diff line number	Diff line change
`@@ -289,13 +289,13 @@ function Get-AzRmVmCustomScriptExtension`
`289`	`289`	`{`
`290`	`290`	`$customScriptExt=Invoke-RestMethod -Uri $uri -Method $method -Headers $headers`
`291`	`291`	`Write-Verbose "No proxy settings"`
`292`		`- return $customScriptExt`
	`292`	`+ return $customScriptExt.properties`
`293`	`293`	`}`
`294`	`294`	`else`
`295`	`295`	`{`
`296`	`296`	`$customScriptExt=Invoke-RestMethod -Uri $uri -Method $method -Headers $headers -UseDefaultCredentials -Proxy $proxyUri -ProxyUseDefaultCredentials`
`297`	`297`	`Write-Verbose "Using proxy settings"`
`298`		`- return $customScriptExt`
	`298`	`+ return $customScriptExt.properties`
`299`	`299`	`}`
`300`	`300`	`}`
`301`	`301`	`catch`
Original file line number	Diff line number	Diff line change
`@@ -949,7 +949,7 @@ function Is-WinRMCustomScriptExtensionExists`
`949`	`949`
`950`	`950`	`if($customScriptExtension)`
`951`	`951`	`{`
`952`		`- if($customScriptExtension.properties.ProvisioningState -ne "Succeeded")`
	`952`	`+ if($customScriptExtension.ProvisioningState -ne "Succeeded")`
`953`	`953`	`{`
`954`	`954`	`$removeExtension = $true`
`955`	`955`	`}`