Merge pull request Azure#28 from Azure/master

ogail · ogail · commit b069bac52502 · 2015-01-08T17:41:51.000-08:00
Merge master -&gt; dev for release -0.8.13
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,3 +1,17 @@
+2015.01.08 version 0.8.13
+* Key Vault Service - new cmdlets in AzureResourceManager mode:
+  * Keys:
+    * Add-AzureKeyVaultKey
+    * Get-AzureKeyVaultKey
+    * Set-AzureKeyVaultKey
+    * Backup-AzureKeyVaultKey
+    * Restore-AzureKeyVaultKey
+    * Remove-AzureKeyVaultKey
+  * Secrets:
+    * Get-AzureKeyVaultSecret
+    * Set-AzureKeyVaultSecret
+    * Remove-AzureKeyVaultSecret
+
 2014.12.12 version 0.8.12
 * StreamAnalytics
   * New cmdlets in AzureResourceManager mode
diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs
@@ -1,11 +1,11 @@
 ﻿<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
 
-  <?define productName="Microsoft Azure PowerShell - December 2014" ?>
+  <?define productName="Microsoft Azure PowerShell - January 2015" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="0.8.12" ?>
+  <?define version="0.8.13" ?>
   <?define versionedStartMenuFolder="Microsoft Azure" ?>
   <?define staleStartMenuFolder="Windows Azure" ?>
 
diff --git a/src/Common/Azure.Common.Extensions/Common.Extensions.csproj b/src/Common/Azure.Common.Extensions/Common.Extensions.csproj
@@ -189,6 +189,7 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
+    <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config">
       <SubType>Designer</SubType>
     </None>
diff --git a/src/Common/Commands.Common/AzurePowerShell.cs b/src/Common/Commands.Common/AzurePowerShell.cs
@@ -27,9 +27,9 @@ public class AzurePowerShell
 
         public const string AssemblyCopyright = "Copyright © Microsoft";
 
-        public const string AssemblyVersion = "0.8.12";
+        public const string AssemblyVersion = "0.8.13";
 
-        public const string AssemblyFileVersion = "0.8.12";
+        public const string AssemblyFileVersion = "0.8.13";
 
         public const string ProfileFile = "AzureProfile.json";
 
diff --git a/src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests/TestAzureTagsEndToEnd.json b/src/ResourceManager/Resources/Commands.Resources.Test/SessionRecords/Microsoft.Azure.Commands.Resources.Test.ScenarioTests.ResourceGroupTests/TestAzureTagsEndToEnd.json
diff --git a/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1 b/src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1
@@ -9,7 +9,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '0.8.12'
+ModuleVersion = '0.8.13'
 
 # ID used to uniquely identify this module
 GUID = '81d522a4-6e5d-4105-8f58-376204c47458'
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/PIR.psd1 b/src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/PIR.psd1
@@ -12,7 +12,7 @@
 ModuleToProcess = '.\Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll'
 
 # Version number of this module.
-ModuleVersion = '0.8.12'
+ModuleVersion = '0.8.13'
 
 # ID used to uniquely identify this module
 GUID = 'a9343cbd-175c-4f72-90c7-2abe9b300644'
diff --git a/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/AzurePreview.psd1 b/src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/AzurePreview.psd1
@@ -12,7 +12,7 @@
 ModuleToProcess = '.\Microsoft.WindowsAzure.Commands.ServiceManagement.Preview.dll'
 
 # Version number of this module.
-ModuleVersion = '0.8.12'
+ModuleVersion = '0.8.13'
 
 # ID used to uniquely identify this module
 GUID = '1C72E555-E83F-45E4-AED2-AF3278828DCD'
diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRoute.psd1 b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRoute.psd1
@@ -12,7 +12,7 @@
 ModuleToProcess = '.\Microsoft.WindowsAzure.Commands.ExpressRoute.dll'
 
 # Version number of this module.
-ModuleVersion = '0.8.12'
+ModuleVersion = '0.8.13'
 
 # ID used to uniquely identify this module
 GUID = 'e5b10573-30da-456a-9319-4c0a5f8bed4a'
diff --git a/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/SessionRecords/Microsoft.Azure.Commands.ManagedCache.Test.ScenarioTests.ManagedCacheTests/ManagedCacheEndToEndTest.json b/src/ServiceManagement/ManagedCache/Commands.ManagedCache.Test/SessionRecords/Microsoft.Azure.Commands.ManagedCache.Test.ScenarioTests.ManagedCacheTests/ManagedCacheEndToEndTest.json
diff --git a/src/ServiceManagement/Network/Commands.Network/Commands.Network.csproj b/src/ServiceManagement/Network/Commands.Network/Commands.Network.csproj
@@ -68,9 +68,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.4.3.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.2.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\WindowsAzure.Storage.4.0.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+      <HintPath>..\..\..\packages\WindowsAzure.Storage.4.2.1\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ServiceManagement/Network/Commands.Network/packages.config b/src/ServiceManagement/Network/Commands.Network/packages.config
@@ -15,5 +15,5 @@
   <package id="Microsoft.WindowsAzure.Management.Network" version="4.3.0" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
   <package id="System.Spatial" version="5.6.0" targetFramework="net45" />
-  <package id="WindowsAzure.Storage" version="4.0.0" targetFramework="net45" />
+  <package id="WindowsAzure.Storage" version="4.2.1" targetFramework="net45" />
 </packages>
diff --git a/src/ServiceManagement/Services/Commands.Utilities/Azure.psd1 b/src/ServiceManagement/Services/Commands.Utilities/Azure.psd1
@@ -9,7 +9,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '0.8.12'
+ModuleVersion = '0.8.13'
 
 # ID used to uniquely identify this module
 GUID = 'D48CF693-4125-4D2D-8790-1514F44CE325'
diff --git a/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Resources/MockSessions.xml b/src/ServiceManagement/Sql/Commands.SqlDatabase.Test/Resources/MockSessions.xml
diff --git a/src/ServiceManagement/Storage/Commands.Storage.MsTest2/Properties/AssemblyInfo.cs b/src/ServiceManagement/Storage/Commands.Storage.MsTest2/Properties/AssemblyInfo.cs
