Merge remote-tracking branch 'upstream/master'

Author: lixiachena

ChangeLog.md

@@ -1,3 +1,29 @@
+## 1.3.0 - February 2019
+#### Az.Accounts
+* Update to latest version of ClientRuntime
+
+#### Az.AnalysisServices
+General availability for Az.AnalysisServices module.
+
+#### Az.Compute
+* AEM extension: Add support for UltraSSD and P60,P70 and P80 disks
+* Update help description for Set-AzVMBootDiagnostics
+* Update help description and example for Update-AzImage
+
+#### Az.RecoveryServices
+General availability for Az.RecoveryServices module.
+
+#### Az.Resources
+* Fix tagging for resource groups 
+    - More information here: https://github.com/Azure/azure-powershell/issues/8166
+* Fix issue where `Get-AzureRmRoleAssignment` doesn't respect -ErrorAction 
+    - More information here: https://github.com/Azure/azure-powershell/issues/8235
+
+#### Az.Sql
+* Add Get/Set AzSqlDatabaseBackupShortTermRetentionPolicy
+* Fix issue where not being logged into Azure account would result in nullref exception when executing SQL cmdlets
+* Fixed null ref exception in Get-AzSqlCapability
+
 ## 1.2.1 - January 2019
 #### Az.Accounts
 * Release with correct version of Authentication
@@ -8,6 +34,7 @@
 #### Az.RecoveryServices
 * Release with updated Authentication dependency
 
+
 ## 1.2.0 - January 2019
 #### Az.Accounts
 * Add interactive and username/password authentication for Windows PowerShell 5.1 only

src/Accounts/Accounts/Az.Accounts.psd1

@@ -3,7 +3,7 @@
 #
 # Generated by: Microsoft Corporation
 #
