Merge pull request Azure#5592 from panchagnula/sisirap-mergedPreviewWithWebsitesPreview

Pull in the latest from preview into websites-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

@@ -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

@@ -144,7 +144,7 @@ To use this option, set the following environment variable before starting Visua
 
 ## Record or Playback Tests
 
-1. Run the test and make sure that you got a generated .json file that matches the test name in the bin folder under *SessionRecords folder
+1. [Run the test](https://github.com/Azure/azure-powershell/wiki/Azure-Powershell-Developer-Guide#running-tests) and make sure that you got a generated .json file that matches the test name in the bin folder under *SessionRecords folder
 2. Copy SessionRecords folder inside the test project and add all *.json files in Visual Studio setting "Copy to Output Directory" property to "Copy if newer"
 3. To assure that the records work fine, delete the connection string (default mode is Playback mode) OR change HttpRecorderMode within the connection string to "Playback"
 

documentation/Using-Azure-TestFramework.md

@@ -17,6 +17,7 @@ Below is a table of modules containing ARM cmdlets found in the [`AzureRM`](http
 | ------------------------------------- | --------------------------------------- | ----------------------- |
 | Analysis Services                     | `AzureRM.AnalysisServices`              | [![Analysis Services](https://img.shields.io/powershellgallery/v/AzureRM.AnalysisServices.svg?style=flat-square&label=AzureRM.AnalysisServices)](https://www.powershellgallery.com/packages/AzureRM.AnalysisServices/) |
 | API Management                        | `AzureRM.ApiManagement`                 | [![API Management](https://img.shields.io/powershellgallery/v/AzureRM.ApiManagement.svg?style=flat-square&label=AzureRM.ApiManagement)](https://www.powershellgallery.com/packages/AzureRM.ApiManagement/) |
+| Application Insights                  | `AzureRM.ApplicationInsights`           | [![Application Insights](https://img.shields.io/powershellgallery/v/AzureRM.ApplicationInsights.svg?style=flat-square&label=AzureRM.ApplicationInsights)](https://www.powershellgallery.com/packages/AzureRM.ApplicationInsights/) |
 | Automation                            | `AzureRM.Automation`                    | [![Automation](https://img.shields.io/powershellgallery/v/AzureRM.Automation.svg?style=flat-square&label=AzureRM.Automation)](https://www.powershellgallery.com/packages/AzureRM.Automation/) |
 | Backup                                | `AzureRM.Backup`                        | [![Backup](https://img.shields.io/powershellgallery/v/AzureRM.Backup.svg?style=flat-square&label=AzureRM.Backup)](https://www.powershellgallery.com/packages/AzureRM.Backup/) 
 | Batch                                 | `AzureRM.Batch`                         | [![Batch](https://img.shields.io/powershellgallery/v/AzureRM.Batch.svg?style=flat-square&label=AzureRM.Batch)](https://www.powershellgallery.com/packages/AzureRM.Batch/) |
@@ -31,6 +32,7 @@ Below is a table of modules containing ARM cmdlets found in the [`AzureRM`](http
 | Data Factory V2                       | `AzureRM.DataFactoryV2`                 | [![Data Factory V2](https://img.shields.io/powershellgallery/v/AzureRM.DataFactoryV2.svg?style=flat-square&label=AzureRM.DataFactoryV2)](https://www.powershellgallery.com/packages/AzureRM.DataFactoryV2/) |
 | Data Lake Analytics                   | `AzureRM.DataLakeAnalytics`             | [![Data Lake Analytics](https://img.shields.io/powershellgallery/v/AzureRM.DataLakeAnalytics.svg?style=flat-square&label=AzureRM.DataLakeAnalytics)](https://www.powershellgallery.com/packages/AzureRM.DataLakeAnalytics/) |
 | Data Lake Store                       | `AzureRM.DataLakeStore`                 | [![Data Lake Store](https://img.shields.io/powershellgallery/v/AzureRM.DataLakeStore.svg?style=flat-square&label=AzureRM.DataLakeStore)](https://www.powershellgallery.com/packages/AzureRM.DataLakeStore/) |
+| Data Migration                        | `AzureRM.DataMigration`                 | [![Data Migration](https://img.shields.io/powershellgallery/v/AzureRM.DataMigration.svg?style=flat-square&label=AzureRM.DataMigration)](https://www.powershellgallery.com/packages/AzureRM.DataMigration/) |
 | DevTest Labs                          | `AzureRM.DevTestLabs`                   | [![DevTest Labs](https://img.shields.io/powershellgallery/v/AzureRM.DevTestLabs.svg?style=flat-square&label=AzureRM.DevTestLabs)](https://www.powershellgallery.com/packages/AzureRM.DevTestLabs/) |
 | DNS                                   | `AzureRM.Dns`                           | [![DNS](https://img.shields.io/powershellgallery/v/AzureRM.Dns.svg?style=flat-square&label=AzureRM.Dns)](https://www.powershellgallery.com/packages/AzureRM.Dns/) |
 | Event Grid                            | `AzureRM.EventGrid`                     | [![Event Grid](https://img.shields.io/powershellgallery/v/AzureRM.EventGrid.svg?style=flat-square&label=AzureRM.EventGrid)](https://www.powershellgallery.com/packages/AzureRM.EventGrid/) |
@@ -54,6 +56,7 @@ Below is a table of modules containing ARM cmdlets found in the [`AzureRM`](http
 | Recovery Services - Site Recovery     | `AzureRM.RecoveryServices.SiteRecovery` | [![Recovery Services - Site Recovery](https://img.shields.io/powershellgallery/v/AzureRM.RecoveryServices.SiteRecovery.svg?style=flat-square&label=AzureRM.RecoveryServices.SiteRecovery)](https://www.powershellgallery.com/packages/AzureRM.RecoveryServices.SiteRecovery/) |
 | Redis Cache                           | `AzureRM.RedisCache`                    | [![Redis Cache](https://img.shields.io/powershellgallery/v/AzureRM.RedisCache.svg?style=flat-square&label=AzureRM.RedisCache)](https://www.powershellgallery.com/packages/AzureRM.RedisCache/) |
 | Relay                                 | `AzureRM.Relay`                         | [![Relay](https://img.shields.io/powershellgallery/v/AzureRM.Relay.svg?style=flat-square&label=AzureRM.Relay)](https://www.powershellgallery.com/packages/AzureRM.Relay/) |
+| Reservations                          | `AzureRM.Reservations`                  | [![Reservations](https://img.shields.io/powershellgallery/v/AzureRM.Reservations.svg?style=flat-square&label=AzureRM.Reservations)](https://www.powershellgallery.com/packages/AzureRM.Reservations/) |
 | Resources                             | `AzureRM.Resources`                     | [![Resources](https://img.shields.io/powershellgallery/v/AzureRM.Resources.svg?style=flat-square&label=AzureRM.Resources)](https://www.powershellgallery.com/packages/AzureRM.Resources/) |
 | Scheduler                             | `AzureRM.Scheduler`                     | [![Scheduler](https://img.shields.io/powershellgallery/v/AzureRM.Scheduler.svg?style=flat-square&label=AzureRM.Scheduler)](https://www.powershellgallery.com/packages/AzureRM.Scheduler/) |
 | Server Management                     | `AzureRM.ServerManagement`              | [![Server Management](https://img.shields.io/powershellgallery/v/AzureRM.ServerManagement.svg?style=flat-square&label=AzureRM.ServerManagement)](https://www.powershellgallery.com/packages/AzureRM.ServerManagement/) |

documentation/azure-powershell-modules.md

@@ -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

@@ -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

@@ -84,7 +84,8 @@ public static class AccountType
             public const string Certificate = "Certificate",
             User = "User",
             ServicePrincipal = "ServicePrincipal",
-            AccessToken = "AccessToken";
+            AccessToken = "AccessToken",
+            ManagedService = "ManagedService";
         }
 
         /// <summary>
@@ -117,7 +118,12 @@ public static class Property
         /// <summary>
         /// Thumbprint for associated certificate
         /// </summary>
-        CertificateThumbprint = "CertificateThumbprint";
+        CertificateThumbprint = "CertificateThumbprint",
+
+        /// <summary>
+        /// Login Uri for Managed Service Login
+        /// </summary>
+        MSILoginUri = "MSILoginUri";
 
 
         }

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

@@ -1,5 +1,4 @@
-using System;
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");

src/Common/Commands.Common.Authentication.Abstractions/Interfaces/IExtensibleSettings.cs

@@ -47,4 +47,4 @@
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
 [assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.1.0.0")]

src/Common/Commands.Common.Authentication.Abstractions/Properties/AssemblyInfo.cs

@@ -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; }