Skip to content

[Eng] Moving generated content when archive instead of copying #28423

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Aug 20, 2025
+3 −3
Merged

[Eng] Moving generated content when archive instead of copying #28423

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c893c7b
moving generated content from src to generated intead of copying
VeryEarly Aug 20, 2025
48247dd
Merge remote-tracking branch 'origin/main' into yabo/fix-versioncontr…
VeryEarly Aug 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions tools/BuildScripts/BuildScripts.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,12 +167,12 @@ function Update-GeneratedSubModule {
$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/
# Move from src/ to generated/
$fileToUpdate | Foreach-Object {
$moveFrom = Join-Path $SourceDirectory $_
$moveTo = Join-Path $GeneratedDirectory $_
Write-Host "Copying $moveFrom to $moveTo ..." -ForegroundColor Cyan
Copy-Item -Path $moveFrom -Destination $moveTo -Recurse -Force
Write-Host "Moving $moveFrom to $moveTo ..." -ForegroundColor Cyan
Move-Item -Path $moveFrom -Destination $moveTo -Force
Copy link

Copilot AI Aug 20, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The Move-Item operation should include the -Recurse parameter when moving directories to ensure all subdirectories and files are moved properly. The 'generated' item in the $fileToUpdate array appears to be a directory based on the context.

Suggested change
Move-Item -Path $moveFrom -Destination $moveTo -Force
Move-Item -Path $moveFrom -Destination $moveTo -Force -Recurse

Copilot uses AI. Check for mistakes.

Copy link
Collaborator Author

@VeryEarly VeryEarly Aug 20, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

No, Move-Item is recursive by default and there is no parameter -Recurse in Move-Item. Please be smart @copilot

}
$cSubModuleNameTrimmed = $subModuleNameTrimmed
if ($csprojName -match "^Az\.(?<cSubModuleName>\w+)\.csproj$") {
Expand Down
Loading