Merge branch 'azurerm-psm1-fix' of github.com:cormacpayne/azure-powershell into netcore-011

Author: markcowl

tools/AzureRM/AzureRM.psd1

@@ -9,7 +9,7 @@
 @{
 
 # Script module or binary module file associated with this manifest.
-RootModule = '.\AzureRM.psm1'
+# RootModule = ''
 
 # Version number of this module.
 ModuleVersion = '5.6.0'
@@ -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'; RequiredVersion = '4.5.0'; }, 
+RequiredModules = @(@{ModuleName = 'AzureRM.Profile'; ModuleVersion = '4.5.0'; }, 
                @{ModuleName = 'Azure.Storage'; RequiredVersion = '4.2.0'; }, 
                @{ModuleName = 'AzureRM.AnalysisServices'; RequiredVersion = '0.6.5'; }, 
                @{ModuleName = 'Azure.AnalysisServices'; RequiredVersion = '0.5.0'; }, 

tools/PublishModules.ps1

@@ -194,6 +194,7 @@ function Change-RMModule
         {
             return
         }
+
         Write-Output "Changing to directory for module modifications $TempRepoPath"
         $moduleVersion = $ModuleMetadata.ModuleVersion.ToString()
         if ($ModuleMetadata.PrivateData.PSData.Prerelease -ne $null)
@@ -218,6 +219,7 @@ function Change-RMModule
             Write-Output "Expanding $zipPath"
             Expand-Archive $zipPath -DestinationPath $dirPath
             Write-Output "Adding PSM1 dependency to $unzippedManifest"
+            Add-PSM1Dependency -Path $unzippedManifest
             Write-Output "Removing module manifest dependencies for $unzippedManifest"
             Remove-ModuleDependencies -Path $unzippedManifest
             Remove-Item -Path $zipPath -Force
@@ -231,6 +233,23 @@ function Change-RMModule
     }
 }
 
+function Add-PSM1Dependency {
+    [CmdletBinding()]
+    param(
+        [string] $Path)
+
+    PROCESS {
+        $file = Get-Item -Path $Path
+        $manifestFile = $file.Name
+        $psm1file = $manifestFile -replace ".psd1", ".psm1"
+        Write-Output "Adding RootModule dependency ($psm1file) to psd1 '$path'"
+        $regex = New-Object System.Text.RegularExpressions.Regex "#\s*RootModule\s*=\s*''"
+        $content = (Get-Content -Path $Path) -join "`r`n"
+        $text = $regex.Replace($content, "RootModule = '$psm1file'")
+        $text | Out-File -FilePath $Path
+    }
+}
+
 function Publish-RMModule 
 {
     [CmdletBinding()]

tools/UpdateModules.ps1

@@ -48,7 +48,7 @@ function Create-ModulePsm1 {
                     $importedModules += Create-MinimumVersionEntry -ModuleName $mod["ModuleName"] -MinimumVersion $mod["ModuleVersion"]
                 }
                 elseif ($mod["RequiredVersion"]) {
-                    $importedModules += "Import-Module " + $mod["ModuleName"] + " -RequiredVersion " + $mod["RequiredVersion"] + "`r`n"
+                    $importedModules += "Import-Module " + $mod["ModuleName"] + " -RequiredVersion " + $mod["RequiredVersion"] + " -Global`r`n"
                 }        
             }
         }
@@ -89,23 +89,9 @@ function Create-ModulePsm1 {
         Write-Host "Writing psm1 manifest to $templateOutputPath"
         $template | Out-File -FilePath $templateOutputPath -Force
         $file = Get-Item -Path $templateOutputPath
-
-        Add-PSM1Dependency -Path $manifestPath
     }
 }
 
-function Add-PSM1Dependency {
-    [CmdletBinding()]
-    param(
-        [string] $Path)
-
-    PROCESS {
-        $file = Get-Item -Path $Path
-        $manifestFile = $file.Name
-        $psm1file = $manifestFile -replace ".psd1", ".psm1"
-        Update-ModuleManifest -Path $Path -RootModule $psm1file
-    }
-}
 
 function Find-CompleterAttribute {
     [CmdletBinding()]