Skip to content
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

Jump to bottom

Expand-ZipArchive: Compatible with Pscx (was missing tests) #3427

Merged
merged 2 commits into from
May 1, 2019
Merged

Expand-ZipArchive: Compatible with Pscx (was missing tests) #3427

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ef9aa75
qualify which Expand-Archive to use
daveneeley May 1, 2019
d6308d6
Merge branch 'master' into expand-archive-pscx-compat
r15ch13 May 1, 2019
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
Prev Previous commit
Merge branch 'master' into expand-archive-pscx-compat
  • Loading branch information
@r15ch13
r15ch13 authored May 1, 2019
commit d6308d6b59b9fee55e3e1bfad45522ea7a498b35
3 changes: 2 additions & 1 deletion lib/decompress.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -179,7 +179,8 @@ function Expand-ZipArchive {
}
} else {
# Use Expand-Archive to unzip in PowerShell 5+
Microsoft.Powershell.Archive\Expand-Archive -Path $Path -DestinationPath $DestinationPath -Force
# Compatible with Pscx (https://github.com/Pscx/Pscx)
Microsoft.PowerShell.Archive\Expand-Archive -Path $Path -DestinationPath $DestinationPath -Force
}
if ($Removal) {
# Remove original archive file
Expand Down
You are viewing a condensed version of this merge commit. You can view the full changes here.