Merge remote-tracking branch 'refs/remotes/Azure/dev' into dev

Author: solankisamir

ChangeLog.md

@@ -1,4 +1,72 @@
-##2016.03.30 version 1.3.0
+##2016.05.03 version 1.4.0
+* Azure Storage
+  * Upgrade to Microsoft.Azure.Management.Storage nuget package v5.0 preview
+  * Add Encryption and Hot/Cool features support to resource mode storage account cmdlets
+    - New-AzureRmStorageAccount
+    - Set-AzureRmStorageAccount
+  * Add "Add" and "Create" permission to Blob SAS cmdlets
+    - New-AzureStorageBlobSASToken
+    - New-AzureStorageContainerSASToken
+    - New-AzureStorageContainerStoredAccessPolicy
+    - Set-AzureStorageContainerStoredAccessPolicy
+  * Add "Create" permission to File SAS cmdlets
+    - New-AzureStorageFileSASToken
+    - New-AzureStorageShareSASToken
+    - New-AzureStorageShareStoredAccessPolicy
+    - Set-AzureStorageShareStoredAccessPolicy
+  * Added Recovery Services Backup cmdlets
+    - Set-AzureRmRecoveryServicesVaultContext
+    - Set-AzureRmRecoveryServicesBackupProperties
+    - Get-AzureRmRecoveryServicesBackupProperties
+    - Get-AzureRmRecoveryServicesVaultSettingsFile
+    - Backup-AzureRmRecoveryServicesBackupItem
+    - Get-AzureRmRecoveryServicesBackupContainer
+    - Get-AzureRmRecoveryServicesBackupManagementServer
+    - Unregister-AzureRmRecoveryServicesBackupContainer
+    - Unregister-AzureRmRecoveryServicesBackupManagementServer
+    - Disable-AzureRmRecoveryServicesBackupProtection
+    - Enable-AzureRmRecoveryServicesBackupProtection
+    - Get-AzureRmRecoveryServicesBackupItem
+    - Get-AzureRmRecoveryServicesBackupJob
+    - Get-AzureRmRecoveryServicesBackupJobDetails
+    - Stop-AzureRmRecoveryServicesBackupJob
+    - Wait-AzureRmRecoveryServicesBackupJob
+    - Get-AzureRmRecoveryServicesBackupRetentionPolicyObject
+    - Get-AzureRmRecoveryServicesBackupProtectionPolicy
+    - Get-AzureRmRecoveryServicesBackupSchedulePolicyObject
+    - New-AzureRmRecoveryServicesBackupProtectionPolicy
+    - Remove-AzureRmRecoveryServicesBackupProtectionPolicy
+    - Set-AzureRmRecoveryServicesBackupProtectionPolicy
+    - Get-AzureRmRecoveryServicesBackupRecoveryPoint
+    - Restore-AzureRmRecoveryServicesBackupItem
+
+##2016.04.19 version 1.3.2
+* Add support for specifying NIC/VMSS as application gateway backend address
+* Fix HDI ADL cluster creation and live test
+* Fix WAPack cmdlet Proxy issue for WAP
+* Fix Dynamic Memory Issue while setting VM
+* Update Azure Gov STS and Traffic Manager
+* Compute
+  - Upgrade to Microsoft.Azure.Management.Compute nuget package v13.0 
+* HDInsignt
+  - Upgrade to Microsoft.Azure.Management.HDInsight nuget package v1.0.14
+* Resource Manager 
+  - Change api-version for Policy and Locks operations
+  - Change api version for Deployments operations
+* Web Apps
+  - Add backup and restore cmdlets
+    - Restore-AzureWebApp
+    - Edit-AzureRmWebAppBackupConfiguration
+    - Get-AzureRmWebAppBackupConfiguration
+    - Get-AzureRmWebAppBackup
+    - New-AzureRmWebAppBackup
+    - Remove-AzureRmWebAppBackup
+    - Restore-AzureRmWebAppBackup
+    - Get-AzureRmWebAppBackupList
+    - New-AzureRmWebAppDatabaseBackupSetting
+  - Upgrade to Microsoft.WindowsAzure.Management.WebSite nuget package v5.0
+
+##2016.03.30 version 1.3.0
 * AzureRM module
   - Installation performance fix
 * New Azure CDN cmdlets

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

