Merge from release-5.1.0

Author: sergey-shandar

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" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
 
-  <?define productName="Microsoft Azure PowerShell - November 2017" ?>
+  <?define productName="Microsoft Azure PowerShell - December 2017" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="5.0.0" ?>
+  <?define version="5.1.0" ?>
 
   <Product Id="*"
            Name="$(var.productName)"

src/Common/Commands.Common/AzurePowerShell.cs

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

src/ResourceManager/AnalysisServices/AzureRM.AnalysisServices.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 11/3/2017
+# Generated on: 12/5/2017
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.5.0'
+ModuleVersion = '0.6.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -114,9 +114,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Fixed Synchronize-AzureAsInstance command to work with new AsAzure REST API for sync
-* Add support for online help
-    - Run Get-Help with the -Online parameter to open the online help in your default Internet browser'
+        ReleaseNotes = '* Remove validate set of location into dynamic lookup so that all clouds are supported.'
 
         # External dependent modules of this module
         # ExternalModuleDependencies = ''

src/ResourceManager/AnalysisServices/ChangeLog.md

@@ -1,4 +1,4 @@
-<!--
+<!--
     Please leave this section at the top of the change log.
 
     Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+
+## Version 0.6.0
 * Remove validate set of location into dynamic lookup so that all clouds are supported.
 
 ## Version 0.5.0
@@ -74,4 +76,4 @@
 
 ## Version 0.0.2
 * Fixed bug in Get-AzureRMAnalysisServicesServer
-    - When this command was run against some resources, it would fail with a null reference exception.
+    - When this command was run against some resources, it would fail with a null reference exception.

src/ResourceManager/AnalysisServices/Commands.AnalysisServices.Dataplane/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -35,5 +35,5 @@
 // by using the '*' as shown below:
 
 
-[assembly: AssemblyVersion("0.5.0")]
-[assembly: AssemblyFileVersion("0.5.0")]
+[assembly: AssemblyVersion("0.6.0")]
+[assembly: AssemblyFileVersion("0.6.0")]

src/ResourceManager/AnalysisServices/Commands.AnalysisServices/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
@@ -34,5 +34,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("0.5.0")]
-[assembly: AssemblyFileVersion("0.5.0")]
+[assembly: AssemblyVersion("0.6.0")]
+[assembly: AssemblyFileVersion("0.6.0")]

src/ResourceManager/Automation/AzureRM.Automation.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 11/3/2017
+# Generated on: 12/5/2017
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '4.0.0'
+ModuleVersion = '4.1.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -164,8 +164,8 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Add support for online help
-    - Run Get-Help with the -Online parameter to open the online help in your default Internet browser'
+        ReleaseNotes = '* Update to Import-AzureRMAutomationRunbook
+    - Support is now being provided for Python2 runbooks'
 
         # External dependent modules of this module
         # ExternalModuleDependencies = ''

src/ResourceManager/Automation/ChangeLog.md

@@ -1,4 +1,4 @@
-<!--
+<!--
     Please leave this section at the top of the change log.
 
     Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+
+## Version 4.1.0
 * Update to Import-AzureRMAutomationRunbook
     - Support is now being provided for Python2 runbooks
 
@@ -65,4 +67,4 @@
 
 ## Version 2.4.0
 
-## Version 2.3.0
+## Version 2.3.0

