Merge remote-tracking branch 'origin/master' into Localization

Author: vmapetr

.github/CODEOWNERS

@@ -193,6 +193,8 @@ Tasks/DockerV2/    @microsoft/release-management-task-team @manolerazvan
 
 Tasks/DockerComposeV0/     @microsoft/release-management-task-team @manolerazvan 
 
+Tasks/DockerComposeV1/     @microsoft/release-management-task-team @manolerazvan 
+
 Tasks/DockerInstallerV0/    @microsoft/release-management-task-team @manolerazvan 
 
 Tasks/DotNetCoreCLIV2/     @microsoft/akvelon-build-task-team @DergachevE 

Tasks/AzureCloudPowerShellDeploymentV1/task.json

@@ -16,8 +16,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 241,
-        "Patch": 1
+        "Minor": 242,
+        "Patch": 0
     },
     "demands": [
         "azureps"

Tasks/AzureCloudPowerShellDeploymentV1/task.loc.json

@@ -16,8 +16,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 1,
-    "Minor": 241,
-    "Patch": 1
+    "Minor": 242,
+    "Patch": 0
   },
   "demands": [
     "azureps"

Tasks/AzureCloudPowerShellDeploymentV2/task.json

@@ -16,8 +16,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 241,
-        "Patch": 1
+        "Minor": 242,
+        "Patch": 0
     },
     "demands": [
         "azureps"

Tasks/AzureCloudPowerShellDeploymentV2/task.loc.json

@@ -16,8 +16,8 @@
   "author": "Microsoft Corporation",
   "version": {
     "Major": 2,
-    "Minor": 241,
-    "Patch": 1
+    "Minor": 242,
+    "Patch": 0
   },
   "demands": [
     "azureps"

Tasks/AzureFileCopyV1/AzureFileCopy.ps1

@@ -54,10 +54,6 @@ $containerName = $containerName.Trim().ToLower()
 $azCopyExeLocation = 'AzCopy\AzCopy.exe'
 $azCopyLocation = [System.IO.Path]::GetDirectoryName($azCopyExeLocation)
 
-# Initialize Azure.
-Import-Module $PSScriptRoot\ps_modules\VstsAzureHelpers_
-Initialize-Azure
-
 # Import the loc strings.
 Import-VstsLocStrings -LiteralPath $PSScriptRoot/Task.json
 
@@ -69,6 +65,15 @@ Import-Module "$PSScriptRoot\DeploymentUtilities\Microsoft.TeamFoundation.Distri
 . "$PSScriptRoot\AzureFileCopyJob.ps1"
 . "$PSScriptRoot\Utility.ps1"
 
+if ($featureFlags.retireAzureRM)
+{
+    Modify-PSModulePathForHostedAgent
+}
+
+# Initialize Azure.
+Import-Module $PSScriptRoot\ps_modules\VstsAzureHelpers_
+Initialize-Azure
+
 # Enabling detailed logging only when system.debug is true
 $enableDetailedLoggingString = $env:system_debug
 if ($enableDetailedLoggingString -ne "true")

Tasks/AzureFileCopyV1/Utility.ps1

@@ -1454,4 +1454,40 @@ function Check-ContainerNameAndArgs
     {
         Write-Warning (Get-vstsLocString -Key "AFC_RootContainerAndDirectory")
     }
+}
+
+function Modify-PSModulePathForHostedAgent {
+    $newEnvPSModulePath = $env:PSModulePath
+
+    if (Test-Path "C:\Modules\az_*") {
+        $azPSModulePath = (Get-ChildItem "C:\Modules\az_*" -Directory `
+            | Sort-Object { [version]$_.Name.Split('_')[-1] } `
+            | Select-Object -Last 1).FullName
+
+        Write-Verbose "Found Az module path $azPSModulePath, will be used"
+        $env:PSModulePath = ($azPSModulePath + ";" + $newEnvPSModulePath).Trim(";")
+    }
+
+    Import-AzModule -moduleName "Az.Resources"
+    Import-AzModule -moduleName "Az.Storage"
+    Import-AzModule -moduleName "Az.Compute"
+    Import-AzModule -moduleName "Az.Network"
+}
+
+function Import-AzModule
+{
+    param([string]$moduleName)
+
+    if (!(Get-Module $moduleName))
+    {
+        $module = Get-Module -Name $moduleName -ListAvailable | Sort-Object Version -Descending | Select-Object -First 1
+        if (!$module) {
+            Write-Verbose "No module found with name: $moduleName"
+        }
+        else {
+            # Import the module.
+            Write-Host "##[command]Import-Module -Name $($module.Path) -Global"
+            $module = Import-Module -Name $module.Path -Global -PassThru -Force
+        }
+    }
 }

Tasks/AzureFileCopyV1/task.json

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

Tasks/AzureFileCopyV1/task.loc.json

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

Tasks/AzureFileCopyV2/AzureFileCopy.ps1

@@ -71,6 +71,12 @@ Import-Module $PSScriptRoot\ps_modules\RemoteDeployer
 Import-Module $PSScriptRoot\ps_modules\VstsAzureHelpers_
 
 . "$PSScriptRoot\Utility.ps1"
+
+if ($featureFlags.retireAzureRM)
+{
+    Modify-PSModulePathForHostedAgent
+}
+
 $endpoint = Get-Endpoint -connectedServiceName $connectedServiceName
 Update-PSModulePathForHostedAgentWithLatestModule -Endpoint $endpoint
 Initialize-Azure