setup/azurecmdfiles.wxi

@@ -217,7 +217,7 @@ public void LoadingProfileWorks()
             AzureSession.DataStore = dataStore;
             dataStore.WriteFile(path, contents);
             var profile = new AzureRMProfile(path);
-            Assert.Equal(4, profile.Environments.Count);
+            Assert.Equal(5, profile.Environments.Count);
             Assert.Equal("3c0ff8a7-e8bb-40e8-ae66-271343379af6", profile.Context.Tenant.Id.ToString());
             Assert.Equal("contoso.com", profile.Context.Tenant.Domain);
             Assert.Equal("00000000-0000-0000-0000-000000000000", profile.Context.Subscription.Id.ToString());

src/Common/Commands.Common.Authentication.Test/AzureRMProfileTests.cs

@@ -28,6 +28,6 @@
 
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
-[assembly: AssemblyVersion("1.3.0")]
-[assembly: AssemblyFileVersion("1.3.0")]
+[assembly: AssemblyVersion("1.3.2")]
+[assembly: AssemblyFileVersion("1.3.2")]
 [assembly: CollectionBehavior(DisableTestParallelization = true)]

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

@@ -149,6 +149,7 @@
     <Compile Include="Interfaces\IClientFactory.cs" />
     <Compile Include="Interfaces\IDataStore.cs" />
     <Compile Include="Interfaces\IProfileSerializer.cs" />
+    <Compile Include="LegacySupport.cs" />
     <Compile Include="Models\AzureAccount.cs" />
     <Compile Include="Models\AzureAccount.Methods.cs" />
     <Compile Include="Models\AzureContext.cs" />

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

@@ -12,24 +12,21 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
-using System;
+using Microsoft.Azure.Commands.Common.Authentication;
 
-namespace Microsoft.Azure.Common.Authentication.Models
+namespace Microsoft.Azure.Common.Authentication
 {
     /// <summary>
-    /// Represents an AD tenant.
+    /// Provide backward compatibility for setting User Agent values
     /// </summary>
-    [Serializable]
-    public class AzureTenant
+    public static class AzureSession
     {
         /// <summary>
-        /// Gets or sets the tenant id.
+        /// The ClientFactory used to produce management clients in this session
         /// </summary>
-        public Guid Id { get; set; }
-
-        /// <summary>
-        /// Gets or sets the tenant domain.
-        /// </summary>
-        public string Domain { get; set; }
+        public static IClientFactory ClientFactory
+        {
+            get { return Commands.Common.Authentication.AzureSession.ClientFactory; }
+        }
     }
 }

src/Common/Commands.Common.Authentication/stuff/Models/AzureTenant.cs renamed to src/Common/Commands.Common.Authentication/LegacySupport.cs

@@ -146,15 +146,40 @@ private string StorageFileEndpointFormat()
                         { AzureEnvironment.Endpoint.Gallery, AzureEnvironmentConstants.USGovernmentGalleryEndpoint },
                         { AzureEnvironment.Endpoint.SqlDatabaseDnsSuffix, AzureEnvironmentConstants.USGovernmentSqlDatabaseDnsSuffix },
                         { AzureEnvironment.Endpoint.Graph, AzureEnvironmentConstants.USGovernmentGraphEndpoint },
-                        { AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, null },
+                        { AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, AzureEnvironmentConstants.USGovernmentTrafficManagerDnsSuffix },
                         { AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, AzureEnvironmentConstants.USGovernmentKeyVaultDnsSuffix},
                         { AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.USGovernmentKeyVaultServiceEndpointResourceId},
                         { AzureEnvironment.Endpoint.AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix, null},
                         { AzureEnvironment.Endpoint.AzureDataLakeStoreFileSystemEndpointSuffix, null},
