Release 1.2.2 merge from master to dev

ChangeLog.md

@@ -1,4 +1,15 @@
-##2016.03.08 version 1.3.0
+##2016.03.03 version 1.2.2
+* Azure Compute (ARM):
+  * Add -LicenseType parameter to New-AzureRmVM for bring your own license (BYOL)
+  * Add -SecureExecution parameter to Set-AzureRmVMCustomScriptExtension
+  * Add -DisableAutoUpgradeMinorVersion and -ForceRerun parameters to Set-AzureRmVMExtension
+  * Add Set-AzureRmVMPlan cmdlet
+  * Add -Redeploy parameter to Set-AzureRmVM
+  * Add AutoUpgradeMinorVersion and ForceUpdateTag parameters for Get-AzureRmVMExtension
+  * Update positions of parameters for New-AzureRmVM
+* Azure Compute (Service Management):
+  * Add Set-AzureBootDiagnostics cmdlets
+  * Enable boot diagnostics by default for New-AzureVM and New-AzureQuickVM
 * Azure LogicApp: New cmdlets for managing LogicApps  
   * Get-AzureLogicAppAccessKey
   * Get-AzureLogicApp

setup/azurecmd.wxs

@@ -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">
 
-  <?define productName="Microsoft Azure PowerShell - February 2016" ?>
+  <?define productName="Microsoft Azure PowerShell - March 2016" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="1.2.1" ?>
+  <?define version="1.2.2" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

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

@@ -8,7 +8,7 @@
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Azure.Commands.Common.Authentication</RootNamespace>
-    <AssemblyName>Commands.Common.Authentication</AssemblyName>
+    <AssemblyName>Microsoft.Azure.Commands.Common.Authentication</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />

src/Common/Commands.Common.Authentication/Factories/ClientFactory.cs

@@ -119,11 +119,19 @@ public virtual TClient CreateClient<TClient>(AzureSMProfile profile, AzureEnviro
         }
 
         /// <summary>
+        /// Creates the client.
         /// </summary>
-        /// <typeparam name="TClient"></typeparam>
-        /// <param name="subscription"></param>
-        /// <param name="endpoint"></param>
+        /// <typeparam name="TClient">The type of the client.</typeparam>
+        /// <param name="profile">The profile.</param>
+        /// <param name="subscription">The subscription.</param>
+        /// <param name="endpoint">The endpoint.</param>
         /// <returns></returns>
+        /// <exception cref="System.ApplicationException"></exception>
+        /// <exception cref="System.ArgumentException">
+        /// accountName
+        /// or
+        /// environment
+        /// </exception>
         public virtual TClient CreateClient<TClient>(AzureSMProfile profile, AzureSubscription subscription, AzureEnvironment.Endpoint endpoint) where TClient : ServiceClient<TClient>
         {
             if (subscription == null)
@@ -287,7 +295,7 @@ public void AddUserAgent(string productName)
 
         public HashSet<ProductInfoHeaderValue> UserAgents { get; set; }
 
-        private DelegatingHandler[] GetCustomHandlers()
+        public DelegatingHandler[] GetCustomHandlers()
         {
             List<DelegatingHandler> newHandlers = new List<DelegatingHandler>();
             var enumerator = _handlers.GetEnumerator();

src/Common/Commands.Common.Authentication/Interfaces/IClientFactory.cs

@@ -54,6 +54,12 @@ public interface IClientFactory
         /// <param name="productName">Product name.</param>
         void AddUserAgent(string productName);
 
+        /// <summary>
+        /// Gets the custom handlers.
+        /// </summary>
+        /// <returns>An array of custom handlers</returns>
+        DelegatingHandler[] GetCustomHandlers();
+
         /// <summary>
         /// Adds user agent to UserAgents collection.
         /// </summary>

src/Common/Commands.ScenarioTests.Common/Mocks/MockClientFactory.cs

@@ -176,6 +176,12 @@ public void RemoveHandler(Type handlerType)
             // Do nothing
         }
 
+        public DelegatingHandler[] GetCustomHandlers()
+        {
+            // the equivalent of doing nothing
+            return new DelegatingHandler[0];
+        }
+
         public void AddUserAgent(string productName, string productVersion)
         {
             this.UserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));

src/Common/Storage/Azure.Storage.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.0.4' 
+ModuleVersion = '1.0.5' 
 
 # ID used to uniquely identify this module  
 GUID = '00612bca-fa22-401d-a671-9cc48b010e3b'  

src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.0.4' 
+ModuleVersion = '1.0.5' 
 
 # ID used to uniquely identify this module  
 GUID = 'f875725d-8ce4-423f-a6af-ea880bc63f13'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Automation/AzureRM.Automation.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.0.4' 
+ModuleVersion = '1.0.5' 
 
 # ID used to uniquely identify this module  
 GUID = 'bcea1c70-a32b-48c3-a05c-323e1c02f4d3'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/AzureBackup/AzureRM.Backup.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.0.4' 
