Skip to content

Fixed two minor issues - single quote related and uri.tostring related #953

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
Jun 2, 2022
Merged

Fixed two minor issues - single quote related and uri.tostring related #953

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e5b0ae
Fixed two minor issues - single quote related and uri.tostring related
dolauli Jun 2, 2022
53b8761
Revert the change
dolauli Jun 2, 2022
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
3 changes: 2 additions & 1 deletion powershell/resources/psruntime/BuildTime/PsHelpers.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,9 +39,10 @@ public static IEnumerable<CommandInfo> GetModuleCmdlets(params string[] modulePa
public static IEnumerable<FunctionInfo> GetScriptCmdlets(PSCmdlet cmdlet, string scriptFolder)
{
// https://stackoverflow.com/a/40969712/294804
var wrappedFolder = scriptFolder.Contains("'") ? $@"""{scriptFolder}""" : $@"'{scriptFolder}'";
var getCmdletsCommand = $@"
$currentFunctions = Get-ChildItem function:
Get-ChildItem -Path '{scriptFolder}' -Recurse -Include '*.ps1' -File | ForEach-Object {{ . $_.FullName }}
Get-ChildItem -Path {wrappedFolder} -Recurse -Include '*.ps1' -File | ForEach-Object {{ . $_.FullName }}
Get-ChildItem function: | Where-Object {{ ($currentFunctions -notcontains $_) -and $_.CmdletBinding }}
";
return cmdlet?.RunScript<FunctionInfo>(getCmdletsCommand) ?? RunScript<FunctionInfo>(getCmdletsCommand);
Expand Down
2 changes: 1 addition & 1 deletion powershell/resources/runtime/csharp/pipeline/PipelineMocking.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,4 +259,4 @@ public async Task<HttpResponseMessage> SendAsync(HttpRequestMessage request, IEv
}
}
}
}
}