Skip to content

Commit 7e78670

Browse files
authored
Fix the issue of dll conflict between Az.Aks and Pester (#21502)
1 parent 08139d2 commit 7e78670

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

tools/Gen2Master/MoveFromGeneration2Master.ps1

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -352,8 +352,16 @@ Function Move-Generation2MasterHybrid {
352352
[string] $DestPath,
353353
[string] $Psd1FolderPostfix
354354
)
355-
Import-Module "$DestPath\..\..\artifacts\Debug\Az.$ModuleName\Az.$ModuleName.psd1"
356-
Update-MarkdownHelpModule -Path "$DestPath\$ModuleName$Psd1FolderPostfix\help" -RefreshModulePage -AlphabeticParamsOrder -UseFullTypeName -ExcludeDontShow
355+
$psd1Path = "$DestPath\..\..\artifacts\Debug\Az.$ModuleName\Az.$ModuleName.psd1"
356+
$assemblyToRemove = "YamlDotNet.dll"
357+
$psd1Data = Import-PowerShellDataFile -Path $psd1Path
358+
if ($psd1Data.ContainsKey('RequiredAssemblies') -and $psd1Data.RequiredAssemblies -contains $assemblyToRemove) {
359+
$psd1Data.RequiredAssemblies = $psd1Data.RequiredAssemblies | Where-Object { $_ -ne $assemblyToRemove }
360+
Update-ModuleManifest -Path $psd1Path -RequiredAssemblies $psd1Data.RequiredAssemblies
361+
}
362+
Import-Module $psd1Path
363+
Import-Module platyPS
364+
Update-MarkdownHelpModule -Path "$DestPath\$ModuleName$Psd1FolderPostfix\help" -RefreshModulePage -AlphabeticParamsOrder -UseFullTypeName -ExcludeDontShow
357365
} -ArgumentList $ModuleName, $DestPath, $Psd1FolderPostfix
358366

359367
$job | Wait-Job | Receive-Job

0 commit comments

Comments
 (0)