Fix System32 module path duplication#7414
Merged
daxian-dbw merged 6 commits intoPowerShell:masterfrom Aug 3, 2018
Merged
Conversation
iSazonov
approved these changes
Aug 1, 2018
Collaborator
iSazonov
left a comment
iSazonov
left a comment
There was a problem hiding this comment.
With one minor comment
| pwsh.exe -C '$null = $env:PSModulePath -match ([regex]::Escape((Join-Path $env:windir "System32" "WindowsPowerShell" "v1.0" "Modules"))); $matches.Count' | ||
| } | ||
|
|
||
| $sys32ModPathCount -le 1 | Should -BeTrue |
Collaborator
There was a problem hiding this comment.
Should it always be 1?
We could use Should -BeLessOrEqual.
Collaborator
Author
There was a problem hiding this comment.
Good thought! Will fix
|
Restarted travis-ci test run. |
daxian-dbw
approved these changes
Aug 1, 2018
daxian-dbw
reviewed
Aug 2, 2018
| Restore-ModulePath | ||
| } | ||
|
|
||
| It "Allows Windows PowerShell subprocesses to call `$PSHome modules still" -Skip:(-not $IsWindows) { |
Member
There was a problem hiding this comment.
-Skip:(-not $IsWindows) shouldn't be needed here as you have $PSDefaultParameterValues set at the beginning.
| It "Allows Windows PowerShell subprocesses to call `$PSHome modules still" -Skip:(-not $IsWindows) { | ||
| $errors = powershell.exe -Command "Get-ChildItem" 2>&1 | Where-Object { $_ -is [System.Management.Automation.ErrorRecord] } | ||
| $errors | Should -Be $null | ||
| It "Allows PowerShell Core 6 subprocesses to call core modules" -Skip:(-not $IsWindows) { |
daxian-dbw
approved these changes
Aug 3, 2018
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
PR Summary
Resolves #7327. PowerShell Core subprocesses will only append the System32 module path to the PSModulePath when it is not already present.
PR Checklist
.h,.cpp,.cs,.ps1and.psm1files have the correct copyright headerWIP:to the beginning of the title and remove the prefix when the PR is ready.[feature]if the change is significant or affects feature tests