admin/PowerShell-PowerShell
1
0
Fork 0
mirror of https://github.com/PowerShell/PowerShell synced 2026-06-08 12:12:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Fixed failing PackageManagement related tests in daily-builds (#2759)

Browse Source 
- Updated Restore-PSModule function to delete the PSGetModuleInfo.xml so that this file will not be included in the PowerShell release.
- Since PackageManagement module gets installed with PowerShellGet module, removed PackageManagement module name in Restore-PSModule command invocation.
This commit is contained in:
Manikyam Bavandla
2016-11-21 17:36:51 -08:00
committed by Dongbo Wang
parent cac96e5fc9
commit 67e9bf6376
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
build.psm1
+11 -5
View File
@@ -400,12 +400,13 @@ cmd.exe /C cd /d "$location" "&" "$($vcVarsPath)\vcvarsall.bat" "$NativeHostArch
if($PSModuleRestore)
{
# downloading the PackageManagement module
# Downloading the PowerShellGet and PackageManagement modules.
# $Options.Output is pointing to something like "...\src\powershell-win-core\bin\Debug\netcoreapp1.0\win10-x64\publish\powershell.exe",
# so we need to get its parent directory
$publishPath = Split-Path $Options.Output -Parent
log "Restore PowerShell modules to $publishPath"
Restore-PSModule -Name @('PackageManagement','PowerShellGet') -Destination (Join-Path -Path $publishPath -ChildPath "Modules")
log "Restore PowerShell modules to $publishPath"
# PowerShellGet depends on PackageManagement module, so PackageManagement module will be installed with the PowerShellGet module.
Restore-PSModule -Name @('PowerShellGet') -Destination (Join-Path -Path $publishPath -ChildPath "Modules")
}
}
@@ -2627,7 +2628,7 @@ function Restore-PSModule
}
}
log ("Name='{0}', Destination='{1}', Repository='{2}'" -f $Name, $Destination, $RepositoryName)
log ("Name='{0}', Destination='{1}', Repository='{2}'" -f ($Name -join ','), $Destination, $RepositoryName)
$Name | ForEach-Object {
@@ -2643,8 +2644,13 @@ function Restore-PSModule
}
# pull down the module
log "running save-module $Name"
log "running save-module $_"
PowerShellGet\Save-Module @command -Force -Verbose
# Remove PSGetModuleInfo.xml file
Find-Module -Name $_ -Repository $RepositoryName -IncludeDependencies | ForEach-Object {
Get-ChildItem -Path (Join-Path -Path $Destination -ChildPath $_.Name) -Recurse -Depth 2 -File -Include 'PSGetModuleInfo.xml' -Attributes h,a,r | Remove-Item -Force
}
}
# Clean up
test/powershell/Modules/PackageManagement/PackageManagement.Tests.ps1
+2 -2
View File
@@ -40,7 +40,7 @@ Describe "PackageManagement Acceptance Test" -Tags "Feature" {
}
It "install-packageprovider, Expect succeed" {
$ipp = (install-PackageProvider -name gistprovider -force -source $InternalSource).name
$ipp = (install-PackageProvider -name gistprovider -force -source $InternalSource -Scope CurrentUser).name
$ipp -contains "gistprovider" | should be $true
}
@@ -51,7 +51,7 @@ Describe "PackageManagement Acceptance Test" -Tags "Feature" {
}
it "Install-package" {
$i = install-Package -ProviderName NuGet -Name jquery -force -source Nugettest
$i = install-Package -ProviderName NuGet -Name jquery -force -source Nugettest -Scope CurrentUser
$i.Name -contains "jquery" | should be $true
}
test/powershell/engine/Help/UpdatableHelpSystem.Tests.ps1
+2 -2
View File
@@ -103,14 +103,14 @@ $testCases = @{
HelpFiles = "Microsoft.PowerShell.PackageManagement.dll-help.xml"
HelpInfoFiles = "PackageManagement_4ae9fd46-338a-459c-8186-07f910774cb8_HelpInfo.xml"
CompressedFiles = "PackageManagement_4ae9fd46-338a-459c-8186-07f910774cb8_en-US_helpcontent$extension"
HelpInstallationPath = "$pshome\Modules\PackageManagement\en-US"
HelpInstallationPath = "$pshome\Modules\PackageManagement\*\en-US"
}
"PowershellGet" = @{
HelpFiles = "PSGet.psm1-help.xml"
HelpInfoFiles = "PowershellGet_1d73a601-4a6c-43c5-ba3f-619b18bbb404_HelpInfo.xml"
CompressedFiles = "PowershellGet_1d73a601-4a6c-43c5-ba3f-619b18bbb404_en-US_helpcontent$extension"
HelpInstallationPath = "$pshome\Modules\PowershellGet\en-US"
HelpInstallationPath = "$pshome\Modules\PowershellGet\*\en-US"
}
"PSReadline" = @{