Skip to content

Commit

Permalink
Merge pull request #16 from webmd-health-services/bugfix/packagemanag…
Browse files Browse the repository at this point in the history
…ement-1.4.8.1

Bugfix/packagemanagement 1.4.8.1
  • Loading branch information
splatteredbits authored Aug 4, 2022
2 parents fc70a39 + 5c9e48f commit afaec63
Show file tree
Hide file tree
Showing 5 changed files with 24 additions and 16 deletions.
8 changes: 7 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,9 @@

# 0.5.2

* Adding support for PackageManagement 1.4.8.1.


# 0.5.1

## Fixed
Expand Down Expand Up @@ -106,4 +112,4 @@ fresh repository.

## Fixed

* Module fails to publish to PowerShell Gallery.
* Module fails to publish to PowerShell Gallery.
6 changes: 3 additions & 3 deletions Prism/Functions/Invoke-Prism.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,15 @@ function Invoke-Prism
begin
{
Set-StrictMode -Version 'Latest'
Use-CallerPreference -Cmdlet $PSCmdlet -SessionState $ExecutionContext.SessionState
Use-CallerPreference -Cmdlet $PSCmdlet -SessionState $ExecutionContext.SessionState

$origModulePath = $env:PSModulePath

$pkgMgmtPrefs = Get-PackageManagementPreference

Import-Module -Name 'PackageManagement' `
-MinimumVersion '1.3.2' `
-MaximumVersion '1.4.7' `
-MaximumVersion '1.4.8.1' `
-Global `
-ErrorAction Stop `
@pkgMgmtPrefs
Expand Down Expand Up @@ -175,7 +175,7 @@ function Invoke-Prism

switch( $Command )
{
'install'
'install'
{
$config | Install-PrivateModule
}
Expand Down
2 changes: 1 addition & 1 deletion Prism/Prism.psd1
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
RootModule = 'Prism.psm1'

# Version number of this module.
ModuleVersion = '0.5.1'
ModuleVersion = '0.5.2'

# ID used to uniquely identify this module
GUID = '5b244346-40c9-4a50-a098-8758c19f7f25'
Expand Down
10 changes: 5 additions & 5 deletions Tests/Invoke-Prism.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -45,8 +45,8 @@ BeforeAll {
{
Get-Module -Name 'PackageManagement' |
Where-Object 'Version' -ge ([Version]'1.3.2') |
Where-Object 'Version' -le ([Version]'1.4.7') |
Should -Not -BeNullOrEmpty -Because 'should import PackageManagement 1.3.2 - 1.4.7'
Where-Object 'Version' -le ([Version]'1.4.8.1') |
Should -Not -BeNullOrEmpty -Because 'should import PackageManagement 1.3.2 - 1.4.8.1'

Get-Module -Name 'PowerShellGet' |
Where-Object 'Version' -ge ([Version]'2.0.0') |
Expand All @@ -60,7 +60,7 @@ BeforeAll {
param(
[Parameter(Mandatory)]
[String] $Named,

[Parameter(Mandatory)]
[hashtable[]] $Passing
)
Expand Down Expand Up @@ -170,7 +170,7 @@ BeforeAll {
Mock -CommandName 'Update-ModuleLock' -ModuleName 'Prism'

$WithParameters['Command'] = $Named
try
try
{
if( $WithPipelineInput )
{
Expand All @@ -194,7 +194,7 @@ AfterAll {
}

Describe 'Invoke-Prism' {
BeforeEach {
BeforeEach {
$script:testRoot = $null
$script:moduleList = @()
$script:failed = $false
Expand Down
14 changes: 8 additions & 6 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,10 @@ test: off
environment:
WHISKEY_DISABLE_ERROR_FORMAT: True
matrix:
- job_name: PowerShell 7.2 on Windows
job_group: pwsh
appveyor_build_worker_image: Visual Studio 2022 # Windows Server 2019
# TODO: add back to build once Prism *and* Whiskey support PackageManagement 1.4.8.1.
# - job_name: PowerShell 7.2 on Windows
# job_group: pwsh
# appveyor_build_worker_image: Visual Studio 2022 # Windows Server 2019

- job_name: PowerShell 7.1 on macOS
job_group: pwsh
Expand All @@ -32,9 +33,10 @@ environment:
job_group: pwsh
appveyor_build_worker_image: Visual Studio 2015 # Windows Server 2012R2

- job_name: PowerShell 7.2 on Ubuntu
job_group: pwsh
appveyor_build_worker_image: Ubuntu
# TODO: figure out why builds hang on this platform
# - job_name: PowerShell 7.2 on Ubuntu
# job_group: pwsh
# appveyor_build_worker_image: Ubuntu

- job_name: PowerShell 7.1 on Windows
job_group: pwsh
Expand Down

0 comments on commit afaec63

Please sign in to comment.