Merge branch 'release-6.0.0' into context-default

Author: cormacpayne

.gitignore

@@ -222,14 +222,10 @@ groupMapping*.json
 *.wixpdb
 
 .vscode/
-/tools/AutomationTestFramework/RunBooks
-/tools/AutomationTestFramework/TestHelpers/TestHelpers.zip
+/tools/AutomationTestFramework/Runbooks
 Results
 Package
 .DS_Store
 .idea
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Logger/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Models/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Helpers/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.Providers/bin
-/src/ResourceManager/RecoveryServices.Backup/Commands.RecoveryServices.Backup.ServiceClientAdapter/bin
+/src/ResourceManager/RecoveryServices.Backup/**/bin
+launchSettings.json

appveyor.yml

@@ -1,38 +1,27 @@
 clone_folder: c:\ps
+clone_depth: 1
 branches:
   only:
     - master
 environment:
-  nodejs_version: "6"
   github_access_token:
     secure: VMFbecLLHzDq/09YDPbcM0VDDSwwgY57vr5GXK6cZZ4Ti/Xs5RZoylzV8MMr1350
 
 before_build:
-  - ps: Get-ChildItem -Path ("$env:programfiles" + "\WindowsPowerShell\Modules") | Where-Object { $_.FullName -match 'azure' } | foreach { Remove-Item $_.FullName -Recurse -Force }
-  - ps: Install-Module -Name PowerShellGet -Force
-  - ps: Install-Module -Name SplitPipeline -Force
-  - ps: Install-Module -Name platyPS -Force
-  - ps: Install-Module -Name Azure -Force
-  - ps: Install-Module -Name AzureRM -Force -AllowClobber
-  - ps: Install-Module -Name AzureStack -Force -AllowClobber
-  - ps: Install-Product node $env:nodejs_version
   - git config --global credential.helper store
   - ps: ac "$env:USERPROFILE\.git-credentials" "https://$($env:github_access_token):[email protected]`n"
   - git config --global user.email %email%
   - git config --global user.name %name%
-  - git clone -q https://github.com/MicrosoftDocs/azure-psdocs-ciscripts azpsci
-  - cd azpsci
-  - npm install
-  - npm install typescript
-  - node ./node_modules/typescript/bin/tsc
   - cd ..
+  - git clone -q https://github.com/MicrosoftDocs/azure-psdocs-ciscripts azpsci
+  - dotnet publish azpsci -c Release -o ../ci
 build_script:
-  - node azpsci/out/ci0.js src c:\projects\_output
+  - dotnet ./ci/azpsci.dll docs
 
 test: off
 on_success:
   - git clone -q --branch=%target_branch% %content_repo% %TEMP%\Azure
   - cd %TEMP%\Azure
-  - ps: ls c:\projects\_output -dir | % { copy $_.FullName . -Recurse -Force }
+  - ps: ls C:\docs -dir | % { copy $_.FullName . -Recurse -Force }
   - git add -A
   - git diff --quiet --exit-code --cached || git commit -m "Sync docs from source code repo to content repo." && git push origin %target_branch% && appveyor AddMessage "Content Updated"

src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironment.cs

@@ -99,6 +99,8 @@ static IDictionary<string, AzureEnvironment> InitializeBuiltInEnvironments()
                 BatchEndpointResourceId = AzureEnvironmentConstants.USGovernmentBatchEndpointResourceId,
                 AdTenant = "Common"
             };
