Skip to content

Keep consistent GUID after updating psd1. Fixed issue [#981] #1181

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 1 commit into from
Jun 12, 2023
Merged

Keep consistent GUID after updating psd1. Fixed issue [#981] #1181

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 powershell/resources/psruntime/BuildTime/PsHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ public static IEnumerable<PSObject> GetScriptHelpInfo(params string[] modulePath

public static IEnumerable<CmdletAndHelpInfo> GetModuleCmdletsAndHelpInfo(PSCmdlet cmdlet, params string[] modulePaths)
{
var getCmdletAndHelp = String.Join(" + ", modulePaths.Select(mp =>
var getCmdletAndHelp = String.Join(" + ", modulePaths.Select(mp =>
$@"(Get-Command -Module (Import-Module '{mp}' -PassThru) | Where-Object {{ $_.CommandType -ne 'Alias' }} | ForEach-Object {{ @{{ CommandInfo = $_; HelpInfo = ( invoke-command {{ try {{ Get-Help -Name $_.Name -Full }} catch{{ '' }} }} ) }} }})"
));
return (cmdlet?.RunScript<Hashtable>(getCmdletAndHelp) ?? RunScript<Hashtable>(getCmdletAndHelp))
Expand All @@ -88,7 +88,7 @@ public static Guid ReadGuidFromPsd1(string psd1Path)
if (File.Exists(psd1Path))
{
var currentGuid = File.ReadAllLines(psd1Path)
.FirstOrDefault(l => l.StartsWith(GuidStart))?.Split(new[] { " = " }, StringSplitOptions.RemoveEmptyEntries)
.FirstOrDefault(l => l.TrimStart().StartsWith(GuidStart.TrimStart()))?.Split(new[] { " = " }, StringSplitOptions.RemoveEmptyEntries)
.LastOrDefault()?.Replace("'", String.Empty);
guid = currentGuid != null ? Guid.Parse(currentGuid) : guid;
}
Expand Down