Skip to content

Commit 17edd47

Browse files
committed
Revert changes to adaptAutoRestModule script
1 parent e673224 commit 17edd47

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

tools/BuildScripts/AdaptAutorestModule.ps1

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -120,6 +120,7 @@ if (-not (Test-Path (Join-Path $parentModulePath "ChangeLog.md"))) {
120120
$parentModulePsd1Path = Join-Path $parentModulePath "Az.$ModuleRootName.psd1"
121121
Write-Host "Merging metadata of $SubModulePath/Az.$subModuleNameTrimmed.psd1 to $parentModulePsd1Path ..." -ForegroundColor DarkGreen
122122
$parentModuleMetadata = Import-LocalizedData -BaseDirectory $ParentModulePath -FileName "Az.$ModuleRootName.psd1"
123+
123124
$parentModuleMetadata.RequiredAssemblies = (@($parentModuleMetadata.RequiredAssemblies) + "$SubModuleName/bin/Az.$subModuleNameTrimmed.private.dll") | Select-Object -Unique
124125
$parentModuleMetadata.FormatsToProcess = (@($parentModuleMetadata.FormatsToProcess) + "$SubModuleName/Az.$subModuleNameTrimmed.format.ps1xml") | Select-Object -Unique
125126
$parentModuleMetadata.NestedModules = (@($parentModuleMetadata.NestedModules) + "$SubModuleName/Az.$subModuleNameTrimmed.psm1") | Select-Object -Unique
@@ -245,11 +246,7 @@ try{
245246
}
246247
& $resolveScriptPath -ModuleName $ModuleRootName -ArtifactFolder $artifacts -Psd1Folder $parentModulePath
247248
} -ArgumentList $RepoRoot, $ModuleRootName, $parentModuleName, $SubModuleName, $subModuleNameTrimmed
248-
try {
249-
$job | Wait-Job | Receive-Job
250-
} catch {
251-
Write-Warning "Error: $($_.Exception.Message)"
252-
}
249+
$job | Wait-Job | Receive-Job
253250
$job | Remove-Job
254251
} finally {
255252
if (Test-Path $tempCsprojPath) {

0 commit comments

Comments
 (0)