Fix for Netcore build cleanup. #5779
Merged
Conversation
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
maddieclayton
approved these changes
Mar 21, 2018
maddieclayton
suggested changes
Mar 21, 2018
Contributor
maddieclayton
left a comment
maddieclayton
left a comment
There was a problem hiding this comment.
Thanks for the fix - just two more places I think the fix belongs.
| $removedDlls | % { Write-Verbose "Removing $($_.Name)"; Remove-Item $_.FullName -Force } | ||
|
|
||
| Write-Verbose "Removing scripts and psd1 in $($RMFolder.FullName)" | ||
| if (Test-Path -Path "$($RMFolder.FullName)\StartupScripts") |
Contributor
There was a problem hiding this comment.
Can you add the change here?
Contributor
Author
There was a problem hiding this comment.
@maddieclayton, I can add the fix here, but it is not required. Test-Path and Get-ChildItem will properly resolve \ and /. The problem is the string comparison when Get-ChildItem returns "/a/cool/path", and we compare it to "/a/cool\path".
Contributor
There was a problem hiding this comment.
Oh no worries then. LGTM
| $scriptName = "$($RMFolder.FullName)\StartupScripts\$($RMFolder.Name.replace('.', ''))Startup.ps1" | ||
| $scriptName = "$($RMFolder.FullName)$([IO.Path]::DirectorySeparatorChar)StartupScripts$([IO.Path]::DirectorySeparatorChar)$($RMFolder.Name.replace('.', ''))Startup.ps1" | ||
| Write-Verbose $scriptName | ||
| $removedScripts = Get-ChildItem -Path "$($RMFolder.FullName)\StartupScripts" -Filter "*.ps1" | where { $_.FullName -ne $scriptName } |
maddieclayton
approved these changes
Mar 21, 2018
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.
Fices path comparison in the cleanup script on Netcore. Otherwise, module PSD1s get deleted.
Description
Checklist
CONTRIBUTING.mdplatyPSmodule