-                        {AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint}
+                        { AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.USGovernmentGraphEndpoint }
+                    }
+                }
+            },
+            {
+                EnvironmentName.AzureGermanCloud,
+                new AzureEnvironment
+                {
+                    Name = EnvironmentName.AzureGermanCloud,
+                    Endpoints = new Dictionary<AzureEnvironment.Endpoint, string>
+                    {
+                        { AzureEnvironment.Endpoint.PublishSettingsFileUrl, AzureEnvironmentConstants.GermanPublishSettingsFileUrl },
+                        { AzureEnvironment.Endpoint.ServiceManagement, AzureEnvironmentConstants.GermanServiceEndpoint },
+                        { AzureEnvironment.Endpoint.ResourceManager, AzureEnvironmentConstants.GermanResourceManagerEndpoint },
+                        { AzureEnvironment.Endpoint.ManagementPortalUrl, AzureEnvironmentConstants.GermanManagementPortalUrl },
+                        { AzureEnvironment.Endpoint.ActiveDirectory, AzureEnvironmentConstants.GermanActiveDirectoryEndpoint },
+                        { AzureEnvironment.Endpoint.ActiveDirectoryServiceEndpointResourceId, AzureEnvironmentConstants.GermanServiceEndpoint },
+                        { AzureEnvironment.Endpoint.StorageEndpointSuffix, AzureEnvironmentConstants.GermanStorageEndpointSuffix },
+                        { AzureEnvironment.Endpoint.Gallery, AzureEnvironmentConstants.GermanGalleryEndpoint },
+                        { AzureEnvironment.Endpoint.SqlDatabaseDnsSuffix, AzureEnvironmentConstants.GermanSqlDatabaseDnsSuffix },
+                        { AzureEnvironment.Endpoint.Graph, AzureEnvironmentConstants.GermanGraphEndpoint },
+                        { AzureEnvironment.Endpoint.TrafficManagerDnsSuffix, AzureEnvironmentConstants.GermanTrafficManagerDnsSuffix },
+                        { AzureEnvironment.Endpoint.AzureKeyVaultDnsSuffix, AzureEnvironmentConstants.GermanKeyVaultDnsSuffix },
+                        { AzureEnvironment.Endpoint.AzureKeyVaultServiceEndpointResourceId, AzureEnvironmentConstants.GermanAzureKeyVaultServiceEndpointResourceId },
+                        { AzureEnvironment.Endpoint.GraphEndpointResourceId, AzureEnvironmentConstants.GermanGraphEndpoint }
                     }
                 }
             }
+
         };
 
         public Uri GetEndpointAsUri(AzureEnvironment.Endpoint endpoint)
