Update PowerShellGet to install the modules and scripts to proper locations in PowerShell Core on Windows (#2078)
* 1. Update PowerShellGet to install the modules and scripts to proper locations in PowerShell Core on Windows. 2. Added few CI tests for PowerShellGet * Handling the scenario of FullCLR-based PowerShell on Windows.
This commit is contained in:
Manikyam Bavandla
Mike Richmond
parent
eb3fd7ae6c
commit
1e13d7897a
|
|
@ -14,12 +14,13 @@ Microsoft.PowerShell.Core\Set-StrictMode -Version Latest
|
|||
# Check if this is nano server. [System.Runtime.Loader.AssemblyLoadContext] is only available on NanoServer
|
||||
$script:isNanoServer = $null -ne ('System.Runtime.Loader.AssemblyLoadContext' -as [Type])
|
||||
|
||||
function IsInbox { $PSHOME.EndsWith('\WindowsPowerShell\v1.0', [System.StringComparison]::OrdinalIgnoreCase) }
|
||||
function IsWindows { $PSVariable = Get-Variable -Name IsWindows -ErrorAction Ignore; return (-not $PSVariable -or $PSVariable.Value) }
|
||||
function IsLinux { $PSVariable = Get-Variable -Name IsLinux -ErrorAction Ignore; return ($PSVariable -and $PSVariable.Value) }
|
||||
function IsOSX { $PSVariable = Get-Variable -Name IsOSX -ErrorAction Ignore; return ($PSVariable -and $PSVariable.Value) }
|
||||
function IsCoreCLR { $PSVariable = Get-Variable -Name IsCoreCLR -ErrorAction Ignore; return ($PSVariable -and $PSVariable.Value) }
|
||||
|
||||
if(IsWindows)
|
||||
if(IsInbox)
|
||||
{
|
||||
$script:ProgramFilesPSPath = Microsoft.PowerShell.Management\Join-Path -Path $env:ProgramFiles -ChildPath "WindowsPowerShell"
|
||||
}
|
||||
|
|
@ -28,7 +29,7 @@ else
|
|||
$script:ProgramFilesPSPath = $PSHome
|
||||
}
|
||||
|
||||
if(IsWindows)
|
||||
if(IsInbox)
|
||||
{
|
||||
try
|
||||
{
|
||||
|
|
@ -48,6 +49,10 @@ if(IsWindows)
|
|||
Microsoft.PowerShell.Management\Join-Path -Path $env:USERPROFILE -ChildPath "Documents\WindowsPowerShell"
|
||||
}
|
||||
}
|
||||
elseif(IsWindows)
|
||||
{
|
||||
$script:MyDocumentsPSPath = Microsoft.PowerShell.Management\Join-Path -Path $HOME -ChildPath 'Documents\PowerShell'
|
||||
}
|
||||
else
|
||||
{
|
||||
$script:MyDocumentsPSPath = Microsoft.PowerShell.Management\Join-Path -Path $HOME -ChildPath ".local/share/powershell"
|
||||
|
|
|
|||
160
test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
Normal file
160
test/powershell/Modules/PowerShellGet/PowerShellGet.Tests.ps1
Normal file
|
|
@ -0,0 +1,160 @@
|
|||
$RepositoryName = 'INTGallery'
|
||||
$SourceLocation = 'https://dtlgalleryint.cloudapp.net'
|
||||
$RegisteredINTRepo = $false
|
||||
$ContosoServer = 'ContosoServer'
|
||||
$FabrikamServerScript = 'Fabrikam-ServerScript'
|
||||
|
||||
#region Utility functions
|
||||
|
||||
function IsInbox { $PSHOME.EndsWith('\WindowsPowerShell\v1.0', [System.StringComparison]::OrdinalIgnoreCase) }
|
||||
function IsWindows { $PSVariable = Get-Variable -Name IsWindows -ErrorAction Ignore; return (-not $PSVariable -or $PSVariable.Value) }
|
||||
function IsCoreCLR { $PSVariable = Get-Variable -Name IsCoreCLR -ErrorAction Ignore; return ($PSVariable -and $PSVariable.Value) }
|
||||
|
||||
#endregion
|
||||
|
||||
#region Install locations for modules and scripts
|
||||
|
||||
if(IsInbox)
|
||||
{
|
||||
$script:ProgramFilesPSPath = Microsoft.PowerShell.Management\Join-Path -Path $env:ProgramFiles -ChildPath "WindowsPowerShell"
|
||||
}
|
||||
else
|
||||
{
|
||||
$script:ProgramFilesPSPath = $PSHome
|
||||
}
|
||||
|
||||
if(IsInbox)
|
||||
{
|
||||
try
|
||||
{
|
||||
$script:MyDocumentsFolderPath = [Environment]::GetFolderPath("MyDocuments")
|
||||
}
|
||||
catch
|
||||
{
|
||||
$script:MyDocumentsFolderPath = $null
|
||||
}
|
||||
|
||||
$script:MyDocumentsPSPath = if($script:MyDocumentsFolderPath)
|
||||
{
|
||||
Microsoft.PowerShell.Management\Join-Path -Path $script:MyDocumentsFolderPath -ChildPath "WindowsPowerShell"
|
||||
}
|
||||
else
|
||||
{
|
||||
Microsoft.PowerShell.Management\Join-Path -Path $env:USERPROFILE -ChildPath "Documents\WindowsPowerShell"
|
||||
}
|
||||
}
|
||||
elseif(IsWindows)
|
||||
{
|
||||
$script:MyDocumentsPSPath = Microsoft.PowerShell.Management\Join-Path -Path $HOME -ChildPath 'Documents\PowerShell'
|
||||
}
|
||||
else
|
||||
{
|
||||
$script:MyDocumentsPSPath = Microsoft.PowerShell.Management\Join-Path -Path $HOME -ChildPath '.local/share/powershell'
|
||||
}
|
||||
|
||||
$script:ProgramFilesModulesPath = Microsoft.PowerShell.Management\Join-Path -Path $script:ProgramFilesPSPath -ChildPath 'Modules'
|
||||
$script:MyDocumentsModulesPath = Microsoft.PowerShell.Management\Join-Path -Path $script:MyDocumentsPSPath -ChildPath 'Modules'
|
||||
|
||||
$script:ProgramFilesScriptsPath = Microsoft.PowerShell.Management\Join-Path -Path $script:ProgramFilesPSPath -ChildPath 'Scripts'
|
||||
$script:MyDocumentsScriptsPath = Microsoft.PowerShell.Management\Join-Path -Path $script:MyDocumentsPSPath -ChildPath 'Scripts'
|
||||
|
||||
#endregion
|
||||
|
||||
#region Register a test repository
|
||||
|
||||
$repo = Get-PSRepository -ErrorAction SilentlyContinue |
|
||||
Where-Object {$_.SourceLocation.StartsWith($SourceLocation, [System.StringComparison]::OrdinalIgnoreCase)}
|
||||
if($repo)
|
||||
{
|
||||
$RepositoryName = $repo.Name
|
||||
}
|
||||
else
|
||||
{
|
||||
Register-PSRepository -Name $RepositoryName -SourceLocation $SourceLocation -InstallationPolicy Trusted
|
||||
$RegisteredINTRepo = $true
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
Describe "PowerShellGet - Module tests" -tags "CI" {
|
||||
|
||||
BeforeEach {
|
||||
Get-InstalledModule -Name $ContosoServer -AllVersions -ErrorAction SilentlyContinue | Uninstall-Module -Force
|
||||
}
|
||||
|
||||
It "Should find a module correctly" {
|
||||
$psgetModuleInfo = Find-Module -Name $ContosoServer -Repository $RepositoryName
|
||||
$psgetModuleInfo.Name | Should Be $ContosoServer
|
||||
$psgetModuleInfo.Repository | Should Be $RepositoryName
|
||||
}
|
||||
|
||||
It "Should install a module correctly to the required location with default AllUsers scope" {
|
||||
Install-Module -Name $ContosoServer -Repository $RepositoryName
|
||||
$installedModuleInfo = Get-InstalledModule -Name $ContosoServer
|
||||
|
||||
$installedModuleInfo | Should Not Be $null
|
||||
$installedModuleInfo.Name | Should Be $ContosoServer
|
||||
$installedModuleInfo.InstalledLocation.StartsWith($script:programFilesModulesPath, [System.StringComparison]::OrdinalIgnoreCase) | Should Be $true
|
||||
|
||||
$module = Get-Module $ContosoServer -ListAvailable
|
||||
$module.Name | Should be $ContosoServer
|
||||
$module.ModuleBase | Should Be $installedModuleInfo.InstalledLocation
|
||||
}
|
||||
|
||||
It "Should install a module correctly to the required location with CurrentUser scope" {
|
||||
Install-Module -Name $ContosoServer -Repository $RepositoryName -Scope CurrentUser
|
||||
$installedModuleInfo = Get-InstalledModule -Name $ContosoServer
|
||||
|
||||
$installedModuleInfo | Should Not Be $null
|
||||
$installedModuleInfo.Name | Should Be $ContosoServer
|
||||
$installedModuleInfo.InstalledLocation.StartsWith($script:MyDocumentsModulesPath, [System.StringComparison]::OrdinalIgnoreCase) | Should Be $true
|
||||
|
||||
$module = Get-Module $ContosoServer -ListAvailable
|
||||
$module.Name | Should be $ContosoServer
|
||||
$module.ModuleBase | Should Be $installedModuleInfo.InstalledLocation
|
||||
}
|
||||
|
||||
AfterAll {
|
||||
Get-InstalledModule -Name $ContosoServer -AllVersions -ErrorAction SilentlyContinue | Uninstall-Module -Force
|
||||
}
|
||||
}
|
||||
|
||||
Describe "PowerShellGet - Script tests" -tags "CI" {
|
||||
|
||||
BeforeEach {
|
||||
Get-InstalledScript -Name $FabrikamServerScript -ErrorAction SilentlyContinue | Uninstall-Script -Force
|
||||
}
|
||||
|
||||
It "Should find a script correctly" {
|
||||
$psgetScriptInfo = Find-Script -Name $FabrikamServerScript -Repository $RepositoryName
|
||||
$psgetScriptInfo.Name | Should Be $FabrikamServerScript
|
||||
$psgetScriptInfo.Repository | Should Be $RepositoryName
|
||||
}
|
||||
|
||||
It "Should install a script correctly to the required location with default AllUsers scope" {
|
||||
Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -NoPathUpdate
|
||||
$installedScriptInfo = Get-InstalledScript -Name $FabrikamServerScript
|
||||
|
||||
$installedScriptInfo | Should Not Be $null
|
||||
$installedScriptInfo.Name | Should Be $FabrikamServerScript
|
||||
$installedScriptInfo.InstalledLocation.StartsWith($script:ProgramFilesScriptsPath, [System.StringComparison]::OrdinalIgnoreCase) | Should Be $true
|
||||
}
|
||||
|
||||
It "Should install a script correctly to the required location with CurrentUser scope" {
|
||||
Install-Script -Name $FabrikamServerScript -Repository $RepositoryName -Scope CurrentUser -NoPathUpdate
|
||||
$installedScriptInfo = Get-InstalledScript -Name $FabrikamServerScript
|
||||
|
||||
$installedScriptInfo | Should Not Be $null
|
||||
$installedScriptInfo.Name | Should Be $FabrikamServerScript
|
||||
$installedScriptInfo.InstalledLocation.StartsWith($script:MyDocumentsScriptsPath, [System.StringComparison]::OrdinalIgnoreCase) | Should Be $true
|
||||
}
|
||||
|
||||
AfterAll {
|
||||
Get-InstalledScript -Name $FabrikamServerScript -ErrorAction SilentlyContinue | Uninstall-Script -Force
|
||||
}
|
||||
}
|
||||
|
||||
if($RegisteredINTRepo)
|
||||
{
|
||||
Get-PSRepository -Name $RepositoryName -ErrorAction SilentlyContinue | Unregister-PSRepository
|
||||
}
|
||||
Loading…
Reference in a new issue