Merge pull request Azure#545 from Azure/master

Merging Master with release 0.9.4 to Dev
AzureRT · Jun 25, 2015 · a042101 · a042101
2 parents c0570a1 + d486c07
commit a042101
Show file tree

Hide file tree

Showing 16 changed files with 1,384 additions and 1,025 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -1,34 +1,40 @@
-2015.06.25 version 0.9.4
-* Added Batch cmdlets
-    * Start-AzureBatchPoolResize
-    * Stop-AzureBatchPoolResize
-* Azure SQL Database
-    * Added cmdlets for pause/resume functionality and retrieving restore points for restoring backups:
-        * Suspend-AzureSqlDatabase
-        * Resume-AzureSqlDatabase
-        * Get-AzureSqlDatabaseRestorePoints
-    * Changed cmdlets:
-        * New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
-* RedisCache cmdlets 
-    * Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
-    * New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513
+2015.06.26 version 0.9.4
+* Azure Compute cmdlets
+    * Warning message for deprecation Name parameter in New-AzureVM. The guidance is to use –Name parameter in New-AzureVMConfig cmdlet.
+    * Save-AzureVMImgage has new paramter -Path to save the JSON template returned from the server.
+    * Add-AzureVMNetworkInterface has new paramter -NetworkInterface which accepts a list of NIC object returned by Get-AzureNetworkInterface cmdlet. 
+    * Deprecated “-Name” parameter in Set-AzureVMSourceImage. The guidance is to use the Pub, Offer, SKU, Version method to specify the VM Images for the VM.
+    * Fixed the formatting of the output of VM Image cmdlets.
+    * Fixed issues in New/Set-AzureDeployment & other service extension related cmdlets.
+* Azure Batch cmdlets
+    * Added Start-AzureBatchPoolResize
+    * Added Stop-AzureBatchPoolResize
 * Azure Key Vault cmdlets
     * Updated Key Vault package versions
     * Fixed bugs related to secrets
-* Azure Resource Manager
-    * Added Get-AzureProviderOperation cmdlet
-    * Added Test-AzureResourceGroup and Test-AzureResource cmdlets
-    * Refactored Resource Lock cmdlets
-    * Removed unnecessary code when getting a resource
-* Added UsageAggregates cmdlets 
-    * Get-UsageAggregates
-* Network Resource Provider changes
+* Azure Network Resource Provider cmdlets
     * New-AzureLocalNetworkGateway parameter name change
     * Reset-AzureLocalNetworkGateway renamed to Set-AzureLocalNetworkGateway, added new parameter
     * VirtualNetworkGateway parameter changes
         * New-AzureVirtualNetworkGateway parameter changes
         * Removed command Resize-AzureVirtualNetworkGateway
         * Reset-AzureVirtualNetworkGatewayConnection renamed to Set-AzureVirtualNetworkGatewayConnection8
+* Azure RedisCache cmdlets 
+    * Set-AzureRedisCache - Added support for scaling, using RedisConfiguration instead of MaxMemoryPolicy #513
+    * New-AzureRedisCache - Using RedisConfiguration instead of MaxMemoryPolicy #513
+* Azure Resource Manager cmdlets
+    * Added Get-UsageAggregates
+    * Added Get-AzureProviderOperation cmdlet
+    * Added Test-AzureResourceGroup and Test-AzureResource cmdlets
+    * Refactored Resource Lock cmdlets
+    * Removed unnecessary code when getting a resource
+* Azure SQL Database
+    * Added cmdlets for pause/resume functionality and retrieving restore points for restoring backups:
+        * Suspend-AzureSqlDatabase
+        * Resume-AzureSqlDatabase
+        * Get-AzureSqlDatabaseRestorePoints
+    * Changed cmdlets:
+        * New-AzureSqlDatabase - Can now create Azure Sql Data Warehouse databases
 
 2015.06.05 version 0.9.3
 * Fixed bug in Websites cmdlets related to slots #454

diff --git a/setup/azurecmd.wxs b/setup/azurecmd.wxs
@@ -5,7 +5,7 @@
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="0.9.3" ?>
+  <?define version="0.9.4" ?>
   <?define versionedStartMenuFolder="Microsoft Azure" ?>
   <?define staleStartMenuFolder="Windows Azure" ?>
 

diff --git a/setup/azurecmdfiles.wxi b/setup/azurecmdfiles.wxi
diff --git a/setup/azurepowershell.sln b/setup/azurepowershell.sln
@@ -1,7 +1,8 @@
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 2013
-VisualStudioVersion = 12.0.31101.0
+VisualStudioVersion = 12.0.30110.0
 MinimumVisualStudioVersion = 10.0.40219.1
+
 Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "azurepowershell", "azurepowershell.wixproj", "{36D6E303-E057-4963-A093-C7AAE0FD92B3}"
 	ProjectSection(ProjectDependencies) = postProject
 		{EA5BD11B-10B3-433D-A250-92AE76669D8D} = {EA5BD11B-10B3-433D-A250-92AE76669D8D}