+            azureUSGovernment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpoint, AzureEnvironmentConstants.USGovernmentOperationalInsightsEndpoint);
+            azureUSGovernment.SetProperty(ExtendedEndpoint.OperationalInsightsEndpointResourceId, AzureEnvironmentConstants.USGovernmentOperationalInsightsEndpointResourceId);
             var azureGermany = new AzureEnvironment
             {
                 Name = EnvironmentName.AzureGermanCloud,

src/Common/Commands.Common.Authentication.Abstractions/AzureEnvironmentConstants.cs

@@ -119,11 +119,13 @@ public static class AzureEnvironmentConstants
         /// The token audience for Log Analytics Queries
         /// </summary>
         public const string AzureOperationalInsightsEndpointResourceId = "https://api.loganalytics.io";
+        public const string USGovernmentOperationalInsightsEndpointResourceId = "https://api.loganalytics.us";
 
         /// <summary>
         /// The endpoint URI for Log Analytics Queries
         /// </summary>
         public const string AzureOperationalInsightsEndpoint = "https://api.loganalytics.io/v1";
+        public const string USGovernmentOperationalInsightsEndpoint = "https://api.loganalytics.us/v1";
 
         /// <summary>
         /// The domain name suffix for Azure DataLake services

src/Common/Commands.Common/AzurePSCmdlet.cs

@@ -137,13 +137,50 @@ protected string PSVersion
 
         protected abstract string DataCollectionWarning { get; }
 
+        private SessionState _sessionState;
+
+        public new SessionState SessionState
+        {
+            get
+            {
+                return _sessionState;
+            }
+            set
+            {
+                _sessionState = value;
+            }
+        }
+
+        private RuntimeDefinedParameterDictionary _asJobDynamicParameters;
+
+        public RuntimeDefinedParameterDictionary AsJobDynamicParameters
+        {
+            get
+            {
+                if (_asJobDynamicParameters == null)
+                {
+                    _asJobDynamicParameters = new RuntimeDefinedParameterDictionary();
+                }
+                return _asJobDynamicParameters;
+            }
+            set
+            {
+                _asJobDynamicParameters = value;
+            }
+        }
+
         /// <summary>
         /// Initializes AzurePSCmdlet properties.
         /// </summary>
         public AzurePSCmdlet()
         {
             DebugMessages = new ConcurrentQueue<string>();
+        }
 
+        // Register Dynamic Parameters for use in long running jobs
+        public void RegisterDynamicParameters(RuntimeDefinedParameterDictionary parameters)
+        {
+            this.AsJobDynamicParameters = parameters;
         }
 
 
@@ -252,6 +289,7 @@ protected virtual void TearDownHttpClientPipeline()
         /// </summary>
         protected override void BeginProcessing()
         {
+            SessionState = base.SessionState;
             var profile = _dataCollectionProfile;
             //TODO: Inject from CI server
             lock (lockObject)

src/ResourceManager/Aks/Commands.Aks/help/AzureRM.Aks.md

@@ -1,8 +1,8 @@
 ---
 Module Name: AzureRM.Aks
 Module Guid: a97e0c3e-e389-46a6-b73d-2b9bd6909bdb
-Download Help Link: {{Please enter FwLink manually}}
-Help Version: {{Please enter version of help manually (X.X.X.X) format}}
+Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.aks
+Help Version: 0.0.1.0
 Locale: en-US
 ---
 

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/help/Azure.AnalysisServices.md

@@ -1,8 +1,8 @@
 ---
 Module Name: Azure.AnalysisServices
 Module Guid: c717b5a4-1f1b-4a2f-8aa1-bfd09934626e
-Download Help Link: {{Please enter FwLink manually}}
-Help Version: {{Please enter version of help manually (X.X.X.X) format}}
+Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azure.analysisservices
+Help Version: 0.5.0.0
 Locale: en-US
 ---
 

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/help/AzureRM.AnalysisServices.md

@@ -1,7 +1,7 @@
 ---
 Module Name: AzureRM.AnalysisServices
 Module Guid: acace26c-1775-4100-85c0-20c4d71eaa21
-Download Help Link: None_Azure
+Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.analysisservices
 Help Version: 0.0.1.0
 Locale: en-US
 ---

src/ResourceManager/ApiManagement/Commands.ApiManagement/help/AzureRM.ApiManagement.md

@@ -1,7 +1,7 @@
 ---
 Module Name: AzureRM.ApiManagement
 Module Guid: f875725d-8ce4-423f-a6af-ea880bc63f13
-Download Help Link: None
+Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.apimanagement
 Help Version: 4.0.0.0
 Locale: en-US
 ---

src/ResourceManager/ApplicationInsights/Commands.ApplicationInsights/help/AzureRM.ApplicationInsights.md

@@ -1,8 +1,8 @@
 ---
 Module Name: AzureRM.ApplicationInsights
 Module Guid: da67eaa7-4cb1-4bfa-a194-8bf3faae8ac6
-Download Help Link: None
-Help Version: 0.1.2
+Download Help Link: https://docs.microsoft.com/en-us/powershell/module/azurerm.applicationinsights
+Help Version: 0.1.2.0
 Locale: en-US
 ---