Fixing bug (#11295)

Author: 20shivangi

Tasks/AzurePowerShellV4/AzurePowerShell.ps1

@@ -48,7 +48,28 @@ if ($targetAzurePs -eq $latestVersion) {
 
 $serviceName = Get-VstsInput -Name ConnectedServiceNameARM -Require
 $endpoint = Get-VstsEndpoint -Name $serviceName -Require
-$env:PSModulePath = Get-VstsTaskVariable -Name "AZ_PS_MODULE_PATH"
+
+$azureRMModulePath = "C:\Modules\azurerm_2.1.0"
+$azureModulePath = "C:\Modules\azure_2.1.0"
+$azPSModulePath = $env:PSModulePath
+
+if ($azPSModulePath.split(";") -contains $azureRMModulePath) {
+    $azPSModulePath = (($azPSModulePath).Split(";") | ? { $_ -ne $azureRMModulePath }) -join ";"
+    write-verbose "$azureRMModulePath removed. Restart the prompt for the changes to take effect."
+}
+else {
+    write-verbose "$azureRMModulePath is not present in $azPSModulePath"
+}
+
+if ($azPSModulePath.split(";") -contains $azureModulePath) {
+    $azPSModulePath = (($azPSModulePath).Split(";") | ? { $_ -ne $azureModulePath }) -join ";"
+    write-verbose "$azureModulePath removed. Restart the prompt for the changes to take effect."
+}
+else {
+    write-verbose "$azureModulePath is not present in $azPSModulePath"
+}
+
+$env:PSModulePath = $azPSModulePath
 
 Update-PSModulePathForHostedAgent -targetAzurePs $targetAzurePs
 

Tasks/AzurePowerShellV4/PreJobExecutionAzurePowerShell.ps1

@@ -17,7 +17,7 @@
     "version": {
         "Major": 4,
         "Minor": 157,
-        "Patch": 3
+        "Patch": 4
     },
     "preview": true,
     "releaseNotes": "Added support for Az Module and cross platform agents.",
@@ -143,14 +143,6 @@
         }
     ],
     "instanceNameFormat": "Azure PowerShell script: $(ScriptType)",
-    "prejobexecution": {
-        "PowerShell3": {
-            "target": "PreJobExecutionAzurePowerShell.ps1",
-            "platforms": [
-                "windows"
-            ]
-        }
-    },
     "execution": {
         "PowerShell3": {
             "target": "azurepowershell.ps1",

Tasks/AzurePowerShellV4/task.json

@@ -17,7 +17,7 @@
   "version": {
     "Major": 4,
     "Minor": 157,
-    "Patch": 3
+    "Patch": 4
   },
   "preview": true,
   "releaseNotes": "ms-resource:loc.releaseNotes",
@@ -143,14 +143,6 @@
     }
   ],
   "instanceNameFormat": "ms-resource:loc.instanceNameFormat",
-  "prejobexecution": {
-    "PowerShell3": {
-      "target": "PreJobExecutionAzurePowerShell.ps1",
-      "platforms": [
-        "windows"
-      ]
-    }
-  },
   "execution": {
     "PowerShell3": {
       "target": "azurepowershell.ps1",