Merge branch 'preview' into preview

Author: cormacpayne

.gitignore

@@ -212,4 +212,8 @@ FakesAssemblies/
 *.GhostDoc.xml
 pingme.txt
 groupMapping*.json
-.vscode/
+.vscode/
+/tools/AutomationTestFramework/RunBooks
+/tools/AutomationTestFramework/TestHelpers/TestHelpers.zip
+Results
+Package

ChangeLog.md

@@ -132,10 +132,10 @@ If you use both mechanisms on the same subscription, Microsoft Azure Active Dire
 
 ```powershell
 # Interactive login - you will get a dialog box asking for your Azure credentials
-Add-AzureRmAccount
+Connect-AzureRmAccount
 
 # Non-interactive login - use service principals
-Add-AzureRmAccount -ServicePrincipal -ApplicationId "http://my-app" -Credential $pscredential -TenantId $tenantid
+Connect-AzureRmAccount -ServicePrincipal -ApplicationId "http://my-app" -Credential $pscredential -TenantId $tenantid
 
 # Use the cmdlets to manage your services/applications
 New-AzureRmResourceGroup -Name myresourceGroup -Location "West US"
@@ -144,7 +144,7 @@ New-AzureRmResourceGroup -Name myresourceGroup -Location "West US"
 ### Microsoft Azure China
 
 ```powershell
-Add-AzureRmAccount -EnvironmentName AzureChinaCloud
+Connect-AzureRmAccount -EnvironmentName AzureChinaCloud
 
 # Use the cmdlets to manage your services/applications
 New-AzureRmResourceGroup -Name myresourceGroup -Location "China East"
@@ -153,7 +153,7 @@ New-AzureRmResourceGroup -Name myresourceGroup -Location "China East"
 ### Microsoft Azure US Government
 
 ```powershell
-Add-AzureRmAccount -EnvironmentName AzureUSGovernment
+Connect-AzureRmAccount -EnvironmentName AzureUSGovernment
 
 # Use the cmdlets to manage your services/applications
 New-AzureRmResourceGroup -Name myresourceGroup -Location "US Gov Virginia"
@@ -162,7 +162,7 @@ New-AzureRmResourceGroup -Name myresourceGroup -Location "US Gov Virginia"
 ### Microsoft Azure Germany
 
 ```powershell
-Add-AzureRmAccount -EnvironmentName AzureGermanCloud
+Connect-AzureRmAccount -EnvironmentName AzureGermanCloud
 
 # Use the cmdlets to manage your services/applications
 New-AzureRmResourceGroup -Name myresourceGroup -Location "Germany Central"

README.md

@@ -184,4 +184,4 @@
  "src/ResourceManager/ApplicationInsights/": [
     ".\\src\\ResourceManager\\ApplicationInsights\\Commands.ApplicationInsights.Test\\bin\\Debug\\Microsoft.Azure.Commands.ApplicationInsights.Test.dll"
   ]  
-}
+}

TestMappings.json

@@ -509,6 +509,11 @@
     <Message Importance="high" Text="Running Dependency Analysis..." />
     <Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Package\$(Configuration) $(MSBuildProjectDirectory)\src\Package true $(SkipHelp)" Condition="'$(Latest)' == 'true'"/>
     <Exec Command="$(MSBuildProjectDirectory)\src\Package\StaticAnalysis.exe $(MSBuildProjectDirectory)\src\Stack\$(Configuration) $(MSBuildProjectDirectory)\src\Stack" Condition="'$(Stack)' == 'true'" ContinueOnError="True"/>
+    <OnError ExecuteTargets="StaticAnalysisErrorMessage"/>
+  </Target>
+
+  <Target Name="StaticAnalysisErrorMessage">
+    <Error Text="StaticAnalysis has failed.  Please follow the instructions on this doc: https://github.com/Azure/azure-powershell/blob/preview/documentation/Debugging-StaticAnalysis-Errors.md"/>
   </Target>
 
   <!-- Publish all packages -->

build.proj

