Merge pull request #462 from Azure/dev

HPF PR: dev <- Azure:dev

Author: huangpf

build.proj

@@ -203,8 +203,6 @@
     <!-- Copying shortcut to be signed -->
     <Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psd1" 
       DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
-    <Copy SourceFiles="$(LibraryRoot)tools\AzureRM\AzureRM.psm1" 
-      DestinationFolder="$(LibrarySourceFolder)\Package\$(Configuration)" />
 
     <ItemGroup>
       <DelaySignedAssembliesToSign Include="$(LibrarySourceFolder)\Package\$(Configuration)\**\Microsoft*Azure*Commands*.dll" />
@@ -258,8 +256,6 @@
     <!-- Copying signed shortcut back -->
     <Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psd1" 
       DestinationFolder="$(LibraryRoot)tools\AzureRM" />
-    <Copy SourceFiles="$(LibrarySourceFolder)\Package\$(Configuration)\AzureRM.psm1" 
-      DestinationFolder="$(LibraryRoot)tools\AzureRM" />
   </Target>
 
   <Target Name="CodeSignInstaller">

src/Common/Commands.Common/AzurePowerShell.cs

@@ -26,9 +26,9 @@ public class AzurePowerShell
 
         public const string AssemblyCopyright = "Copyright © Microsoft";
 
-        public const string AssemblyVersion = "1.0.0";
+        public const string AssemblyVersion = "1.0.5";
 
-        public const string AssemblyFileVersion = "1.0.4";
+        public const string AssemblyFileVersion = "1.0.5";
 
         public const string ProfileFile = "AzureProfile.json";
 

src/Common/Storage/Azure.Storage.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'; ModuleVersion = '1.0.4'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; 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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; 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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; 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'; ModuleVersion = '1.0.4'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; 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'; ModuleVersion = '1.0.4'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.4'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; 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'; ModuleVersion = '1.0.5' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5' })
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/DataLakeStore/AzureRM.DataLakeStore.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'; ModuleVersion = '1.0.5' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5' })
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Dns/AzureRM.Dns.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/HDInsight/AzureRM.HDInsight.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Insights/AzureRM.Insights.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Intune/AzureRM.Intune.psd1

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

src/ResourceManager/KeyVault/AzureRM.KeyVault.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/LogicApp/AzureRM.LogicApp.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'; ModuleVersion = '1.0.5'} )
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'} )
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Network/AzureRM.Network.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = @()

src/ResourceManager/NotificationHubs/AzureRM.NotificationHubs.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'; ModuleVersion = '1.0.5' })
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5' })
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/OperationalInsights/AzureRM.OperationalInsights.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/RecoveryServices/AzureRM.RecoveryServices.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/RedisCache/AzureRM.RedisCache.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Resources/AzureRM.Resources.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/SiteRecovery/AzureRM.SiteRecovery.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Sql/AzureRM.Sql.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Storage/AzureRM.Storage.psd1

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

src/ResourceManager/StreamAnalytics/AzureRM.StreamAnalytics.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Tags/AzureRM.Tags.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/TrafficManager/AzureRM.TrafficManager.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/UsageAggregates/AzureRM.UsageAggregates.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ResourceManager/Websites/AzureRM.Websites.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'; ModuleVersion = '1.0.5'})
+RequiredModules = @( @{ ModuleName = 'AzureRM.Profile'; MaximumVersion = '1.9999.9999.9999'; ModuleVersion = '1.0.5'})
 
 # Assemblies that must be loaded prior to importing this module  
 RequiredAssemblies = @()  

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetAzureSqlDatabaseOperationTests.cs

@@ -53,7 +53,7 @@ public void GetAzureSqlDatabaseOperationWithSqlAuth()
                         (expected, actual) =>
                         {
                             Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
-                            Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
+                            Assert.IsNotNull(actual.UserAgent);
                             switch (expected.Index)
                             {
                                 // Request 0-7: Create and Query $testdb                                                                

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetAzureSqlDatabaseServiceObjectiveTests.cs

@@ -50,7 +50,7 @@ public void GetAzureSqlDatabaseServiceObjectiveWithSqlAuth()
                     (expected, actual) =>
                     {
                         Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
-                        Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
+                        Assert.IsNotNull(actual.UserAgent);
                         switch (expected.Index)
                         {
                             // Request 0-6: Retrieving all (6) ServiceObjectives and DimensionSettings

src/ServiceManagement/Sql/Commands.SqlDatabase.Test/UnitTests/Database/Cmdlet/GetAzureSqlDatabaseTests.cs

@@ -62,7 +62,7 @@ public void GetAzureSqlDatabaseWithSqlAuth()
                     (expected, actual) =>
                     {
                         Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
-                        Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
+                        Assert.IsNotNull(actual.UserAgent);
                         // 0 - 5
                         // Get all databases + ServiceObjective lookup
                         // 6 - 11
@@ -147,7 +147,7 @@ public void GetAzureSqlDatabaseWithSqlAuthByPipe()
                     (expected, actual) =>
                     {
                         Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
-                        Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
+                        Assert.IsNotNull(actual.UserAgent);
                         if (expected.Index < 12)
                         {
                             // Request 0-3: Get all databases + ServiceObjectives requests
@@ -224,7 +224,7 @@ public void GetAzureSqlDatabaseWithSqlAuthNonExistentDb()
                     (expected, actual) =>
                     {
                         Assert.AreEqual(expected.RequestInfo.Method, actual.Method);
-                        Assert.AreEqual(expected.RequestInfo.UserAgent, actual.UserAgent);
+                        Assert.IsNotNull(actual.UserAgent);
                         switch (expected.Index)
                         {
                             // Request 0-2: Get database requests