@@ -337,86 +362,74 @@ public enum Endpoint
     public static class EnvironmentName
     {
         public const string AzureCloud = "AzureCloud";
-
         public const string AzureChinaCloud = "AzureChinaCloud";
-
         public const string AzureUSGovernment = "AzureUSGovernment";
+        public const string AzureGermanCloud = "AzureGermanCloud";
     }
 
     public static class AzureEnvironmentConstants
     {
         public const string AzureServiceEndpoint = "https://management.core.windows.net/";
-
         public const string ChinaServiceEndpoint = "https://management.core.chinacloudapi.cn/";
-
         public const string USGovernmentServiceEndpoint = "https://management.core.usgovcloudapi.net/";
+        public const string GermanServiceEndpoint = "https://management.core.cloudapi.de/";
 
         public const string AzureResourceManagerEndpoint = "https://management.azure.com/";
-
         public const string ChinaResourceManagerEndpoint = "https://management.chinacloudapi.cn/";
-
         public const string USGovernmentResourceManagerEndpoint = "https://management.usgovcloudapi.net/";
+        public const string GermanResourceManagerEndpoint = "https://management.microsoftazure.de/";
 
         public const string GalleryEndpoint = "https://gallery.azure.com/";
-
         public const string ChinaGalleryEndpoint = "https://gallery.chinacloudapi.cn/";
-
         public const string USGovernmentGalleryEndpoint = "https://gallery.usgovcloudapi.net/";
+        public const string GermanGalleryEndpoint = "https://gallery.cloudapi.de/";
 
         public const string AzurePublishSettingsFileUrl = "http://go.microsoft.com/fwlink/?LinkID=301775";
-
         public const string ChinaPublishSettingsFileUrl = "http://go.microsoft.com/fwlink/?LinkID=301776";
-
         public const string USGovernmentPublishSettingsFileUrl = "https://manage.windowsazure.us/publishsettings/index";
+        public const string GermanPublishSettingsFileUrl = "https://manage.microsoftazure.de/publishsettings/index";
 
         public const string AzureManagementPortalUrl = "http://go.microsoft.com/fwlink/?LinkId=254433";
-
         public const string ChinaManagementPortalUrl = "http://go.microsoft.com/fwlink/?LinkId=301902";
-
         public const string USGovernmentManagementPortalUrl = "https://manage.windowsazure.us";
+        public const string GermanManagementPortalUrl = "http://portal.microsoftazure.de/";
 
         public const string AzureStorageEndpointSuffix = "core.windows.net";
-
         public const string ChinaStorageEndpointSuffix = "core.chinacloudapi.cn";
-
         public const string USGovernmentStorageEndpointSuffix = "core.usgovcloudapi.net";
+        public const string GermanStorageEndpointSuffix = "core.cloudapi.de";
 
         public const string AzureSqlDatabaseDnsSuffix = ".database.windows.net";
-
         public const string ChinaSqlDatabaseDnsSuffix = ".database.chinacloudapi.cn";
-
         public const string USGovernmentSqlDatabaseDnsSuffix = ".database.usgovcloudapi.net";
+        public const string GermanSqlDatabaseDnsSuffix = ".database.cloudapi.de";
 
         public const string AzureActiveDirectoryEndpoint = "https://login.microsoftonline.com/";
-
         public const string ChinaActiveDirectoryEndpoint = "https://login.chinacloudapi.cn/";
-
-        public const string USGovernmentActiveDirectoryEndpoint = "https://login.microsoftonline.com/";
+        public const string USGovernmentActiveDirectoryEndpoint = "https://login-us.microsoftonline.com/";
+        public const string GermanActiveDirectoryEndpoint = "https://login.microsoftonline.de/";
 
         public const string AzureGraphEndpoint = "https://graph.windows.net/";
-
         public const string ChinaGraphEndpoint = "https://graph.chinacloudapi.cn/";
-
         public const string USGovernmentGraphEndpoint = "https://graph.windows.net/";
+        public const string GermanGraphEndpoint = "https://graph.cloudapi.de/";
 
         public const string AzureTrafficManagerDnsSuffix = "trafficmanager.net";
-
         public const string ChinaTrafficManagerDnsSuffix = "trafficmanager.cn";
+        public const string USGovernmentTrafficManagerDnsSuffix = "usgovtrafficmanager.net";
+        public const string GermanTrafficManagerDnsSuffix = "azuretrafficmanager.de";
 
         public const string AzureKeyVaultDnsSuffix = "vault.azure.net";
-
         public const string ChinaKeyVaultDnsSuffix = "vault.azure.cn";
-
         public const string USGovernmentKeyVaultDnsSuffix = "vault.usgovcloudapi.net";
+        public const string GermanKeyVaultDnsSuffix = "vault.microsoftazure.de";
 
         public const string AzureKeyVaultServiceEndpointResourceId = "https://vault.azure.net";
-
         public const string ChinaKeyVaultServiceEndpointResourceId = "https://vault.azure.cn";
-
         public const string USGovernmentKeyVaultServiceEndpointResourceId = "https://vault.usgovcloudapi.net";
+        public const string GermanAzureKeyVaultServiceEndpointResourceId = "https://vault.microsoftazure.de";
 
         public const string AzureDataLakeAnalyticsCatalogAndJobEndpointSuffix = "azuredatalakeanalytics.net";
-
         public const string AzureDataLakeStoreFileSystemEndpointSuffix = "azuredatalakestore.net";
     }
 }

src/Common/Commands.Common.Authentication/Models/AzureEnvironment.Methods.cs

@@ -46,5 +46,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("1.3.0")]
-[assembly: AssemblyFileVersion("1.3.0")]
+[assembly: AssemblyVersion("1.3.2")]
+[assembly: AssemblyFileVersion("1.3.2")]