+ModuleVersion = '1.0.5' 
 
 # ID used to uniquely identify this module  
 GUID = '0b1d76f5-a928-4b8f-9c83-df26947568d4'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/AzureBatch/AzureRM.Batch.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.0.4' 
+ModuleVersion = '1.0.5' 
 
 # ID used to uniquely identify this module  
 GUID = 'a8f00f40-1c1a-49b5-9db3-24076b75c3cf'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/AzureBatch/Commands.Batch/Microsoft.Azure.Commands.Batch.dll-Help.xml

@@ -11195,7 +11195,7 @@
           PS C:\> $StartTask = New-Object Microsoft.Azure.Commands.Batch.Models.PSStartTask
           PS C:\> $StartTask.CommandLine = "cmd /c echo example"
           PS C:\> $Pool.StartTask = $StartTask
-          PS C:\> Set-AzureBatchPool -PSCloudPool $Pool -BatchContext $Context
+          PS C:\> Set-AzureBatchPool -Pool $Pool -BatchContext $Context
         </dev:code>
         <dev:remarks>
           <maml:para>The first command gets a pool by using Get-AzureBatchPool, and then stores it in the $Pool variable. </maml:para>

src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1

@@ -12,7 +12,7 @@
 ModuleToProcess = 'Microsoft.AzureStack.Commands.dll'
 
 # Version number of this module.
-ModuleVersion = '0.9.1'
+ModuleVersion = '0.9.2'
 
 # ID used to uniquely identify this module
 GUID = '0e691e0a-ce16-40f2-af84-86fb0d82fb29'
@@ -48,7 +48,7 @@ CLRVersion = '4.0'
 ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.3'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/App.config

@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <appSettings>
     <add key="AzureStackMachineName" value="azstackvm"/>
@@ -11,4 +11,4 @@
     <add key="AadLoginUri" value="https://login.windows.net/"/>
     <add key="AadGraphUri" value="https://graph.windows.net/"/>
   </appSettings>
-</configuration>
+</configuration>

src/ResourceManager/AzureStackAdmin/Commands.AzureStackAdmin.Test/Commands.AzureStackAdmin.Test.csproj

@@ -172,9 +172,7 @@
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="App.config">
-      <SubType>Designer</SubType>
-    </None>
+    <None Include="App.config" />
     <None Include="AzureStackTests.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>

src/ResourceManager/AzureStackStorage/AzureRM.AzureStackStorage.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '0.9.2' 
+ModuleVersion = '0.9.3' 
 
 # ID used to uniquely identify this module  
 GUID = 'DA5816B5-97A6-4301-9AA0-72CC68C79F20'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.3'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  
@@ -85,4 +85,4 @@ FileList =  @()
 # Private data to pass to the module specified in ModuleToProcess  
 PrivateData = ''  
 
-} 
+} 

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

@@ -169,6 +169,8 @@ private void SetupAzureEnvironmentFromEnvironmentVariables(AzureModule mode)
             environment.Endpoints[AzureEnvironment.Endpoint.ServiceManagement] = currentEnvironment.BaseUri.AbsoluteUri;
             environment.Endpoints[AzureEnvironment.Endpoint.ResourceManager] = currentEnvironment.Endpoints.ResourceManagementUri.AbsoluteUri;
             environment.Endpoints[AzureEnvironment.Endpoint.Graph] = currentEnvironment.Endpoints.GraphUri.AbsoluteUri;
+            environment.Endpoints[AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix] = currentEnvironment.Endpoints.DataLakeAnalyticsJobAndCatalogServiceUri.OriginalString.Replace("https://",""); // because it is just a sufix
+            environment.Endpoints[AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix] = currentEnvironment.Endpoints.DataLakeStoreServiceUri.OriginalString.Replace("https://", ""); // because it is just a sufix
 
             if (!ProfileClient.Profile.Environments.ContainsKey(testEnvironmentName))
             {

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/Mocks/MockClientFactory.cs

@@ -176,6 +176,12 @@ public void RemoveHandler(Type handlerType)
             // Do nothing
         }
 
+        public DelegatingHandler[] GetCustomHandlers()
+        {
+            // the equivalent of doing nothing
+            return new DelegatingHandler[0];
+        }
+
         public void AddUserAgent(string productName, string productVersion)
         {
             this.UniqueUserAgents.Add(new ProductInfoHeaderValue(productName, productVersion));

src/ResourceManager/Compute/AzureRM.Compute.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.2.3'
+ModuleVersion = '1.2.4'
 
 # ID used to uniquely identify this module  
 GUID = '0a83c907-1ffb-4d87-a492-c65ac7d7ed37'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.0.4' 
+ModuleVersion = '1.0.5' 
 
 # ID used to uniquely identify this module  
 GUID = 'e3c0f6bc-fe96-41a0-88f4-5e490a91f05d'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1

@@ -9,7 +9,7 @@
 @{  
 
 # Version number of this module.  
-ModuleVersion = '1.0.4'  
+ModuleVersion = '1.0.5'  
 
 # ID used to uniquely identify this module  
 GUID = 'eca73aa1-a68f-4ceb-9775-70759316a57b'  
@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5' })
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()