Skip to content

Sync tools code from main branch to generation branch #23807

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
Parent: Client Parity Refresh for New Relic
merged 1 commit into from
Dec 22, 2023
Merged

Sync tools code from main branch to generation branch #23807

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions tools/Gen2Master/MoveFromGeneration2Master.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,7 @@ Function Move-Generation2Master {
New-Item "$DestPath\$ModuleName\Properties" -ItemType Directory
# Copy the assemblyinfo file
Copy-Template -SourceName AssemblyInfo.cs -DestPath "$DestPath\$ModuleName\Properties" -DestName AssemblyInfo.cs -ModuleName $submoduleName

Update-MappingJson $ModuleName
}
# update module page
dotnet build $slnFilePath
Expand Down Expand Up @@ -196,7 +196,7 @@ Function Move-Generation2Master {
}
}
Write-Host "$ScriptRoot/../ResolveTools/Resolve-Psd1.ps1"
& "$ScriptRoot/../ResolveTools/Resolve-Psd1.ps1" -ModuleName $ModuleName -Psd1Folder "$DestPath/$ModuleName$Psd1FolderPostfix"
& "$ScriptRoot/../ResolveTools/Resolve-Psd1.ps1" -ModuleName $ModuleName -ArtifactFolder "$DestPath\..\..\artifacts" -Psd1Folder "$DestPath/$ModuleName$Psd1FolderPostfix"
}
else
{
Expand Down
6 changes: 4 additions & 2 deletions tools/ResolveTools/Resolve-Psd1.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,16 +14,18 @@

# This will resolve the issues in root module psd1 file of every Az module
# ```powershell
# ./tools/ResolveTools/Resolve-Psd1.ps1 -Module ManagedServiceIdentity -Psd1Folder src/ManagedServiceIdentity/ManagedServiceIdentity
# ./tools/ResolveTools/Resolve-Psd1.ps1 -Module ManagedServiceIdentity -ArtifactFolder ./artifacts -Psd1Folder src/ManagedServiceIdentity/ManagedServiceIdentity
# ```

Param(
[Parameter(Mandatory = $true)]
[string] $ModuleName,
[Parameter(Mandatory = $true)]
[string] $ArtifactFolder,
[Parameter(Mandatory = $true)]
[string] $Psd1Folder
)
Import-Module "$PSScriptRoot/../../artifacts/Debug/Az.$ModuleName/Az.$ModuleName.psd1" -Force
Import-Module "$ArtifactFolder/Debug/Az.$ModuleName/Az.$ModuleName.psd1" -Force
$HelpFolder = "$Psd1Folder/help"
$ModuleMatadata = Get-Module "Az.$ModuleName"

Expand Down