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

Author: yoavrubin

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 - June 2015" ?>
+  <?define productName="Microsoft Azure PowerShell - July 2015" ?>
   <?define sourceDir="$(var.SolutionDir)..\src\Package\$(var.Configuration)" ?>
   <?define caSourceDir="$(var.SolutionDir)setup\bin\$(var.Configuration)" ?>
 
-  <?define version="0.9.4" ?>
+  <?define version="0.9.5" ?>
   <?define versionedStartMenuFolder="Microsoft Azure" ?>
   <?define staleStartMenuFolder="Windows Azure" ?>
 

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

src/Common/Commands.ScenarioTest/Resources/ServiceManagement/ServiceManagementTests.ps1

@@ -123,10 +123,6 @@ function Run-StartAndStopMultipleVirtualMachinesTest
         Start-AzureVM -ServiceName $svcName -VM $vmList[0];
         Start-AzureVM -ServiceName $svcName -VM $vmList[0],$vmList[1];
         Start-AzureVM -ServiceName $svcName -VM $vmList;
-    }
-    catch
-    {
-
     }
     finally
     {

src/Common/Commands.ScenarioTest/SessionRecords/Microsoft.WindowsAzure.Commands.ScenarioTest.ServiceManagementTests/RunStartAndStopMultipleVirtualMachinesTest.json

@@ -9,7 +9,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '0.9.4'
+ModuleVersion = '0.9.5'
 
 # ID used to uniquely identify this module
 GUID = '81d522a4-6e5d-4105-8f58-376204c47458'

src/ResourceManager/Resources/Commands.Resources/AzureResourceManager.psd1

@@ -9,7 +9,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '0.9.4'
+ModuleVersion = '0.9.5'
 
 # ID used to uniquely identify this module
 GUID = 'F237EAAA-BD3A-4965-AD4A-BF38598BFEF7'

src/ResourceManager/Storage/Commands.Management.Storage/Microsoft.Azure.Commands.Management.Storage.dll-Help.psd1

@@ -12,7 +12,7 @@
 ModuleToProcess = '.\Microsoft.WindowsAzure.Commands.ServiceManagement.PlatformImageRepository.dll'
 
 # Version number of this module.
-ModuleVersion = '0.9.4'
+ModuleVersion = '0.9.5'
 
 # ID used to uniquely identify this module
 GUID = 'a9343cbd-175c-4f72-90c7-2abe9b300644'

src/ServiceManagement/Compute/Commands.ServiceManagement.PlatformImageRepository/PIR.psd1

@@ -12,7 +12,7 @@
 ModuleToProcess = '.\Microsoft.WindowsAzure.Commands.ServiceManagement.Preview.dll'
 
 # Version number of this module.
-ModuleVersion = '0.9.4'
+ModuleVersion = '0.9.5'
 
 # ID used to uniquely identify this module
 GUID = '1C72E555-E83F-45E4-AED2-AF3278828DCD'

src/ServiceManagement/Compute/Commands.ServiceManagement.Preview/AzurePreview.psd1

@@ -294,7 +294,9 @@ public static void SetTestSettings()
 
         protected void StartTest(string testname, DateTime testStartTime)
         {
-            Console.WriteLine("{0} test starts at {1}", testname, testStartTime);
+            string subId = defaultAzureSubscription.SubscriptionId;
+            string endPoint = defaultAzureSubscription.ServiceEndpoint;
+            Console.WriteLine("{0} test starts at {1} for subscription {2} and endpoint {3}", testname, testStartTime, subId, endPoint);
         }
 
         private static void Retry(string cmdlet, string message, int maxTry = 1, int intervalSecond = 10)

src/ServiceManagement/Compute/Commands.ServiceManagement.Test/FunctionalTests/ServiceManagementTest.cs

@@ -34,7 +34,7 @@ public class StartAzureVMCommand : IaaSDeploymentManagementCmdletBase
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The Virtual Machine to restart.", ParameterSetName = "Input")]
         [ValidateNotNullOrEmpty]
         [Alias("InputObject")]
-        public PersistentVM[] VM { get; set; }
+        public IPersistentVM[] VM { get; set; }
 
         protected override void ExecuteCommand()
         {
@@ -47,7 +47,7 @@ protected override void ExecuteCommand()
                 return;
             }
 
-            string[] inputRoleNames = (this.ParameterSetName == "ByName") ? this.Name : this.VM.Select(vm => vm.RoleName).ToArray();
+            string[] inputRoleNames = (this.ParameterSetName == "ByName") ? this.Name : this.VM.Select(vm => vm.GetInstance().RoleName).ToArray();
 
             // Generate a list of role names matching wildcard patterns or
             // the exact name specified in the -Name parameter.

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/StartAzureVM.cs

@@ -36,7 +36,7 @@ public class StopAzureVMCommand : IaaSDeploymentManagementCmdletBase
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "The Virtual Machine to restart.", ParameterSetName = "Input")]
         [ValidateNotNullOrEmpty]
         [Alias("InputObject")]
-        public Model.PersistentVM[] VM { get; set; }
+        public Model.IPersistentVM[] VM { get; set; }
 
         [Parameter(Position = 2, HelpMessage = "Keeps the VM provisioned")]
         public SwitchParameter StayProvisioned { get; set; }
@@ -54,7 +54,7 @@ protected override void ExecuteCommand()
                 return;
             }
 
-            string[] inputRoleNames = (this.ParameterSetName == "ByName") ? this.Name : this.VM.Select(vm => vm.RoleName).ToArray();
+            string[] inputRoleNames = (this.ParameterSetName == "ByName") ? this.Name : this.VM.Select(vm => vm.GetInstance().RoleName).ToArray();
 
             // Generate a list of role names matching regular expressions or
             // the exact name specified in the -Name parameter.

src/ServiceManagement/Compute/Commands.ServiceManagement/IaaS/PersistentVMs/StopAzureVM.cs

@@ -12,7 +12,7 @@
 ModuleToProcess = '.\Microsoft.WindowsAzure.Commands.ExpressRoute.dll'
 
 # Version number of this module.
-ModuleVersion = '0.9.4'
+ModuleVersion = '0.9.5'
 
 # ID used to uniquely identify this module
 GUID = 'e5b10573-30da-456a-9319-4c0a5f8bed4a'

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRoute.psd1

@@ -9,7 +9,7 @@
 @{
 
 # Version number of this module.
-ModuleVersion = '0.9.4'
+ModuleVersion = '0.9.5'
 
 # ID used to uniquely identify this module
 GUID = 'D48CF693-4125-4D2D-8790-1514F44CE325'