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

# Conflicts:

#	src/ResourceManager/ApiManagement/Commands.ApiManagement.ServiceManagement/packages.config

#	src/ResourceManager/ApiManagement/Commands.ApiManagement/packages.config

Author: solankisamir

ChangeLog.md

@@ -1,4 +1,47 @@
-##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
+
+##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

README.md

@@ -59,7 +59,7 @@ For detail descriptions and examples of the cmdlets, type
 * [Azure Stack](https://azure.microsoft.com/en-us/overview/azure-stack/)
 * [Windows Azure Pack](https://www.microsoft.com/en-us/server-cloud/windows-azure-pack.aspx)
 * [Microsoft Azure China](https://www.azure.cn/)
-* [USGovernment](https://azure.microsoft.com/en-us/features/gov/)
+* [Microsoft Azure US Government](https://azure.microsoft.com/en-us/features/gov/)
 
 ## Installation
 
@@ -123,6 +123,15 @@ Add-AzureRmAccount -EnvironmentName AzureChinaCloud
 New-AzureRmResourceGroup -Name myresourceGroup -Location "China East"
 ```
 
+### Microsoft Azure US Government
+
+```powershell
+Add-AzureRmAccount -EnvironmentName AzureUSGovernment
+
+# use the cmdlets to manage your services/applications
+New-AzureRmResourceGroup -Name myresourceGroup -Location "US Gov Virginia"
+```
+
 ### Windows Azure Pack
 
 ```powershell

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

@@ -462,6 +462,9 @@
                         <Component Id="cmpEC720F6E3871A33FE098F6CEB7617D8F" Guid="*">
                             <File Id="filE5E777BDF09D8E3E09A887286A7FBFCB" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
                         </Component>
+                        <Component Id="cmp7BE433E392CBC4CABE32256077124C6E" Guid="*">
+                            <File Id="fil027AB5F08FF4A7F59EE167422771AABE" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Rest.ClientRuntime.Azure.dll" />
+                        </Component>
                         <Component Id="cmp5D544D73B729F9669498812ECF7BF3E1" Guid="*">
                             <File Id="filBC5BF331E6C0917A1886357E3ED64497" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Batch\Microsoft.Rest.ClientRuntime.dll" />
                         </Component>
@@ -2538,6 +2541,9 @@
                         <Component Id="cmpA2A4B67ACC8738C88A82A9576BD82026" Guid="*">
                             <File Id="fil2E6EA8F5997FA6DBE29FCE3A58F051DF" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll" />
                         </Component>
+                        <Component Id="cmp3AE4D7EAA86E455A89006A85332F6B3A" Guid="*">
+                            <File Id="fil6C5492894C2F4DDD80E710891D53B6D2" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.Azure.dll" />
+                        </Component>
                         <Component Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" Guid="*">
                             <File Id="filDAF92272D69F4A127139311912333F8B" KeyPath="yes" Source="$(var.sourceDir)\ResourceManager\AzureResourceManager\AzureRM.Storage\Microsoft.Rest.ClientRuntime.dll" />
                         </Component>
@@ -5138,6 +5144,7 @@
             <ComponentRef Id="cmpD762051962F7D3051FBC9CF971AE9325" />
             <ComponentRef Id="cmpB11D8DF03DCC6DF2571C30776714A652" />
             <ComponentRef Id="cmpEC720F6E3871A33FE098F6CEB7617D8F" />
+            <ComponentRef Id="cmp7BE433E392CBC4CABE32256077124C6E" />
             <ComponentRef Id="cmp5D544D73B729F9669498812ECF7BF3E1" />
             <ComponentRef Id="cmpB1E3E66F5FC40C4E26A9CC895B89DA63" />
             <ComponentRef Id="cmp35BA09F11D618680F9850F73564F9F47" />
@@ -5816,6 +5823,7 @@
             <ComponentRef Id="cmp4EA5A818E3BE7C67C27B69ADABCE5CBF" />
             <ComponentRef Id="cmpBF600E80A7D04977AF21CAA07A79254C" />
             <ComponentRef Id="cmpA2A4B67ACC8738C88A82A9576BD82026" />
+            <ComponentRef Id="cmp3AE4D7EAA86E455A89006A85332F6B3A" />			
             <ComponentRef Id="cmpE56C0006C325EFBAD7984DBBCF689FD2" />
             <ComponentRef Id="cmpA94FD747C692B4A9A45D9DE5D869DE53" />
             <ComponentRef Id="cmp7F0D9683DB4D431F6A1A42EBCAD0E4E3" />

src/Common/Commands.Common.Authentication.Test/Properties/AssemblyInfo.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/Commands.Common.Authentication.csproj

@@ -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/LegacySupport.cs

@@ -0,0 +1,32 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.Common.Authentication;
+
+namespace Microsoft.Azure.Common.Authentication
+{
+    /// <summary>
+    /// Provide backward compatibility for setting User Agent values
+    /// </summary>
+    public static class AzureSession
+    {
+        /// <summary>
+        /// The ClientFactory used to produce management clients in this session
+        /// </summary>
+        public static IClientFactory ClientFactory
+        {
+            get { return Commands.Common.Authentication.AzureSession.ClientFactory; }
+        }
+    }
+}

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

@@ -146,12 +146,12 @@ 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 }
                     }
                 }
             }
@@ -391,7 +391,7 @@ public static class AzureEnvironmentConstants
 
         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 AzureGraphEndpoint = "https://graph.windows.net/";
 
@@ -403,6 +403,8 @@ public static class AzureEnvironmentConstants
 
         public const string ChinaTrafficManagerDnsSuffix = "trafficmanager.cn";
 
+        public const string USGovernmentTrafficManagerDnsSuffix = "usgovtrafficmanager.net";
+
         public const string AzureKeyVaultDnsSuffix = "vault.azure.net";
 
         public const string ChinaKeyVaultDnsSuffix = "vault.azure.cn";

src/Common/Commands.Common.Authentication/Properties/AssemblyInfo.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")]

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

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

src/Common/Commands.Common.Storage/Adapters/ARM.Storage.5/ARMStorageProvider.cs

@@ -0,0 +1,37 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System.Management.Automation;
+using Microsoft.Azure.Management.Storage;
+using Microsoft.WindowsAzure.Commands.Common.Storage;
+
+namespace Microsoft.Azure.Commands.Management.Storage.Models
+{
+    public class ARMStorageProvider : IStorageServiceProvider
+    {
+        IStorageManagementClient _client;
+
+        public ARMStorageProvider(IStorageManagementClient client)
+        {
+            _client = client;
+        }
+        public IStorageService GetStorageService(string name, string resourceGroupName)
+        {
+            var account = _client.StorageAccounts.GetProperties(resourceGroupName, name);
+            var keys = _client.StorageAccounts.ListKeys(resourceGroupName, name);
+            return new ARMStorageService(account, keys.Keys[0].Value, 
+                keys.Keys[1].Value);
+        }
+    }
+}

src/Common/Commands.Common.Storage/Adapters/ARM.Storage.5/ARMStorageService.cs

@@ -0,0 +1,92 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Microsoft.WindowsAzure.Commands.Common.Storage;
+
+namespace Microsoft.Azure.Commands.Management.Storage.Models
+{
+    public class ARMStorageService : IStorageService
+    {
+        Azure.Management.Storage.Models.StorageAccount _account;
+        List<string> _authenticationKeys = new List<string>();
+        public ARMStorageService(Azure.Management.Storage.Models.StorageAccount account,
+            params string[] authenticationKeys)
+        {
+            _account = account;
+            foreach (var key in authenticationKeys)
+            {
+                _authenticationKeys.Add(key);
+            }
+        }
+
+        public Uri BlobEndpoint
+        {
+            get { return GetUri(_account.PrimaryEndpoints.Blob); }
+        }
+
+        public Uri FileEndpoint
+        {
+            get { return GetUri(_account.PrimaryEndpoints.File); }
+        }
+
+        public Uri QueueEndpoint
+        {
+            get { return GetUri(_account.PrimaryEndpoints.Queue); }
+        }
+
+        public Uri TableEndpoint
+        {
+            get { return GetUri(_account.PrimaryEndpoints.Table); }
+        }
+
+        public string Name
+        {
+            get { return _account.Name; }
+        }
+
+        public List<string> AuthenticationKeys
+        {
+            get { return _authenticationKeys; }
+        }
+
+        /// <summary>
+        /// Get the resource group name from a storage account resource Id
+        /// </summary>
+        /// <param name="resourceId">The resource Id for the storage account</param>
+        /// <returns>The resource group containing the storage account</returns>
+        public static string ParseResourceGroupFromId(string resourceId)
+        {
+            if (!string.IsNullOrEmpty(resourceId))
+            {
+                string[] tokens = resourceId.Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+                if (tokens == null || tokens.Length < 4)
+                {
+                    throw new ArgumentOutOfRangeException("resourceId");
+                }
+                return tokens[3];
+            }
+            return null;
+        }
+
+        public static Uri GetUri(string uriString)
+        {
+            return uriString == null ? null : new Uri(uriString);
+        }
+    }
+}

src/Common/Commands.Common.Storage/Commands.Common.Storage.csproj

@@ -65,7 +65,7 @@
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.19.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
+      <HintPath>..\..\packages\Microsoft.Azure.Management.Resources.2.20.0-preview\lib\net40\Microsoft.Azure.ResourceManager.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Data.Edm">
       <SpecificVersion>False</SpecificVersion>

src/Common/Commands.Common.Storage/Properties/AssemblyInfo.cs

@@ -24,5 +24,5 @@
 [assembly: ComVisible(false)]
 [assembly: CLSCompliant(false)]
 [assembly: Guid("c565107e-98a9-4703-85cd-a7efc3d8da7b")]
-[assembly: AssemblyVersion("1.3.0")]
-[assembly: AssemblyFileVersion("1.3.0")]
+[assembly: AssemblyVersion("1.3.2")]
+[assembly: AssemblyFileVersion("1.3.2")]

src/Common/Commands.Common.Storage/packages.config

@@ -4,7 +4,7 @@
   <package id="Microsoft.Azure.Common" version="2.1.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.KeyVault.Core" version="1.0.0" targetFramework="net45" />
-  <package id="Microsoft.Azure.Management.Resources" version="2.19.0-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Management.Resources" version="2.20.0-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Storage" version="3.0.0" targetFramework="net45" />
   <package id="Microsoft.Bcl" version="1.1.9" targetFramework="net45" />
   <package id="Microsoft.Bcl.Async" version="1.0.168" targetFramework="net45" />

src/Common/Commands.Common/AzurePowerShell.cs

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