diff --git a/tools/Gen2Master/MoveFromGeneration2Master.ps1 b/tools/Gen2Master/MoveFromGeneration2Master.ps1 index d99919817ca2..4e24674b99da 100644 --- a/tools/Gen2Master/MoveFromGeneration2Master.ps1 +++ b/tools/Gen2Master/MoveFromGeneration2Master.ps1 @@ -88,6 +88,10 @@ Function Move-Generation2Master { Copy-Item -Recurse -Path $SourceItem -Destination $DestItem } } + $sourceHelpFolder = Join-Path -Path (Join-Path -Path $SourcePath -ChildPath $submoduleDir.Name) -ChildPath "docs" + $destHelpHolder = Join-Path -Path (Join-Path -Path $DestPath -ChildPath $ModuleName) -ChildPath "help" + Write-Host "Copying help files from $sourceHelpFolder to $destHelpHolder" -ForegroundColor Yellow + Get-ChildItem -Path $sourceHelpFolder -Filter *-*.md | Copy-Item -Destination $destHelpHolder #Region Clean Local Modules $LocalModulesPath = Join-Path -Path (Join-Path -Path (Join-Path -Path $DestPath -ChildPath $submoduleDir.Name) -ChildPath 'generated') -ChildPath 'modules' If (Test-Path $LocalModulesPath) { @@ -130,6 +134,7 @@ Function Move-Generation2Master { } $Psd1Metadata.Remove("PrivateData") } + # Generate csproj file and add the dependency in the solution file Copy-Template -SourceName Az.ModuleName.csproj -DestPath (Join-Path $DestPath $submoduleDir.Name) -DestName "Az.$submoduleName.csproj" -RootModuleName $ModuleName -ModuleName $submoduleName -ModuleFolder $submoduleDir.Name } @@ -176,6 +181,7 @@ Function Move-Generation2Master { $psd1Data.RequiredAssemblies = $psd1Data.RequiredAssemblies | Where-Object { $_ -ne $assemblyToRemove } Update-ModuleManifest -Path $psd1Path -RequiredAssemblies $psd1Data.RequiredAssemblies } + Import-Module $psd1Path Import-Module platyPS $HelpFolder = "$DestPath\$ModuleName$Psd1FolderPostfix\help" @@ -195,7 +201,6 @@ Function Move-Generation2Master { Remove-Item $ExposedHelpFile.FullName } } - Write-Host "$ScriptRoot/../ResolveTools/Resolve-Psd1.ps1" & "$ScriptRoot/../ResolveTools/Resolve-Psd1.ps1" -ModuleName $ModuleName -ArtifactFolder "$DestPath\..\..\artifacts" -Psd1Folder "$DestPath/$ModuleName$Psd1FolderPostfix" } else