Merge pull request #5865 from cormacpayne/sign-job-fix

Fix issue in sign job where multiple required modules are being used

Author: cormacpayne

build.proj

@@ -254,7 +254,7 @@
 
     <Message Importance="high" Text="Running Static Analyser" />
     <CallTarget targets="DependencyAnalysis" ContinueOnError="ErrorAndContinue" />
-    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 &quot;" />
+    <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CheckAssemblies.ps1 -BuildConfig $(Configuration) &quot;" />
     <Exec Command="&quot;$(PowerShellCommand)&quot; -NonInteractive -NoLogo -NoProfile -Command &quot;. $(LibraryToolsFolder)\CleanupBuild.ps1 -BuildConfig $(Configuration) &quot;" />
   </Target>
 

src/ResourceManager/Aks/AzureRM.Aks.psd1

@@ -51,7 +51,7 @@ CLRVersion = '4.0'
 # ProcessorArchitecture = ''
 
 # Modules that must be imported into the global environment prior to importing this module
-RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.1.1'; })
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.5.0'; })
 
 # Assemblies that must be loaded prior to importing this module
 RequiredAssemblies = '.\YamlDotNet.dll',

src/Storage/Azure.Storage.psd1

@@ -54,7 +54,10 @@ CLRVersion = '4.0'
 RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.5.0'; })
 
 # Assemblies that must be loaded prior to importing this module
-# RequiredAssemblies = @()
+RequiredAssemblies = '.\Microsoft.WindowsAzure.Storage.dll', 
+               '.\Microsoft.WindowsAzure.Storage.DataMovement.dll',  
+               '.\Microsoft.Azure.KeyVault.Core.dll',
+               '.\Microsoft.WindowsAzure.Management.dll'
 
 # Script files (.ps1) that are run in the caller's environment prior to importing this module.
 # ScriptsToProcess = @()

tools/CheckAssemblies.ps1

@@ -11,12 +11,19 @@
     # limitations under the License.
 # ----------------------------------------------------------------------------------
 
+[CmdletBinding()]
+Param
+(
+    [Parameter()]
+    [string]$BuildConfig
+)
+
 $ProjectPaths = @( "$PSScriptRoot\..\src\ResourceManager" )
 $DependencyMapPath = "$PSScriptRoot\..\src\Package\DependencyMap.csv"
 
 $DependencyMap = Import-Csv -Path $DependencyMapPath
 
-$ModuleManifestFiles = $ProjectPaths | % { Get-ChildItem -Path $_ -Filter "*.psd1" -Recurse | where { $_.FullName -notlike "*Debug*" -and `
+$ModuleManifestFiles = $ProjectPaths | % { Get-ChildItem -Path $_ -Filter "*.psd1" -Recurse | where { $_.FullName -notlike "*$BuildConfig*" -and `
                                                                                                                         $_.FullName -notlike "*Netcore*" -and `
                                                                                                                         $_.FullName -notlike "*dll-Help.psd1*" -and `
                                                                                                                         $_.FullName -notlike "*Stack*" } }
@@ -45,14 +52,17 @@ foreach ($ModuleManifest in $ModuleManifestFiles)
             {
                 continue
             }
-            Import-LocalizedData -BindingVariable ModuleMetadata -BaseDirectory $RequiredModuleManifest.DirectoryName -FileName $RequiredModuleManifest.Name
 
-            if ($ModuleMetadata.RequiredAssemblies.Count -gt 0)
-            {
-                $LoadedAssemblies += $ModuleMetadata.RequiredAssemblies
-            }
+            $RequiredModuleManifest | % {
+                Import-LocalizedData -BindingVariable ModuleMetadata -BaseDirectory $_.DirectoryName -FileName $_.Name
 
-            $LoadedAssemblies += $ModuleMetadata.NestedModules
+                if ($ModuleMetadata.RequiredAssemblies.Count -gt 0)
+                {
+                    $LoadedAssemblies += $ModuleMetadata.RequiredAssemblies
+                }
+                
+                $LoadedAssemblies += $ModuleMetadata.NestedModules
+            }
         }
     }
 
@@ -73,4 +83,4 @@ foreach ($ModuleManifest in $ModuleManifestFiles)
     {
         throw
     }
-}
+}