@@ -42,24 +42,26 @@ Below are descriptions and remediations for each of the errors that can be seen
 | 3040 | [Changed Generic Type Argument](#3040---changed-generic-type-argument) |
 | 3050 | [Different Generic Type Argument Size](#3050---different-generic-type-argument-size) |
 
-## 1000 - Removed Cmdlet
+## 1000 - Removed or Renamed Cmdlet
 
 ### Description
 
 _The cmdlet '`<cmdlet>`' has been removed and no alias was found for the original cmdlet name._
 
-When a user can no longer use a cmdlet that was previously available in a module, that is a breaking change. This can occur when the cmdlet is deleted, or the name of the cmdlet was changed with no alias to the original cmdlet name.
+When a user can no longer use a cmdlet that was previously available in a module, that is a breaking change. This can occur when the cmdlet is deleted, or when the name of the cmdlet was changed with no alias to the original cmdlet name.
 
 ### Remediation
 
 _Add the cmdlet '`<cmdlet>`' back to the module, or add an alias to the original cmdlet name._
 
 To add an alias to the original cmdlet name, use the `Alias` attribute for the cmdlet.
 
+If you need to, you can add multiple aliases for cmdlets that need to be renamed twice.
+
 ```cs
-[Alias("Login-AzureRmAccount")]
-[Cmdlet(VerbsCommon.Add, "AzureRmAccount")]
-public class AddAzureRmAccount : Cmdlet
+[Cmdlet(VerbsCommunications.Connect, "AzureRmAccount")]
+[Alias("Login-AzureRmAccount", "Login-AzAccount", "Add-AzureRmAccount")]
+public class ConnectAzureRmAccount : Cmdlet
 {
     protected override void BeginProcessing()
     {
@@ -383,8 +385,8 @@ _Add the parameter '`<parameter>`' back to the cmdlet '`<cmdlet>`', or add an al
 To add an alias to the original parameter name, use the `Alias` attribute for the parameter.
 
 ```cs
-[Cmdlet(VerbsCommon.Add, "AzureRmAccount")]
-public class AddAzureRmAccount : Cmdlet
+[Cmdlet(VerbsCommunications.Connect, "AzureRmAccount")]
+public class ConnectAzureRmAccount : Cmdlet
 {
     [Alias("Domain")]
     [Parameter(ParameterSetName = "...", Mandatory = false)

documentation/breaking-changes/breaking-changes-tool-help.md

@@ -0,0 +1,47 @@
+# Debugging StaticAnalysis Errors
+
+Our StaticAnalysis tools help us ensure our modules follow PowerShell guidelines and prevent breaking changes from occurring outside of breaking change releases.
+
+- [How to know if you have a StaticAnalysis Error](#how-to-know-if-you-have-a-staticanalysis-error)
+- [Where to find StaticAnalysis reports](#where-to-find-staticanalysis-reports)
+- [Types of StaticAnalysis Errors](#types-of-staticanalysis-errors)
+    - [Breaking Changes](#breaking-changes)
+    - [Signature Issues](#signature-issues)
+    - [Help Issues](#help-issues)
+
+## How to know if you have a StaticAnalysis Error
+If your build is failing, click on the Jenkins job inside the PR (marked as "Default" within checks).  Then check the Console Output within the Jenkins job.  If you have this error, then you have failed StaticAnalysis:
+```
+d:\workspace\powershell\build.proj(511,5): error MSB3073: The command "d:\workspace\powershell\src\Package\StaticAnalysis.exe d:\workspace\powershell\src\Package\Debug d:\workspace\powershell\src\Package true false" exited with code 255.
+```
+
+## Where to find StaticAnalysis reports
+
+The StaticAnalysis reports could show up in two different places in the CI build:
+- On the status page in Jenkins, under the Build Artifacts: the relevant files are BreakingChangeIssues.csv, SignatureIssues.csv, and/or HelpIssues.csv.
+- On the status page in Jenkins, click Build Artifacts then navigate to src/Package.  You will see BreakingChangeIssues.csv, SignatureIssues.csv, and/or HelpIssues.csv.
+
+Locally, the StaticAnalysis report will show up under Azure-PowerShell/src/Package. You will see BreakingChangeIssues.csv, SignatureIssues.csv, and/or HelpIssues.csv.  You can generate these files by running
+```
+msbuild build.proj
+```
+
+## Types of StaticAnalysis Errors
+The three most common Static Analysis errors are breaking changes, signature issues, and help issues.  To figure out which type of error is causing the build failure, open each of the relevant .csv files (if the .csv file does not exist, there is no violation detected).  Any issue marked with severity 0 or 1 must be resolved in order for the build to pass.
+
+### Breaking Changes
+If you make a change that could cause a breaking change, it will be listed in BreakingChangeIssues.csv.  Please look at each of these errors, and if they do indeed introduce a breaking change in a non-breaking change release, please revert the change that caused this violation.  Sometimes the error listed in the .csv file can be a false positive (for example, if you change a parameter attribute to span all parameter sets rather than individual parameter sets).  Please read the error thoroughly and examine the relevant code before deciding that an error is a false positive, and contact the Azure PowerShell team if you have questions.  If you are releasing a preview module, are releasing during a breaking change release, or have determined that the error is a false positive, please follow these instructions:
+- Copy each of the errors you would like to suppress directly from the BreakingChangeIssues.csv file output in the Jenkins build
+- Paste each of these error into the [BreakingChangeIssues.csv file](https://github.com/Azure/azure-powershell/blob/preview/tools/StaticAnalysis/Exceptions/BreakingChangeIssues.csv) in our GitHub repo. Note that you will need to edit this file in a text editor rather than Excel to prevent parsing errors.
+- Push the changes to the .csv file and ensure the errors no longer show up in the BreakingChangeIssues.csv file output from the Jenkins build.
+
+We take breaking changes very seriously, so please be mindful about the violations that you suppress in our repo.
+
+### Signature Issues
+Signature issues occur when your cmdlets do not follow PowerShell standards.  Please check [this page](https://github.com/Azure/azure-powershell/wiki/PowerShell-Cmdlet-Design-Guidelines) to ensure you are following PowerShell guidelines.  Issues with severity 0 or 1 must be addressed, while issues with severity 2 are advisory.  If you have an issue with severity 0 or 1 that has been approved by the Azure PowerShell team, you can suppress them following these steps:
+- Copy each of the errors you would like to suppress directly from the SignatureIssues.csv file output in the Jenkins build
+- Paste each of these error into the [SignatureIssues.csv file](https://github.com/Azure/azure-powershell/blob/preview/tools/StaticAnalysis/Exceptions/SignatureIssues.csv) in our GitHub repo. Note that you will need to edit this file in a text editor rather than Excel to prevent parsing errors.
+- Push the changes to the .csv file and ensure the errors no longer show up in the SignatureIssues.csv file output from the Jenkins build.
+
+### Help Issues
+Most help issues that cause StaticAnalysis to fail occur when help has not been added for a particular cmdlet.  If you have not generated help for your new cmdlets, please follow the instructions [here](https://github.com/Azure/azure-powershell/blob/preview/documentation/help-generation.md).  If this is not the issue, follow the steps listed under "Remediation" for each violation listed in HelpIssues.csv.

documentation/debugging-staticanalysis-errors.md

@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 
-  <?define productName="Microsoft Azure PowerShell - December 2017" ?>
+  <?define productName="Microsoft Azure PowerShell - January 2018" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="5.1.1" ?>
+  <?define version="5.2.0" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

setup/azurecmd.wxs

@@ -23,7 +23,7 @@ namespace Microsoft.Azure.Commands.Common.Authentication.Abstractions
     public class ClientFactorySettings : IExtensibleSettings
     {
         /// <summary>
-        /// The user agents in the cusrrent client factory
+        /// The user agents in the current client factory
         /// </summary>
         public IEnumerable<UserAgentSettings> UserAgents { get; }
 

src/Common/Commands.Common.Authentication.Abstractions/Settings/ClientFactorySettings.cs

@@ -142,7 +142,7 @@
     <value>The environment name '{0}' is not found.</value>
   </data>
   <data name="ExpiredRefreshToken" xml:space="preserve">
-    <value>Your Microsoft Azure credential in the Windows PowerShell session has expired. Please log in again. In PowerShell, execute Login-AzureRMAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
+    <value>Your Microsoft Azure credential in the Windows PowerShell session has expired. Please log in again. In PowerShell, execute Connect-AzureRmAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
   </data>
   <data name="FilePathIsNotValid" xml:space="preserve">
     <value>File path is not valid</value>
@@ -193,7 +193,7 @@
     <value>Removing public environment is not supported.</value>
   </data>
   <data name="ServiceKeyNotFound" xml:space="preserve">
-    <value>Unable to retrieve service key for ServicePrincipal account {0}. Please log in again to supply the credentials for this service principal. In PowerShell, execute Login-AzureRMAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
+    <value>Unable to retrieve service key for ServicePrincipal account {0}. Please log in again to supply the credentials for this service principal. In PowerShell, execute Connect-AzureRmAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
   </data>
   <data name="ServiceNameExists" xml:space="preserve">
     <value>The provided service name {0} already exists, please pick another name</value>
@@ -259,7 +259,7 @@
     <value>Multiple tokens were found for this user. Please clear your token cache using, Clear-AzureProfile and try this command again.</value>
   </data>
   <data name="AdalUserInteractionRequired" xml:space="preserve">
-    <value>User Interaction is required to authenticate this user. Please authenticate using the log in dialog. In PowerShell, execute Login-AzureRMAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
+    <value>User Interaction is required to authenticate this user. Please authenticate using the log in dialog. In PowerShell, execute Connect-AzureRmAccount for Azure Resource Manager cmdlets or Add-AzureAccount for service management cmdlets.</value>
   </data>
   <data name="TenantNotFound" xml:space="preserve">
     <value>No tenant was found for this subscription. Please execute Clear-AzureProfile and then execute Add-AzureAccount.</value>
@@ -283,19 +283,19 @@
     <value>[Common.Authentication]: Authenticating for account {0} with single tenant {1}</value>
   </data>
   <data name="ArmAccountNotFound" xml:space="preserve">
-    <value>No account found in the context. Please login using Login-AzureRMAccount.</value>
+    <value>No account found in the context. Please login using Connect-AzureRmAccount.</value>
   </data>
   <data name="ArmUserInteractionRequired" xml:space="preserve">
-    <value>User Interaction is required to authenticate this user. Please execute Login-AzureRMAccount without parameters and enter your credentials.</value>
+    <value>User Interaction is required to authenticate this user. Please execute Connect-AzureRmAccount without parameters and enter your credentials.</value>
   </data>
   <data name="InvalidArmContext" xml:space="preserve">
-    <value>Your Azure credentials have not been set up or have expired, please run Login-AzureRMAccount to set up your Azure credentials.</value>
+    <value>Your Azure credentials have not been set up or have expired, please run Connect-AzureRmAccount to set up your Azure credentials.</value>
   </data>
   <data name="NoSubscriptionInContext" xml:space="preserve">
-    <value>No subscription found in the context.  Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Login-AzureRMAccount to login.</value>
+    <value>No subscription found in the context.  Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Connect-AzureRmAccount to login.</value>
   </data>
   <data name="NoTenantInContext" xml:space="preserve">
-    <value>No tenant found in the context.  Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Login-AzureRMAccount to login.</value>
+    <value>No tenant found in the context.  Please ensure that the credentials you provided are authorized to access an Azure subscription, then run Connect-AzureRmAccount to login.</value>
   </data>
   <data name="UnsupportedCredentialType" xml:space="preserve">
     <value>Certificate authentication is not supported for account type {0}.</value>

src/Common/Commands.Common.Authentication/Properties/Resources.resx

@@ -26,9 +26,9 @@ public class AzurePowerShell
 
         public const string AssemblyCopyright = "Copyright © Microsoft";
 
-        public const string AssemblyVersion = "5.1.1";
+        public const string AssemblyVersion = "5.2.0";
 
-        public const string AssemblyFileVersion = "5.1.1";
+        public const string AssemblyFileVersion = "5.2.0";
 
         public const string ProfileFile = "AzureProfile.json";
 

src/Common/Commands.Common/AzurePowerShell.cs

@@ -1537,10 +1537,10 @@ Use the Enable-AzureRmDataCollection cmdlet to turn the feature On. The cmdlet c
     <value>User name needs to be specified.</value>
   </data>
   <data name="NoCurrentContextForDataCmdlet" xml:space="preserve">
-    <value>"There is no current context, please log in using Login-AzureRmAccount for Azure Resource Manager or Add-AzureAccount for Azure Service Management."</value>
+    <value>"There is no current context, please log in using Connect-AzureRmAccount for Azure Resource Manager or Add-AzureAccount for Azure Service Management."</value>
   </data>
   <data name="NoSubscriptionFoundForTenant" xml:space="preserve">
-    <value>No subscriptions are associated with the logged in account in Azure Service Management (RDFE). This means that the logged in user is not an administrator or co-administrator for any account.\r\nDid you mean to execute Login-AzureRmAccount?</value>
+    <value>No subscriptions are associated with the logged in account in Azure Service Management (RDFE). This means that the logged in user is not an administrator or co-administrator for any account.\r\nDid you mean to execute Connect-AzureRmAccount?</value>
   </data>
   <data name="CertificateNotFoundInStore" xml:space="preserve">
     <value>No certificate was found in the certificate store with thumbprint {0}</value>

src/Common/Commands.Common/Properties/Resources.resx

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 12/5/2017
+# Generated on: 1/22/2018
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.6.1'
+ModuleVersion = '0.6.2'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.1.1'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.2.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Analysis.dll'
@@ -114,10 +114,16 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Remove validate set of location into dynamic lookup so that all clouds are supported.'
+        ReleaseNotes = '* Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription'
+
+        # Prerelease string of this module
+        # Prerelease = ''
+
+        # Flag to indicate whether the module requires explicit user acceptance for install/update
+        # RequireLicenseAcceptance = $false
 
         # External dependent modules of this module
-        # ExternalModuleDependencies = ''
+        # ExternalModuleDependencies = @()
 
     } # End of PSData hashtable
 

src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1

@@ -18,6 +18,9 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Corrected usage of `Login-AzureRmAccount` to use `Connect-AzureRmAccount`
+
+## Version 0.6.2
 * Added ResourceGroup Completer to -ResourceGroup parameters allowing tab completion through resource groups in current subscription
 
 ## Version 0.6.1