HPF PR: dev <- huangpf:dev

build.proj

@@ -45,13 +45,15 @@
     <Scope Condition=" $(Scope) == '' " >all</Scope>
   </PropertyGroup>
   <ItemGroup>
-    <CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln"
+    <CmdletSolutionsToBuild Include=".\src\ResourceManager\**\*.sln;.\src\ServiceManagement\ServiceManagement.sln;.\src\Storage\Storage.sln"
                             Exclude=".\src\ResourceManager\Intune\*.sln"
                             Condition=" '$(Scope)' == 'all' "/>
     <CmdletSolutionsToBuild Include=".\src\ResourceManager\$(Scope)\*.sln" 
                             Condition=" '$(Scope)' != 'all' and '$(Scope)' != 'ServiceManagement' and '$(Scope)' != 'AzureStorage' "/>
     <CmdletSolutionsToBuild Include=".\src\ServiceManagement\ServiceManagement.sln"
-                            Condition=" '$(Scope)' == 'ServiceManagement' or '$(Scope)' == 'AzureStorage' "/>
+                            Condition=" '$(Scope)' == 'ServiceManagement'"/>
+    <CmdletSolutionsToBuild Include=".\src\Storage\Storage.sln"
+                            Condition=" '$(Scope)' == 'AzureStorage' "/>                            
     <SetupSln Include=".\setup\azurepowershell.sln" />
     <StaticAnalysis Include=".\tools\StaticAnalysis\StaticAnalysis.sln" />
   </ItemGroup>

setup/azurecmd.wxs

@@ -75,7 +75,7 @@
       <Component Id="PSModulePath.System" Guid="273525B9-7AAB-421A-90C8-8E50A1840B8D">
         <CreateFolder />
         <!-- Work around bug that PowerShell does not always consider default module paths. -->
-        <Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager\AzureResourceManager\;[PowerShellFolder]ServiceManagement\" System="yes" />
+        <Environment Id="PSModulePath.SystemAppRoot" Action="set" Name="PSMODULEPATH" Part="last" Value="[BaseModulesFolder];[PowerShellFolder]ResourceManager\AzureResourceManager\;[PowerShellFolder]ServiceManagement\;[PowerShellFolder]\Storage" System="yes" />
      </Component>
     </DirectoryRef>
 

src/Common/Commands.Common.Storage/WindowsAzureSubscriptionExtensions.cs

@@ -30,8 +30,8 @@ public static class WindowsAzureSubscriptionExtensions
         /// <summary>
         /// Get storage account details from the current storage account
         /// </summary>
