Merge pull request Azure#20 from huangpf/crp2

Crp2

Author: AzureRT

AzurePowershell.Test.targets

@@ -22,8 +22,8 @@
     <SqlDatabaseTestDebug>.\src\ServiceManagement\Sql\Commands.SqlDatabase.Test\bin\Debug\Microsoft.WindowsAzure.Commands.SqlDatabase.Test.dll</SqlDatabaseTestDebug>
     <HDInsightTestDebug>.\src\ServiceManagement\HDInsight\Commands.HDInsight.Test\bin\Debug\Microsoft.WindowsAzure.Commands.HDInsight.Test.dll</HDInsightTestDebug>
     <StorageTestDebug>.\src\ServiceManagement\Storage\Commands.Storage.Test\bin\Debug\Microsoft.WindowsAzure.Commands.Storage.Test.dll</StorageTestDebug>
+    <TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain&#x26;!Network&#x26;!AzureRTUpload"</TestFilter>
     <KeyVaultTestDebug>.\src\ResourceManager\KeyVault\Commands.KeyVault.Test\bin\Debug\Microsoft.Azure.Commands.KeyVault.Test.dll</KeyVaultTestDebug>
-    <TestFilter>"!Functional&#x26;!Scenario&#x26;!AzureRTScenario&#x26;!Sequential&#x26;!PIRTest&#x26;!Preview&#x26;!ADDomain"</TestFilter>
     <ScenarioTestFilter>All</ScenarioTestFilter>
     <OneSDKCITFilter>"OneSDK&#x26;CIT"</OneSDKCITFilter>
     <AzureRTAllTestFilter>"Functional|AzureRTScenario"</AzureRTAllTestFilter>
@@ -240,6 +240,24 @@
       ContinueOnError="true" />
   </Target>
 
+  <Target Name="AzureRTNetwork" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+    <Message Importance="high" Text="Running AzureRT all tests..." />
+
+    <Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
+    <Exec
+      Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:Network /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
+      ContinueOnError="false" />
+  </Target>
+
+  <Target Name="AzureRTUploadSeq" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+    <Message Importance="high" Text="Running AzureRT all tests..." />
+
+    <Delete Files="$(TestOutputDirectory)\RTSequentialDebug.trx" />
+    <Exec
+      Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(TestSettings) /category:AzureRTUpload|Sequential /resultsfile:$(TestOutputDirectory)\RTSequentialDebug.trx"
+      ContinueOnError="false" />
+  </Target>
+
   <Target Name="AzureRTPar" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT all tests..." />
 
@@ -249,6 +267,24 @@
       ContinueOnError="false" />
   </Target>
 
+  <Target Name="AzureRTFuntional" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+    <Message Importance="high" Text="Running AzureRT Funtional tests..." />
+
+    <Delete Files="$(TestOutputDirectory)\RTFuntionalDebug.trx" />
+    <Exec
+      Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:Functional /resultsfile:$(TestOutputDirectory)\RTFuntionalDebug.trx"
+      ContinueOnError="false" />
+  </Target>
+
+  <Target Name="AzureRTScenario" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
+    <Message Importance="high" Text="Running AzureRT Scenario tests..." />
+
+    <Delete Files="$(TestOutputDirectory)\RTScenarioDebug.trx" />
+    <Exec
+      Command="MSTest.exe /testcontainer:$(AzureRTTestContainer) /testsettings:$(AzureRTTestSettings) /category:AzureRTScenario /resultsfile:$(TestOutputDirectory)\RTScenarioDebug.trx"
+      ContinueOnError="false" />
+  </Target>
+
   <Target Name="AzureRTAllPreview" DependsOnTargets="Clean;BuildDebug;BeforeRunTests">
     <Message Importance="high" Text="Running AzureRT all tests..." />
     <Delete Files="$(TestOutputDirectory)\RTAddVhdDebug.trx" />

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

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

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>

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

src/ResourceManager/Compute/Commands.Compute.Test/ScenarioTests/VirtualMachineTests.ps1

@@ -130,6 +130,7 @@ function Test-VirtualMachine
         Assert-AreEqual $vm2.OSProfile.AdminUsername $user;
         Assert-AreEqual $vm2.OSProfile.ComputerName $computerName;
         Assert-AreEqual $vm2.HardwareProfile.VirtualMachineSize $vmsize;
+        Assert-NotNull $vm2.Location;
 
         $vms = Get-AzureVM -ResourceGroupName $rgname;
         Assert-AreNotEqual $vms $null;

src/ResourceManager/Compute/Commands.Compute/Microsoft.Azure.Commands.Compute.Types.ps1xml

@@ -11,6 +11,7 @@
             <ReferencedProperties>
               <Name>ResourceGroupName</Name>
               <Name>Name</Name>
+              <Name>Location</Name>
               <Name>VMSize</Name>
               <Name>Tags</Name>
               <Name>AvailabilitySetId</Name>

src/ResourceManager/Compute/Commands.Compute/Models/PSVirtualMachine.cs

@@ -25,6 +25,8 @@ public class PSVirtualMachine
 
         public string Name { get; set; }
 
+        public string Location { get; set; }
+
         public string VMSize
         {
             get
@@ -150,6 +152,7 @@ public static PSVirtualMachine ToPSVirtualMachine(this VirtualMachine virtualMac
             {
                 ResourceGroupName = rgName,
                 Name = virtualMachine == null ? null : virtualMachine.Name,
+                Location = virtualMachine == null ? null : virtualMachine.Location,
                 ProvisioningState = virtualMachine.VirtualMachineProperties.ProvisioningState,
                 Tags = virtualMachine.Tags,
                 Resources = virtualMachine.VirtualMachineSubResources,

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Config/AddAzureVMDataDiskCommand.cs

@@ -64,7 +64,7 @@ public class AddAzureVMDataDiskCommand : AzurePSCmdlet
         public string Caching { get; set; }
 
         [Parameter(
-            Mandatory = false,
+            Mandatory = true,
             Position = 4,
             ValueFromPipelineByPropertyName = true,
             HelpMessage = HelpMessages.VMDataDiskSizeInGB)]
@@ -99,7 +99,7 @@ public override void ExecuteCmdlet()
                 Caching = this.Caching,
                 DiskSizeGB = this.DiskSizeInGB,
                 Lun = this.Lun == null ? 0 : this.Lun.Value,
-                VirtualHardDisk = new VirtualHardDisk
+                VirtualHardDisk = this.VhdUri == null ? null : new VirtualHardDisk
                 {
                     Uri = this.VhdUri.ToString()
                 }

src/ResourceManager/Compute/Commands.Compute/VirtualMachine/Operation/NewAzureVMCommand.cs

@@ -82,7 +82,7 @@ public override void ExecuteCmdlet()
                 VirtualMachine = new VirtualMachine
                 {
                     VirtualMachineProperties = vmProps,
-                    Location = this.Location,
+                    Location = !string.IsNullOrEmpty(this.Location) ? this.Location : this.VM.Location,
                     Name = !string.IsNullOrEmpty(this.Name) ? this.Name : this.VM.Name
                 }
             };