Merge branch 'release-4.1.0' into dev

Author: markcowl

ChangeLog.md

@@ -1,4 +1,9 @@
-## 2017.05.12 - Version 4.0.1
+## 2017.05.23 - Version 4.0.2
+* Profile
+    * Add-AzureRmAccount
+      * Added `-EnvironmentName` parameter alis for backward compatibility with 2.x versions of AzureRM.profile
+
+## 2017.05.12 - Version 4.0.1
  * Fix issue with New-AzureStorageContext in offline scenarios: https://github.com/Azure/azure-powershell/issues/3939
 
  ## 2017.05.10 - Version 4.0.0
@@ -3214,4 +3219,4 @@ Virtual Network cmdlets
  * iisnode 0.1.13
 
 2011.12.09 Version 0.5.0
- * Initial Release
+ * Initial Release

setup/azurecmd.wxs

@@ -5,7 +5,7 @@
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="4.0.1" ?>
+  <?define version="4.0.2" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

setup/azurecmdfiles.wxi

@@ -72,7 +72,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.5\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Rest.ClientRuntime.2.3.8\lib\net45\Microsoft.Rest.ClientRuntime.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">

src/Common/Commands.Common.Authentication/Commands.Common.Authentication.csproj

@@ -8,8 +8,8 @@
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
   <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
-  <package id="Microsoft.Rest.ClientRuntime" version="2.3.5" targetFramework="net45" />
+  <package id="Microsoft.Rest.ClientRuntime" version="2.3.8" targetFramework="net452" />
   <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.5" targetFramework="net45" />
   <package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.9-preview" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.8" targetFramework="net45" />
-</packages>
+</packages>

src/Common/Commands.Common.Authentication/packages.config

@@ -98,7 +98,7 @@ protected string PSVersion
         /// <summary>
         /// Gets PowerShell module version used for user agent header.
         /// </summary>
-        protected string ModuleVersion { get { return Assembly.GetCallingAssembly().GetName().Version.ToString(); } }
+        protected string ModuleVersion { get { return AzurePowerShell.AssemblyVersion; } }
 
         /// <summary>
         /// The context for management cmdlet requests - includes account, tenant, subscription, 

src/Common/Commands.Common/AzurePSCmdlet.cs

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

src/Common/Commands.Common/AzurePowerShell.cs

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 5/5/2017
+# Generated on: 5/21/2017
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.3.0'
+ModuleVersion = '0.3.1'
 
 # 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 = '3.0.0'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '3.0.1'; })
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1

@@ -18,10 +18,11 @@
         - Additional information about change #1
 -->
 ## Current Release
-
 * New SKUs added: B1, B2, S0
 * Scale up/down support added
 
+## Version 0.3.1
+
 ## Version 0.3.0
 
 ## Version 0.2.0

src/ResourceManager/AnalysisServices/ChangeLog.md

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.3.0'
+ModuleVersion = '0.3.1'
 
 # ID used to uniquely identify this module  
 GUID = 'c717b5a4-1f1b-4a2f-8aa1-bfd09934626e'