Add Az.Accounts as required module for psd1 if not exist. (#12723)

wyunchi-ms · web-flow · commit f65c1d3656a3 · 2020-08-24T13:16:56.000+08:00
Co-authored-by: wyunchi-ms &lt;yunwang@microsoft.com&gt;
diff --git a/tools/Gen2Master/MoveFromGeneration2Master.ps1 b/tools/Gen2Master/MoveFromGeneration2Master.ps1
@@ -66,9 +66,12 @@ Function Move-Generation2Master {
         If ($Null -ne $ModuleGuid) {
             $Psd1Metadata.GUID = $ModuleGuid
         }
-        If ($Null -ne $RequiredModule) {
-            $Psd1Metadata.RequiredModules = $RequiredModule
+        If ($Null -eq $RequiredModule) {
+            $AccountsModulePath = [System.IO.Path]::Combine($DestPath, '..', 'Accounts', 'Accounts')
+            $AccountsMetadata = Import-LocalizedData -BaseDirectory $AccountsModulePath -FileName "Az.Accounts.psd1"
+            $RequiredModule = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = $AccountsMetadata.ModuleVersion; })
         }
+        $Psd1Metadata.RequiredModules = $RequiredModule
         If ($Psd1Metadata.FunctionsToExport -Contains "*") {
             $Psd1Metadata.FunctionsToExport = ($Psd1Metadata.FunctionsToExport | Where-Object {$_ -ne "*"})
         }

Original file line number	Diff line number	Diff line change
`@@ -66,9 +66,12 @@ Function Move-Generation2Master {`
`66`	`66`	`If ($Null -ne $ModuleGuid) {`
`67`	`67`	`$Psd1Metadata.GUID = $ModuleGuid`
`68`	`68`	`}`
`69`		`- If ($Null -ne $RequiredModule) {`
`70`		`- $Psd1Metadata.RequiredModules = $RequiredModule`
	`69`	`+ If ($Null -eq $RequiredModule) {`
	`70`	`+ $AccountsModulePath = [System.IO.Path]::Combine($DestPath, '..', 'Accounts', 'Accounts')`
	`71`	`+ $AccountsMetadata = Import-LocalizedData -BaseDirectory $AccountsModulePath -FileName "Az.Accounts.psd1"`
	`72`	`+ $RequiredModule = @(@{ModuleName = 'Az.Accounts'; ModuleVersion = $AccountsMetadata.ModuleVersion; })`
`71`	`73`	`}`
	`74`	`+ $Psd1Metadata.RequiredModules = $RequiredModule`
`72`	`75`	`If ($Psd1Metadata.FunctionsToExport -Contains "*") {`
`73`	`76`	`$Psd1Metadata.FunctionsToExport = ($Psd1Metadata.FunctionsToExport \| Where-Object {$_ -ne "*"})`
`74`	`77`	`}`