[AzurePowerShell@2,3,4,5] [AzureFileCopy@2,3,4] [SqlAzureDacpacDeploy…

…ment@1] Update Initialize-AzSubscription to use endpoint Environment in Connect-AzAccount to work with MSIs in AzureUSGov, ChinaCloud, etc. (#14533) * Update InitializeAz.ps1 * Update InitializeAz.ps1 * derive subscription/tenant from existing context * do not assume subscriptionId from connect-Az * issue is in MSI branch for InitializeAzModuleFunctions * fix: Connect-AzAccount assumes subscription * fix: use conventional environmentName * reverse formatter * reset whitespace * restore environment name * whitespace * Update InitializeAzModuleFunctions.ps1 * Update InitializeAzModuleFunctions.ps1 * chore: update patch numbers * chore: bump sprint numbers Co-authored-by: Nina Reynolds <[email protected]> Co-authored-by: Amruta Kawade <[email protected]>
microsoft · Apr 7, 2021 · 8c190dc · 8c190dc
1 parent bd34ad0
commit 8c190dc
Show file tree

Hide file tree

Showing 10 changed files with 18 additions and 18 deletions.
diff --git a/Tasks/AzureCloudPowerShellDeploymentV1/task.json b/Tasks/AzureCloudPowerShellDeploymentV1/task.json
@@ -16,8 +16,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 175,
-        "Patch": 3
+        "Minor": 184,
+        "Patch": 0
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzureFileCopyV2/task.json b/Tasks/AzureFileCopyV2/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 2,
         "Minor": 184,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzureFileCopyV3/task.json b/Tasks/AzureFileCopyV3/task.json
@@ -14,7 +14,7 @@
     "version": {
         "Major": 3,
         "Minor": 184,
-        "Patch": 0
+        "Patch": 1
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzureFileCopyV4/task.json b/Tasks/AzureFileCopyV4/task.json
@@ -13,8 +13,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 4,
-        "Minor": 184,
-        "Patch": 1
+        "Minor": 185,
+        "Patch": 0
     },
     "demands": [
         "azureps"

diff --git a/Tasks/AzurePowerShellV2/task.json b/Tasks/AzurePowerShellV2/task.json
@@ -17,7 +17,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 2,
-        "Minor": 184,
+        "Minor": 185,
         "Patch": 0
     },
     "demands": [

diff --git a/Tasks/AzurePowerShellV3/task.json b/Tasks/AzurePowerShellV3/task.json
@@ -17,7 +17,7 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 3,
-        "Minor": 184,
+        "Minor": 185,
         "Patch": 0
     },
     "releaseNotes": "Added support for Fail on standard error and ErrorActionPreference",

diff --git a/Tasks/AzurePowerShellV4/task.json b/Tasks/AzurePowerShellV4/task.json
@@ -17,8 +17,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 4,
-        "Minor": 184,
-        "Patch": 1
+        "Minor": 185,
+        "Patch": 0
     },
     "releaseNotes": "Added support for Az Module and cross platform agents.",
     "groups": [

diff --git a/Tasks/AzurePowerShellV5/task.json b/Tasks/AzurePowerShellV5/task.json
@@ -17,8 +17,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 5,
-        "Minor": 184,
-        "Patch": 1
+        "Minor": 185,
+        "Patch": 0
     },
     "releaseNotes": "Added support for Az Module and cross platform agents.",
     "groups": [

diff --git a/Tasks/Common/VstsAzureHelpers_/InitializeAzModuleFunctions.ps1 b/Tasks/Common/VstsAzureHelpers_/InitializeAzModuleFunctions.ps1
@@ -1,4 +1,4 @@
-# Dot source Utility functions.
+# Dot source Utility functions.
 . $PSScriptRoot/Utility.ps1
 
 function Initialize-AzModule {
@@ -135,8 +135,8 @@ function Initialize-AzSubscription {
 
     } elseif ($Endpoint.Auth.Scheme -eq 'ManagedServiceIdentity') {
         try {
-            Write-Host "##[command]Connect-AzAccount -Identity @processScope"
-            $null = Connect-AzAccount -Identity @processScope
+            Write-Host "##[command]Connect-AzAccount -Environment $environmentName -Identity @processScope"
+            $null = Connect-AzAccount -Environment $environmentName -Identity @processScope
         } catch {
             # Provide an additional, custom, credentials-related error message.
             Write-VstsTaskError -Message $_.Exception.Message
@@ -191,4 +191,4 @@ function Set-CurrentAzSubscription {
 
     Write-Host "##[command] Set-AzContext -SubscriptionId $SubscriptionId $(Format-Splat $additional)"
     $null = Set-AzContext -SubscriptionId $SubscriptionId @additional
-}
+}
diff --git a/Tasks/SqlAzureDacpacDeploymentV1/task.json b/Tasks/SqlAzureDacpacDeploymentV1/task.json
@@ -16,8 +16,8 @@
     "author": "Microsoft Corporation",
     "version": {
         "Major": 1,
-        "Minor": 178,
-        "Patch": 2
+        "Minor": 184,
+        "Patch": 0
     },
     "demands": [
         "sqlpackage"