-# Generated on: 1/23/2019
+# Generated on: 2/5/2019
 #
 
 @{
@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '1.2.1'
+ModuleVersion = '1.3.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -141,7 +141,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Release with correct version of Authentication'
+        ReleaseNotes = '* Update to latest version of ClientRuntime'
 
         # Prerelease string of this module
         # Prerelease = ''

src/Accounts/Accounts/AzureRmAlias/Mappings.json

@@ -1288,6 +1288,10 @@
     "New-AzApplicationGatewayFrontendPort": "New-AzureRmApplicationGatewayFrontendPort",
     "Remove-AzApplicationGatewayFrontendPort": "Remove-AzureRmApplicationGatewayFrontendPort",
     "Set-AzApplicationGatewayFrontendPort": "Set-AzureRmApplicationGatewayFrontendPort",
+    "Get-AzApplicationGatewayIdentity": "Get-AzureRmApplicationGatewayIdentity",
+    "New-AzApplicationGatewayIdentity": "New-AzureRmApplicationGatewayIdentity",
+    "Remove-AzApplicationGatewayIdentity": "Remove-AzureRmApplicationGatewayIdentity",
+    "Set-AzApplicationGatewayIdentity": "Set-AzureRmApplicationGatewayIdentity",
     "Add-AzApplicationGatewayIPConfiguration": "Add-AzureRmApplicationGatewayIPConfiguration",
     "Get-AzApplicationGatewayIPConfiguration": "Get-AzureRmApplicationGatewayIPConfiguration",
     "New-AzApplicationGatewayIPConfiguration": "New-AzureRmApplicationGatewayIPConfiguration",

src/Accounts/Accounts/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+
+## Version 1.3.0
 * Update to latest version of ClientRuntime
 
 ## Version 1.2.1

src/Accounts/Accounts/Properties/AssemblyInfo.cs

@@ -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("1.2.1")]
-[assembly: AssemblyFileVersion("1.2.1")]
+[assembly: AssemblyVersion("1.3.0")]
+[assembly: AssemblyFileVersion("1.3.0")]
 #if SIGN
 [assembly: InternalsVisibleTo("Microsoft.Azure.PowerShell.Cmdlets.Accounts.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]
 [assembly: InternalsVisibleTo("Microsoft.WindowsAzure.Commands.Test, PublicKey=0024000004800000940000000602000000240000525341310004000001000100b5fc90e7027f67871e773a8fde8938c81dd402ba65b9201d60593e96c492651e889cc13f1415ebb53fac1131ae0bd333c5ee6021672d9718ea31a8aebd0da0072f25d87dba6fc90ffd598ed4da35e44c398c454307e8e33b8426143daec9f596836f97c8f74750e5975c64e2189f45def46b2a2b1247adc3652bf5c308055da9")]

src/Accounts/Accounts/help/Get-AzSubscription.md

@@ -47,7 +47,7 @@ the current account.
 
 ### Example 2: Get all subscriptions for a specific tenant
 ```
-PS C:\>Get-AzSubscription -TenantId "xxxx-xxxx-xxxx-xxxx"
+PS C:\>Get-AzSubscription -TenantId "aaaa-aaaa-aaaa-aaaa"
 
 Name                               Id                      TenantId                        State
 ----                               --                      --------                        -----

src/Advisor/Advisor/Az.Advisor.psd1

@@ -51,7 +51,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.2.1'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.3.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Advisor.dll'

src/Aks/Aks/Az.Aks.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.2.1'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.3.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\YamlDotNet.dll', '.\AutoMapper.dll'

src/AnalysisServices/AnalysisServices.Dataplane/Commands/AddAzureASAccount.cs

@@ -23,12 +23,14 @@
 using Microsoft.Azure.Commands.Common.Authentication.Abstractions;
 using Microsoft.WindowsAzure.Commands.Common;
 using System;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 
 namespace Microsoft.Azure.Commands.AnalysisServices.Dataplane
 {
     /// <summary>
     /// Cmdlet to log into an Analysis Services environment
     /// </summary>
+    [CmdletDeprecation("2.0.0")]
     [Cmdlet("Add", ResourceManager.Common.AzureRMConstants.AzurePrefix + "AnalysisServicesAccount", DefaultParameterSetName = "UserParameterSetName", SupportsShouldProcess =true)]
     [Alias("Login-AzureAsAccount", "Login-AzAsAccount")]
     [OutputType(typeof(AsAzureProfile))]

src/AnalysisServices/AnalysisServices/Az.AnalysisServices.psd1

@@ -12,7 +12,7 @@
 # RootModule = ''
 
 # Version number of this module.
-ModuleVersion = '1.0.1'
+ModuleVersion = '1.0.0'
 
 # Supported PSEditions
 CompatiblePSEditions = 'Core', 'Desktop'
@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.2.1'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.3.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.Analysis.dll'
@@ -122,7 +122,7 @@ PrivateData = @{
         # IconUri = ''
 
         # ReleaseNotes of this module
-        ReleaseNotes = '* Release with updated Authentication dependency'
+        ReleaseNotes = 'General availability for Az.AnalysisServices module.'
 
         # Prerelease string of this module
         # Prerelease = ''

src/AnalysisServices/AnalysisServices/ChangeLog.md

@@ -18,9 +18,10 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Deprecated AddAzureASAccount cmdlet
 
 ## Version 1.0.1
 * Release with updated Authentication dependency
 
 ## Version 1.0.0
-* General availability of `Az.AnalysisServices` module
+* General availability of `Az.AnalysisServices` module

src/ApiManagement/ApiManagement/Az.ApiManagement.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.2.1'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.3.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\AutoMapper.dll', 

src/ApplicationInsights/ApplicationInsights/Az.ApplicationInsights.psd1

@@ -53,7 +53,7 @@ DotNetFrameworkVersion = '4.7.2'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.2.1'; })
+RequiredModules = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = '1.3.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\Microsoft.Azure.Management.ApplicationInsights.dll'

src/Automation/Automation.Test/ScenarioTests/AccountTests.cs

@@ -12,37 +12,32 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using Microsoft.Azure.Commands.Automation.Test;
-using Microsoft.Azure.ServiceManagement.Common.Models;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
 
 namespace Commands.Automation.Test
 {
-    public class AccountTests : AutomationScenarioTestsBase
+    public class AccountTests : AutomationTestRunner
     {
-        public XunitTracingInterceptor _logger;
-
         public AccountTests(Xunit.Abstractions.ITestOutputHelper output)
+            : base(output)
         {
-            _logger = new XunitTracingInterceptor(output);
-            XunitTracingInterceptor.AddToContext(_logger);
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Service, Category.Automation)]
         public void TestGetAutomationAccts()
         {
-            RunPowerShellTest(_logger, "Test-GetAutomationAccounts");
+            TestRunner.RunTestScript("Test-GetAutomationAccounts");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         [Trait(Category.Service, Category.Automation)]
         public void TestAutomationAcctTags()
         {
-            RunPowerShellTest(_logger, "Test-AutomationAccountTags");
+            TestRunner.RunTestScript("Test-AutomationAccountTags");
         }
     }
 }

src/Automation/Automation.Test/ScenarioTests/AutomationScenarioTestsBase.cs

@@ -0,0 +1,27 @@
+using Microsoft.Azure.Commands.TestFx;
+using Xunit.Abstractions;
+
+namespace Commands.Automation.Test
+{
+    public class AutomationTestRunner
+    {
+        protected readonly ITestRunner TestRunner;
+
+        protected AutomationTestRunner(ITestOutputHelper output)
+        {
+            TestRunner = TestManager.CreateInstance (output)
+                .WithNewPsScriptFilename ($"{GetType().Name}.ps1")
+                .WithProjectSubfolderForTests ("ScenarioTests")
+                .WithCommonPsScripts (new[]
+                {
+                    @"../AzureRM.Resources.ps1",
+                })
+                .WithNewRmModules (helper => new[]
+                {
+                    helper.RMProfileModule,
+                    helper.GetRMModulePath(@"AzureRM.Automation.psd1")
+                })
+                .Build();
+        }
+    }
+}