From d5bb1766dd384c87e8ba373267100aa263926b8f Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Sat, 5 Jul 2025 16:28:28 +0800 Subject: [PATCH 1/3] fix suffix to match actual file names --- tools/BuildScripts/BuildScripts.psm1 | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/tools/BuildScripts/BuildScripts.psm1 b/tools/BuildScripts/BuildScripts.psm1 index 154a2b2d9338..cce4cedfe8cc 100644 --- a/tools/BuildScripts/BuildScripts.psm1 +++ b/tools/BuildScripts/BuildScripts.psm1 @@ -132,8 +132,9 @@ function Update-GeneratedSubModule { # save guid from psd1 if existed for later use $subModuleNameTrimmed = $SubModuleName.split('.')[-2] - if (Test-Path (Join-Path $GeneratedDirectory "Az.$subModuleNameTrimmed.psd1")) { - $guid = (Import-LocalizedData -BaseDirectory $GeneratedDirectory -FileName "Az.$subModuleNameTrimmed.psd1").GUID + $psd1Name = Get-ChildItem $GeneratedDirectory | Where-Object { $_.Name -match "Az\.${subModuleNameTrimmed}\.psd1" } | Foreach-Object {$_.Name} + if (Test-Path (Join-Path $GeneratedDirectory $psd1Name)) { + $guid = (Import-LocalizedData -BaseDirectory $GeneratedDirectory -FileName $psd1Name).GUID } # clean generated directory before update @@ -160,7 +161,12 @@ function Update-GeneratedSubModule { if (Test-Path $localModulesPath) { Remove-Item -Path $localModulesPath -Recurse -Force } - $fileToUpdate = @('generated', 'resources', "Az.$subModuleNameTrimmed.psd1", "Az.$subModuleNameTrimmed.psm1", "Az.$subModuleNameTrimmed.format.ps1xml", 'exports', 'internal', 'test-module.ps1', 'check-dependencies.ps1') + + $psd1Name = Get-ChildItem $SourceDirectory | Where-Object { $_.Name -match "Az\.${subModuleNameTrimmed}\.psd1" } | Foreach-Object {$_.Name} + $psm1Name = Get-ChildItem $SourceDirectory | Where-Object { $_.Name -match "Az\.${subModuleNameTrimmed}\.psm1" } | Foreach-Object {$_.Name} + $formatName = Get-ChildItem $SourceDirectory | Where-Object { $_.Name -match "Az\.${subModuleNameTrimmed}\.format\.ps1xml" } | Foreach-Object {$_.Name} + $csprojName = Get-ChildItem $SourceDirectory | Where-Object { $_.Name -match "Az\.${subModuleNameTrimmed}\.csproj" } | Foreach-Object {$_.Name} + $fileToUpdate = @('generated', 'resources', $psd1Name, $psm1Name, $formatName, 'exports', 'internal', 'test-module.ps1', 'check-dependencies.ps1') # Copy from src/ to generated/ $fileToUpdate | Foreach-Object { $moveFrom = Join-Path $SourceDirectory $_ @@ -169,13 +175,13 @@ function Update-GeneratedSubModule { Copy-Item -Path $moveFrom -Destination $moveTo -Recurse -Force } # regenerate csproj - New-GeneratedFileFromTemplate -TemplateName 'Az.ModuleName.csproj' -GeneratedFileName "Az.$subModuleNameTrimmed.csproj" -GeneratedDirectory $GeneratedDirectory -ModuleRootName $ModuleRootName -SubModuleName $subModuleNameTrimmed -SubModuleNameFull $SubModuleName + New-GeneratedFileFromTemplate -TemplateName 'Az.ModuleName.csproj' -GeneratedFileName $csprojName -GeneratedDirectory $GeneratedDirectory -ModuleRootName $ModuleRootName -SubModuleName $subModuleNameTrimmed -SubModuleNameFull $SubModuleName # revert guid in psd1 so that no conflict in updating this file if ($guid) { - $psd1Path = Join-Path $GeneratedDirectory "Az.$subModuleNameTrimmed.psd1" + $psd1Path = Join-Path $GeneratedDirectory $psd1Name $psd1Content = Get-Content $psd1Path - $newGuid = (Import-LocalizedData -BaseDirectory $GeneratedDirectory -FileName "Az.$subModuleNameTrimmed.psd1").GUID + $newGuid = (Import-LocalizedData -BaseDirectory $GeneratedDirectory -FileName $psd1Name).GUID $psd1Content -replace $newGuid, $guid | Set-Content $psd1Path -Force } From 04067370beba4024004c9b495e91e65b2ef6ca29 Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Sat, 5 Jul 2025 17:04:58 +0800 Subject: [PATCH 2/3] fix --- tools/BuildScripts/BuildScripts.psm1 | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/BuildScripts/BuildScripts.psm1 b/tools/BuildScripts/BuildScripts.psm1 index cce4cedfe8cc..fd55580ef8bf 100644 --- a/tools/BuildScripts/BuildScripts.psm1 +++ b/tools/BuildScripts/BuildScripts.psm1 @@ -174,8 +174,12 @@ function Update-GeneratedSubModule { Write-Host "Copying $moveFrom to $moveTo ..." -ForegroundColor Cyan Copy-Item -Path $moveFrom -Destination $moveTo -Recurse -Force } + $cSubModuleNameTrimmed = $subModuleNameTrimmed + if ($csprojName -match "^Az\.(?\w+)\.csproj$") { + $cSubModuleNameTrimmed = $Matches["cSubModuleName"] + } # regenerate csproj - New-GeneratedFileFromTemplate -TemplateName 'Az.ModuleName.csproj' -GeneratedFileName $csprojName -GeneratedDirectory $GeneratedDirectory -ModuleRootName $ModuleRootName -SubModuleName $subModuleNameTrimmed -SubModuleNameFull $SubModuleName + New-GeneratedFileFromTemplate -TemplateName 'Az.ModuleName.csproj' -GeneratedFileName $csprojName -GeneratedDirectory $GeneratedDirectory -ModuleRootName $ModuleRootName -SubModuleName $cSubModuleNameTrimmed -SubModuleNameFull $SubModuleName # revert guid in psd1 so that no conflict in updating this file if ($guid) { From 953c8952129e7c3f40bac504e8990a88281c5cc6 Mon Sep 17 00:00:00 2001 From: Yabo Hu Date: Sat, 5 Jul 2025 17:08:13 +0800 Subject: [PATCH 3/3] fix --- tools/BuildScripts/BuildScripts.psm1 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/BuildScripts/BuildScripts.psm1 b/tools/BuildScripts/BuildScripts.psm1 index fd55580ef8bf..fd9b83cf4ee6 100644 --- a/tools/BuildScripts/BuildScripts.psm1 +++ b/tools/BuildScripts/BuildScripts.psm1 @@ -133,7 +133,7 @@ function Update-GeneratedSubModule { # save guid from psd1 if existed for later use $subModuleNameTrimmed = $SubModuleName.split('.')[-2] $psd1Name = Get-ChildItem $GeneratedDirectory | Where-Object { $_.Name -match "Az\.${subModuleNameTrimmed}\.psd1" } | Foreach-Object {$_.Name} - if (Test-Path (Join-Path $GeneratedDirectory $psd1Name)) { + if ($psd1Name -And (Test-Path (Join-Path $GeneratedDirectory $psd1Name))) { $guid = (Import-LocalizedData -BaseDirectory $GeneratedDirectory -FileName $psd1Name).GUID }