Merge branch 'dev' of https://github.com/Azure/azure-powershell into dev

Author: Shefali

CONTRIBUTING.md

@@ -1,5 +1,5 @@
 # Contribute Code or Provide Feedback
 
-If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://windowsazure.github.com/guidelines.html).
+If you would like to become an active contributor to this project please follow the instructions provided in [Microsoft Azure Projects Contribution Guidelines](http://azure.github.io/guidelines/).
 
 If you encounter any bugs with Microsoft Azure PowerShell please file an issue in the [Issues](https://github.com/Azure/azure-powershell/issues) section of the project.

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
@@ -12,6 +23,21 @@
   * Set-AzureLogicAppAccessKey
   * Set-AzureLogicApp
   * Stop-AzureLogicAppRun
+ * Azure Storage
+  * Added cmdlet to generate SAS token against storage account
+    - New-AzureStorageAccountSASToken
+  * Added IPAddressOrRange/Protocol support in cmdlets to generate SAS token against blob, container, file, share, table, queue
+    - New-AzureStorageBlobSASToken
+    - New-AzureStorageContainerSASToken
+    - New-AzureStorageFileSASToken
+    - New-AzureStorageShareSASToken
+    - New-AzureStorageQueueSASToken
+    - New-AzureStorageTableSASToken
+* Azure SQL DB Backup/restore
+  * Get-AzureRmSqlDatabaseGeoBackup
+  * Get-AzureRmSqlDeletedDatabaseBackup
+  * Restore-AzureRmSqlDatabase
+    * This cmdlet accepts as pipelined input the result of one of the first two cmdlets (or Get-AzureRmSqlDatabase if restoring a live DB to a point-in-time)
 
 ## 2016.02.04 version 1.2.1
 * Fix installer issue - remove PSGallery modules on install

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)"

setup/azurecmdfiles.wxi

@@ -8,10 +8,10 @@
     <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>
-    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">..\..\</SolutionDir>
+    <TargetFrameworkProfile />
     <RestorePackages>true</RestorePackages>
     <CodeAnalysisAdditionalOptions>/assemblyCompareMode:StrongNameIgnoringVersion</CodeAnalysisAdditionalOptions>
     <NuGetPackageImportStamp>06e19c11</NuGetPackageImportStamp>
@@ -51,7 +51,8 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Hyak.Common.1.0.3\lib\net45\Hyak.Common.dll</HintPath>
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\packages\Hyak.Common.1.0.3\lib\portable-net403+win+wpa81\Hyak.Common.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Common, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
@@ -178,5 +179,4 @@
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets" Condition="Exists('..\..\packages\Microsoft.Bcl.Build.1.0.14\tools\Microsoft.Bcl.Build.targets')" />
 </Project>

src/Common/Commands.Common.Authentication.Test/MSSharedLibKey.snk

@@ -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/Commands.Common.Authentication.csproj

@@ -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.Common.Authentication/Factories/ClientFactory.cs

@@ -38,6 +38,16 @@ public bool Deserialize(string contents, AzureSMProfile profile)
             DeserializeErrors = new List<string>();
 
             DataContractSerializer serializer = new DataContractSerializer(typeof(ProfileData));
+
+            // For backward compatibility since namespace of ProfileData has been changed
+            // we need to replace previous namespace with the current one
+            if (!string.IsNullOrWhiteSpace(contents))
+            {
+                contents = contents.Replace(
+                    "http://schemas.datacontract.org/2004/07/Microsoft.Azure.Common.Authentication",
+                    "http://schemas.datacontract.org/2004/07/Microsoft.Azure.Commands.Common.Authentication");
+            }
+
             using (MemoryStream s = new MemoryStream(Encoding.UTF8.GetBytes(contents ?? "")))
             {
                 data = (ProfileData)serializer.ReadObject(s);