resolve merge conflicts

Tasks/AzureCloudPowerShellDeployment/task.json

@@ -16,7 +16,7 @@
     "version": {
         "Major": 1,
         "Minor": 2,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [
         "azureps"

Tasks/AzureCloudPowerShellDeployment/task.loc.json

@@ -16,7 +16,7 @@
   "version": {
     "Major": 1,
     "Minor": 2,
-    "Patch": 0
+    "Patch": 1
   },
   "demands": [
     "azureps"

Tasks/AzureFileCopy/task.json

@@ -13,7 +13,7 @@
     "version": {
         "Major": 1,
         "Minor": 0,
-        "Patch": 109
+        "Patch": 110
     },
     "demands": [
         "azureps"

Tasks/AzureFileCopy/task.loc.json

@@ -13,7 +13,7 @@
   "version": {
     "Major": 1,
     "Minor": 0,
-    "Patch": 109
+    "Patch": 110
   },
   "demands": [
     "azureps"

Tasks/AzurePowerShell/task.json

@@ -17,7 +17,7 @@
     "version": {
         "Major": 3,
         "Minor": 0,
-        "Patch": 0
+        "Patch": 1
     },
     "releaseNotes": "This is an early preview. Added support for Fail on standard error and ErrorActionPreference",
     "demands": [

Tasks/AzurePowerShell/task.loc.json

@@ -17,7 +17,7 @@
   "version": {
     "Major": 3,
     "Minor": 0,
-    "Patch": 0
+    "Patch": 1
   },
   "releaseNotes": "ms-resource:loc.releaseNotes",
   "demands": [

Tasks/Common/VstsAzureHelpers_/ImportFunctions.ps1

@@ -108,14 +108,25 @@ function Import-FromModulePath {
         } else {
             # The AzureRM module was imported.
             # Validate the AzureRM.profile module can be found.
-            $profileModule = (Get-Module -Name AzureRM).NestedModules | Where-Object { $_.Name.toLower() -eq "azurerm.profile" }
-            if (!$profileModule) {
-                throw (Get-VstsLocString -Key AZ_AzureRMProfileModuleNotFound)
+            # First check whether or not profile module is already loaded in the current session
+            $profileModule = Get-Module -Name AzureRm.Profile
+            if(!$profileModule) {
+                # otherwise check whether it is listed as a nested module in the azurerm module manifest ( this is valid till v 5.3.0 )
+                $profileModule = (Get-Module -Name AzureRM).NestedModules | Where-Object { $_.Name.toLower() -eq "azurerm.profile" }
+                # otherwise check whether it is listed as a required module in the azurerm module manifest ( valid from v 5.4.0 and up )
+                if(!$profileModule) {
+                    $profileModule = (Get-Module -Name AzureRM).RequiredModules | Where-Object { $_.Name.toLower() -eq "azurerm.profile" }
+                }
+                if (!$profileModule) {
+                    throw (Get-VstsLocString -Key AZ_AzureRMProfileModuleNotFound)
+                }
+                # Import and then store the AzureRM.profile module. 
+                Write-Host "##[command]Import-Module -Name $($profileModule.Path) -Global" 
+                $script:azureRMProfileModule = Import-Module -Name $profileModule.Path -Global -PassThru 
+            } else {
+                $script:azureRMProfileModule = $profileModule
             }
-            # Import and then store the AzureRM.profile module. 
-            Write-Host "##[command]Import-Module -Name $($profileModule.Path) -Global" 
-            $script:azureRMProfileModule = Import-Module -Name $profileModule.Path -Global -PassThru 
-            Write-Verbose "Imported module version: $($script:azureRMProfileModule.Version)" 
+            Write-Verbose "Imported module version: $($script:azureRMProfileModule.Version)"
         }
 
         return $true

Tasks/Common/VstsAzureHelpers_/Tests/Import-FromModulePath.ValidatesRMProfileFound.ps1

@@ -14,7 +14,8 @@ $rmModule = @{ Name = 'AzureRM' ;
                     @{
                         Name = "AzureRM.Compute"
                     }
-                )
+                );
+               RequiredModules = @()
 }
 Register-Mock Get-Module { $rmModule } -- -Name $rmModule.Name -ListAvailable
 Register-Mock Get-Module { $rmModule } -- -Name $rmModule.Name