-        /// <param name="subscription">The subscription continign the account.</param>
-        /// <param name="profile">The profile continaing the subscription.</param>
+        /// <param name="subscription">The subscription containing the account.</param>
+        /// <param name="profile">The profile continuing the subscription.</param>
         /// <returns>Storage account details, usable with the windows azure storage data plane library.</returns>
         public static CloudStorageAccount GetCloudStorageAccount(this AzureSubscription subscription, AzureSMProfile profile)
         {

src/Common/Commands.Common/CmdletExtensions.cs

@@ -12,15 +12,22 @@
 // limitations under the License.
 // ----------------------------------------------------------------------------------
 
+using System;
 using System.Collections.Generic;
 using System.Collections.ObjectModel;
+using System.IO;
 using System.Management.Automation;
 using System.Reflection;
 
 namespace Microsoft.WindowsAzure.Commands.Utilities.Common
 {
     public static class CmdletExtensions
     {
+        public static string AsAbsoluteLocation(this string realtivePath)
+        {
+            return Path.GetFullPath(Path.Combine(AppDomain.CurrentDomain.BaseDirectory, realtivePath));
+        }
+
         public static string TryResolvePath(this PSCmdlet psCmdlet, string path)
         {
             try

src/Common/Commands.ScenarioTests.Common/EnvironmentSetupHelper.cs

@@ -27,6 +27,7 @@
 using System.Management.Automation;
 using System.Security.Cryptography.X509Certificates;
 using Microsoft.Azure.ServiceManagemenet.Common;
+using System.Text;
 
 namespace Microsoft.WindowsAzure.Commands.ScenarioTest
 {
@@ -41,7 +42,7 @@ public class EnvironmentSetupHelper
         private AzureAccount testAccount;
 
         private const string PackageDirectoryFromCommon = @"..\..\..\..\Package\Debug";
-        private const string PackageDirectory = @"..\..\..\..\..\Package\Debug";
+        public const string PackageDirectory = @"..\..\..\..\..\Package\Debug";
 
         protected List<string> modules;
 
@@ -210,11 +211,15 @@ public void SetupModules(AzureModule mode, params string[] modules)
             this.modules = new List<string>();
             if (mode == AzureModule.AzureProfile)
             {
+                this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
+                this.modules.Add(Path.Combine(PackageDirectory, @"Storage\Azure.Storage\Azure.Storage.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
             }
             else if (mode == AzureModule.AzureServiceManagement)
             {
+                this.modules.Add(Path.Combine(PackageDirectory, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
+                this.modules.Add(Path.Combine(PackageDirectory, @"Storage\Azure.Storage\Azure.Storage.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectory, @"ServiceManagement\Azure\Azure.psd1"));
             }
             else if (mode == AzureModule.AzureResourceManager)
@@ -235,11 +240,15 @@ public void SetupModulesFromCommon(AzureModule mode, params string[] modules)
             this.modules = new List<string>();
             if (mode == AzureModule.AzureProfile)
             {
+                this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
+                this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"Storage\Azure.Storage\Azure.Storage.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureResourceManager.psd1"));
             }
             else if (mode == AzureModule.AzureServiceManagement)
             {
+                this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ResourceManager\AzureResourceManager\AzureRM.Profile\AzureRM.Profile.psd1"));
+                this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"Storage\Azure.Storage\Azure.Storage.psd1"));
                 this.modules.Add(Path.Combine(PackageDirectoryFromCommon, @"ServiceManagement\Azure\Azure.psd1"));
             }
             else if (mode == AzureModule.AzureResourceManager)
@@ -263,53 +272,85 @@ public void SetupModules(params string[] modules)
             this.modules.AddRange(modules);
         }
 
+
         public virtual Collection<PSObject> RunPowerShellTest(params string[] scripts)
         {
             using (var powershell = System.Management.Automation.PowerShell.Create(RunspaceMode.NewRunspace))
             {
-               SetupPowerShellModules(powershell);
+                return ExecuteShellTest(powershell, null, scripts);
+            }
+        }
+        public virtual Collection<PSObject> RunPowerShellTest(IEnumerable<string> setupScripts, IEnumerable<string> scripts)
+        {
+            using (var powershell = System.Management.Automation.PowerShell.Create(RunspaceMode.NewRunspace))
+            {
+                return ExecuteShellTest(powershell, setupScripts, scripts);
+            }
+        }
 
-                Collection<PSObject> output = null;
-                for (int i = 0; i < scripts.Length; ++i)
-                {
-                    Console.WriteLine(scripts[i]);
-                    powershell.AddScript(scripts[i]);
-                }
-                try
+        private Collection<PSObject> ExecuteShellTest(
+            System.Management.Automation.PowerShell powershell,
+            IEnumerable<string> setupScripts,
+            IEnumerable<string> scripts)
+        {
+            SetupPowerShellModules(powershell, null);
+
+            Collection<PSObject> output = null;
+
+            foreach (var script in scripts)
+            {
+                Console.WriteLine(script);
+                powershell.AddScript(script);
+            }
+            try
+            {
+                powershell.Runspace.Events.Subscribers.Clear();
+                powershell.Streams.Error.Clear();
+                output = powershell.Invoke();
+
+                if (powershell.Streams.Error.Count > 0)
                 {
-                   powershell.Runspace.Events.Subscribers.Clear();
-                   output = powershell.Invoke();
+                    var sb = new StringBuilder();
 
-                    if (powershell.Streams.Error.Count > 0)
+                    sb.AppendLine("Test failed due to a non-empty error stream, check the error stream in the test log for more details.");
+                    sb.AppendLine(string.Format("{0} total Errors", powershell.Streams.Error.Count));
+                    foreach (var error in powershell.Streams.Error)
                     {
-                        throw new RuntimeException(
-                            "Test failed due to a non-empty error stream, check the error stream in the test log for more details.");
+                        sb.AppendLine(error.Exception.ToString());
                     }
 
-                    return output;
-                }
-                catch (Exception psException)
-                {
-                    powershell.LogPowerShellException(psException);
-                    throw;
-                }
-                finally
-                {
-                    powershell.LogPowerShellResults(output);
-                    powershell.Streams.Error.Clear();
+                    throw new RuntimeException(sb.ToString());
                 }
+
+                return output;
+            }
+            catch (Exception psException)
+            {
+                powershell.LogPowerShellException(psException);
+                throw;
+            }
+            finally
+            {
+                powershell.LogPowerShellResults(output);
+                powershell.Streams.Error.Clear();
             }
         }
 
-        private void SetupPowerShellModules(System.Management.Automation.PowerShell powershell)
+        private void SetupPowerShellModules(System.Management.Automation.PowerShell powershell, IEnumerable<string> setupScripts)
         {
             powershell.AddScript("$error.clear()");
             powershell.AddScript(string.Format("cd \"{0}\"", AppDomain.CurrentDomain.BaseDirectory));
+            if (setupScripts != null)
+            {
+                foreach(var script in setupScripts)
+                {
+                    powershell.AddScript(script);
+                }
+            }
 
             foreach (string moduleName in modules)
             {
-                powershell.AddScript(string.Format("Import-Module \"{0}\"",
-                    Path.Combine(AppDomain.CurrentDomain.BaseDirectory, moduleName)));
+                powershell.AddScript(string.Format("Import-Module \"{0}\"", moduleName.AsAbsoluteLocation()));
             }
 
             powershell.AddScript(

src/ResourceManager/ApiManagement/ApiManagement.sln

@@ -26,7 +26,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Management.Storage
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}"
 EndProject

src/ResourceManager/ApiManagement/AzureRM.ApiManagement.psd1

@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Automation/AzureRM.Automation.psd1

@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/AzureBackup/AzureRM.Backup.psd1

@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/AzureBackup/Commands.AzureBackup.Test/SessionRecords/Microsoft.Azure.Commands.AzureBackup.Test.ScenarioTests.AzureBackupVaultTests/AzureBackupVaultScenarioTests.json

@@ -84,9 +84,6 @@
         "x-ms-client-request-id": [
           "ff97c9dd-5838-4ec9-802a-dc1f5f06a3bf-2015-08-16 19:16:03Z-PS"
         ],
-        "x-ms-version": [
-          "2013-03-01"
-        ],
         "User-Agent": [
           "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
         ]
@@ -148,9 +145,6 @@
         "x-ms-client-request-id": [
           "fd70aa7c-a1db-42ed-8295-5cec7663d72d-2015-08-16 19:16:19Z-PS"
         ],
-        "x-ms-version": [
-          "2013-03-01"
-        ],
         "User-Agent": [
           "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
         ]
@@ -515,9 +509,6 @@
         "x-ms-client-request-id": [
           "43cf16e7-e7a0-4d56-8eb5-66f9ecee0ff4-2015-08-16 19:16:15Z-PS"
         ],
-        "x-ms-version": [
-          "2013-03-01"
-        ],
         "User-Agent": [
           "Microsoft.Azure.Management.BackupServices.BackupVaultServicesManagementClient/0.0.0.0"
         ]

src/ResourceManager/AzureBatch/AzureRM.Batch.psd1

@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/AzureStackAdmin/AzureRM.AzureStackAdmin.psd1

@@ -48,7 +48,7 @@ CLRVersion = '4.0'
 ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
 
 # Assemblies that must be loaded prior to importing this module
 # RequiredAssemblies = @()

src/ResourceManager/AzureStackStorage/AzureRM.AzureStackStorage.psd1

@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.4'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Common/Commands.ScenarioTests.ResourceManager.Common/EnvironmentSetupHelper.cs

@@ -107,7 +107,7 @@ public string RMStorageDataPlaneModule
             get
             {
                 return Path.Combine(this.PackageDirectory,
-                                     @"ResourceManager\AzureResourceManager\Azure.Storage\Azure.Storage.psd1");
+                                     @"Storage\Azure.Storage\Azure.Storage.psd1");
             }
         }
 

src/ResourceManager/Compute/AzureRM.Compute.psd1

@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Compute/Compute.sln

@@ -32,7 +32,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Co
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Resources.Rest", "..\Resources\Commands.ResourceManager\Cmdlets\Commands.Resources.Rest.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Common\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Storage", "..\..\Storage\Commands.Storage\Commands.Storage.csproj", "{08CF7DA7-0392-4A19-B79B-E1FF67CDB81A}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ServiceManagement.Common", "..\..\ServiceManagement\Common\Commands.ServiceManagement.Common\Commands.ServiceManagement.Common.csproj", "{CFF09E81-1E31-444E-B4D4-A21E946C29E2}"
 EndProject

src/ResourceManager/DataFactories/AzureRM.DataFactories.psd1

@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/DataLakeAnalytics/AzureRM.DataLakeAnalytics.psd1

@@ -45,7 +45,7 @@ CLRVersion='4.0'
 ProcessorArchitecture = 'None'  
 
 # Modules that must be imported into the global environment prior to importing this module  
-RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; ModuleVersion = '1.0.5' })
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()