src/ResourceManager/Automation/Commands.Automation/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -43,8 +43,8 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 
-[assembly: AssemblyVersion("4.0.0")]
-[assembly: AssemblyFileVersion("4.0.0")]
+[assembly: AssemblyVersion("4.1.0")]
+[assembly: AssemblyFileVersion("4.1.0")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.Commands.ResourceManager.Automation.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 #else

src/ResourceManager/AzureBatch/AzureRM.Batch.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 11/3/2017
+# Generated on: 12/5/2017
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '4.0.1'
+ModuleVersion = '4.0.2'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -54,13 +54,11 @@ CLRVersion = '4.0'
 RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = '.\Microsoft.Azure.Batch.dll',
-                     '.\Microsoft.Azure.Management.Batch.dll',
-                     '.\Microsoft.Data.Edm.dll',
-                     '.\Microsoft.Data.OData.dll',
-                     '.\Microsoft.Data.Services.Client.dll',
-                     '.\Microsoft.WindowsAzure.Storage.dll',
-                     '.\System.Spatial.dll'
+RequiredAssemblies = '.\Microsoft.Azure.Batch.dll', 
+               '.\Microsoft.Azure.Management.Batch.dll', 
+               '.\Microsoft.Data.Edm.dll', '.\Microsoft.Data.OData.dll', 
+               '.\Microsoft.Data.Services.Client.dll', 
+               '.\Microsoft.WindowsAzure.Storage.dll', '.\System.Spatial.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()
@@ -148,7 +146,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Fixed assembly loading issue that caused some cmdlets to fail when executing'
+        ReleaseNotes = '* Fixed a bug where account operations without a resource group failed to auto-detect the resource group.'
 
         # External dependent modules of this module
         # ExternalModuleDependencies = ''

src/ResourceManager/AzureBatch/ChangeLog.md

@@ -1,4 +1,4 @@
-<!--
+<!--
     Please leave this section at the top of the change log.
 
     Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+
+## Version 4.0.2
 * Fixed a bug where account operations without a resource group failed to auto-detect the resource group.
 
 ## Version 4.0.1
@@ -118,4 +120,4 @@
 
 ## Version 2.3.0
 * Rename cmdlet Get-AzureRmBatchSubscriptionQuotas to Get-AzureRmBatchLocationsQuotas (an alias for the old command was created)
-    - Rename return type PSBatchSubscriptionQuotas to PSBatchLocationQuotas (no property changes)
+    - Rename return type PSBatchSubscriptionQuotas to PSBatchLocationQuotas (no property changes)

src/ResourceManager/AzureBatch/Commands.Batch/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,8 +25,8 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("ed102280-3577-49bf-93dd-11b6e3a44a57")]
-[assembly: AssemblyVersion("4.0.1")]
-[assembly: AssemblyFileVersion("4.0.1")]
+[assembly: AssemblyVersion("4.0.2")]
+[assembly: AssemblyFileVersion("4.0.2")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Batch.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 #else

src/ResourceManager/Compute/AzureRM.Compute.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 11/3/2017
+# Generated on: 12/5/2017
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '4.0.1'
+ModuleVersion = '4.1.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -213,7 +213,8 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Fixed assembly loading issue that caused some cmdlets to fail when executing'
+        ReleaseNotes = '* Get-AzureRmComputeResourceSku shows zone information.
+* Update Disable-AzureRmVmssDiskEncryption to fix issue https://github.com/Azure/azure-powershell/issues/5038'
 
         # External dependent modules of this module
         # ExternalModuleDependencies = ''

src/ResourceManager/Compute/ChangeLog.md

@@ -1,4 +1,4 @@
-<!--
+<!--
     Please leave this section at the top of the change log.
 
     Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+
+## Version 4.1.0
 * Get-AzureRmComputeResourceSku shows zone information.
 * Update Disable-AzureRmVmssDiskEncryption to fix issue https://github.com/Azure/azure-powershell/issues/5038
 

src/ResourceManager/Compute/Commands.Compute/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-// ----------------------------------------------------------------------------------
+// ----------------------------------------------------------------------------------
 //
 // Copyright Microsoft Corporation
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,8 +25,8 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("91792853-487B-4DC2-BE6C-DD09A0A1BC10")]
-[assembly: AssemblyVersion("4.0.1")]
-[assembly: AssemblyFileVersion("4.0.1")]
+[assembly: AssemblyVersion("4.1.0")]
+[assembly: AssemblyFileVersion("4.1.0")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.Commands.Compute.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 #else

src/ResourceManager/ContainerInstance/AzureRM.ContainerInstance.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 11/3/2017
+# Generated on: 12/5/2017
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '0.1.0'
+ModuleVersion = '0.2.0'
 
 # Supported PSEditions
 # CompatiblePSEditions = @()
@@ -54,8 +54,8 @@ CLRVersion = '4.0'
 RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.0.0'; })
 
 # Assemblies that must be loaded prior to importing this module
-RequiredAssemblies = '.\AutoMapper.dll',
-                     '.\Microsoft.Azure.Management.ContainerInstance.dll'
+RequiredAssemblies = '.\AutoMapper.dll', 
+               '.\Microsoft.Azure.Management.ContainerInstance.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()
@@ -109,8 +109,10 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Add support for online help
-    - Run Get-Help with the -Online parameter to open the online help in your default Internet browser'
+        ReleaseNotes = '* Apply Azure Container Instance SDK 2017-10-01
+    - Support container run-to-completion
+    - Support Azure File volume mount
+    - Support opening multiple ports for public IP'
 
         # External dependent modules of this module
         # ExternalModuleDependencies = ''

src/ResourceManager/ContainerInstance/ChangeLog.md

@@ -1,4 +1,4 @@
-<!--
+<!--
     Please leave this section at the top of the change log.
 
     Changes for the current release should go under the section titled "Current Release", and should adhere to the following format:
@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+
+## Version 0.2.0
 * Apply Azure Container Instance SDK 2017-10-01
     - Support container run-to-completion
     - Support Azure File volume mount
@@ -34,4 +36,4 @@
     - New-AzureRmContainerGroup
     - Get-AzureRmContainerGroup
     - Remove-AzureRmContainerGroup
-    - Get-AzureRmContainerInstanceLog
+    - Get-AzureRmContainerInstanceLog

src/ResourceManager/ContainerInstance/Commands.ContainerInstance/Properties/AssemblyInfo.cs

@@ -1,4 +1,4 @@
-using System.Reflection;
+using System.Reflection;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
@@ -32,5 +32,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.1.0")]
-[assembly: AssemblyFileVersion("0.1.0")]
+[assembly: AssemblyVersion("0.2.0")]
+[assembly: AssemblyFileVersion("0.2.0")]