@@ -15,8 +16,10 @@ Global
 		Release|Any CPU = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|x86
-		{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|x86
+		{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{36D6E303-E057-4963-A093-C7AAE0FD92B3}.Release|Any CPU.Build.0 = Release|Any CPU
 		{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{EA5BD11B-10B3-433D-A250-92AE76669D8D}.Release|Any CPU.ActiveCfg = Release|Any CPU

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.9.3";
+        public const string AssemblyVersion = "0.9.4";
 
-        public const string AssemblyFileVersion = "0.9.3";
+        public const string AssemblyFileVersion = "0.9.4";
 
         public const string ProfileFile = "AzureProfile.json";
 

diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj b/src/ResourceManager/Commerce/Commands.UsageAggregates/Commands.UsageAggregates.csproj
@@ -26,11 +26,14 @@
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <DebugType>pdbonly</DebugType>
+    <DefineConstants>TRACE;SIGN</DefineConstants>
     <Optimize>true</Optimize>
     <OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\UsageAggregates</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <SignAssembly>true</SignAssembly>
+    <AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
+    <DelaySign>true</DelaySign>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="Hyak.Common">
@@ -83,6 +86,7 @@
   </ItemGroup>
   <ItemGroup>
     <None Include="Microsoft.Azure.Commands.UsageAggregates.dll-help.psd1" />
+    <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config" />
     <None Include="TestTheCmdLet.ps1" />
   </ItemGroup>

diff --git a/src/ResourceManager/Commerce/Commands.UsageAggregates/MSSharedLibKey.snk b/src/ResourceManager/Commerce/Commands.UsageAggregates/MSSharedLibKey.snk
diff --git a/src/ResourceManager/Network/Commands.Network/Models/PSVirtualNetworkGatewayConnection.cs b/src/ResourceManager/Network/Commands.Network/Models/PSVirtualNetworkGatewayConnection.cs
@@ -35,19 +35,19 @@ public class PSVirtualNetworkGatewayConnection : PSTopLevelResource
         [JsonIgnore]
         public string VirtualNetworkGateway1Text
         {
-            get { return JsonConvert.SerializeObject(VirtualNetworkGateway1, Formatting.Indented); }
+            get { return JsonConvert.SerializeObject(VirtualNetworkGateway1.Id, Formatting.Indented); }
         }
 
         [JsonIgnore]
         public string VirtualNetworkGateway2Text
         {
-            get { return JsonConvert.SerializeObject(VirtualNetworkGateway2, Formatting.Indented); }
+            get { return JsonConvert.SerializeObject(VirtualNetworkGateway2.Id, Formatting.Indented); }
         }
 
         [JsonIgnore]
         public string LocalNetworkGateway2Text
         {
-            get { return JsonConvert.SerializeObject(LocalNetworkGateway2, Formatting.Indented); }
+            get { return JsonConvert.SerializeObject(LocalNetworkGateway2.Id, Formatting.Indented); }
         }
     }
 }
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.9.3'
+ModuleVersion = '0.9.4'
 
 # ID used to uniquely identify this module
 GUID = '81d522a4-6e5d-4105-8f58-376204c47458'

diff --git a/...age/Commands.Management.Storage/Microsoft.Azure.Commands.Management.Storage.dll-Help.psd1 b/...age/Commands.Management.Storage/Microsoft.Azure.Commands.Management.Storage.dll-Help.psd1
@@ -9,7 +9,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '0.9.3'
+ModuleVersion = '0.9.4'
 
 # ID used to uniquely identify this module
 GUID = 'F237EAAA-BD3A-4965-AD4A-BF38598BFEF7'

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.9.3'
+ModuleVersion = '0.9.4'
 
 # 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.9.3'
+ModuleVersion = '0.9.4'
 
 # 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.9.3'
+ModuleVersion = '0.9.4'
 
 # ID used to uniquely identify this module
 GUID = 'e5b10573-30da-456a-9319-4c0a5f8bed4a'

diff --git a/src/ServiceManagement/Network/Commands.Network/Gateway/GetAzureVNetGatewayIPsecParameters.cs b/src/ServiceManagement/Network/Commands.Network/Gateway/GetAzureVNetGatewayIPsecParameters.cs
@@ -22,15 +22,13 @@ namespace Microsoft.WindowsAzure.Commands.ServiceManagement.Network.Gateway
     public class GetAzureVNetGatewayIPsecParameters : NetworkCmdletBase
     {
         [Parameter(Position = 0, Mandatory = true, HelpMessage = "The virtual network name.")]
-        [ValidateGuid]
         [ValidateNotNullOrEmpty]
         public string VNetName
         {
             get; set;
         }
 
         [Parameter(Position = 1, Mandatory = true, HelpMessage = "The local network site name.")]
-        [ValidateGuid]
         [ValidateNotNullOrEmpty]
         public string LocalNetworkSiteName
         {

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.9.3'
+ModuleVersion = '0.9.4'
 
 # ID used to uniquely identify this module
 GUID = 'D48CF693-4125-4D2D-8790-1514F44CE325'