Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -260,7 +260,8 @@
Write-Host "Processing required module [$requiredModuleName]"
$requiredVersion = $group.Group.RequiredVersion | ForEach-Object { [Version]$_ } | Sort-Object -Unique
$minimumVersion = $group.Group.Version | ForEach-Object { [Version]$_ } | Sort-Object -Unique | Select-Object -Last 1
$maximumVersion = $group.Group.MaximumVersion | ForEach-Object { [Version]$_ } | Sort-Object -Unique | Select-Object -First 1
$maximumVersion = $group.Group.MaximumVersion | Sort-Object -Unique | Select-Object -First 1
$maximumVersionBound = if ($maximumVersion -and ($maximumVersion -notmatch '[*]')) { [Version]$maximumVersion } else { $null }
Write-Host "RequiredVersion: [$($requiredVersion -join ', ')]"
Write-Host "ModuleVersion: [$minimumVersion]"
Write-Host "MaximumVersion: [$maximumVersion]"
Expand All @@ -274,17 +275,17 @@
}

if (-not $maximumVersion) {
$maximumVersion = [Version]'9999.9999.9999'
$maximumVersionBound = [Version]'9999.9999.9999'
}

if ($requiredVersion -and ($minimumVersion -gt $requiredVersion)) {
throw 'ModuleVersion is higher than RequiredVersion.'
}

if ($minimumVersion -gt $maximumVersion) {
if ($maximumVersionBound -and ($minimumVersion -gt $maximumVersionBound)) {
throw 'ModuleVersion is higher than MaximumVersion.'
}
if ($requiredVersion -and ($requiredVersion -gt $maximumVersion)) {
if ($requiredVersion -and $maximumVersionBound -and ($requiredVersion -gt $maximumVersionBound)) {
throw 'RequiredVersion is higher than MaximumVersion.'
}

Expand All @@ -294,15 +295,15 @@
ModuleName = $requiredModuleName
RequiredVersion = $requiredVersion
}
} elseif (($minimumVersion -ne [Version]'0.0.0') -or ($maximumVersion -ne [Version]'9999.9999.9999')) {
} elseif (($minimumVersion -ne [Version]'0.0.0') -or ($maximumVersionBound -ne [Version]'9999.9999.9999')) {
Write-Host '[RequiredModules] - ModuleVersion/MaximumVersion'
$uniqueModule = @{
ModuleName = $requiredModuleName
}
if ($minimumVersion -ne [Version]'0.0.0') {
$uniqueModule['ModuleVersion'] = $minimumVersion
}
if ($maximumVersion -ne [Version]'9999.9999.9999') {
if ($maximumVersionBound -ne [Version]'9999.9999.9999') {
$uniqueModule['MaximumVersion'] = $maximumVersion
}
} else {
Expand Down
30 changes: 26 additions & 4 deletions .github/actions/Install-PSModule/src/PSModule/PSModule.psm1
Original file line number Diff line number Diff line change
Expand Up @@ -87,18 +87,40 @@ function Convert-VersionSpec {
[string] $RequiredVersion
)

$maximumVersionIsWildcard = $MaximumVersion -and ($MaximumVersion -match '[*]')
if ($maximumVersionIsWildcard) {
$versionParts = @($MaximumVersion -split '\.')
$wildcardIndex = [Array]::IndexOf($versionParts, '*')
if ($wildcardIndex -lt 0) {
throw "MaximumVersion '$MaximumVersion' contains an unsupported wildcard pattern."
}

if ($wildcardIndex -eq 0) {
throw "MaximumVersion '$MaximumVersion' contains an unsupported wildcard pattern."
}

$upperBoundParts = @(0, 0, 0)
for ($i = 0; $i -lt $wildcardIndex; $i++) {
$upperBoundParts[$i] = [int]$versionParts[$i]
}
$upperBoundParts[$wildcardIndex - 1]++
$MaximumVersion = $upperBoundParts -join '.'
}

if ($RequiredVersion) {
# Use exact match in bracket notation.
return "[$RequiredVersion]"
} elseif ($MinimumVersion -and $MaximumVersion) {
# Both bounds provided; both are inclusive.
return "[$MinimumVersion,$MaximumVersion]"
# Wildcard maximum versions are translated to an exclusive upper bound.
$upperBound = $maximumVersionIsWildcard ? ')' : ']'
return "[$MinimumVersion,$MaximumVersion$upperBound"
} elseif ($MinimumVersion) {
# Only a minimum is provided. Use a minimum-inclusive range.
return "[$MinimumVersion, ]"
} elseif ($MaximumVersion) {
# Only a maximum is provided; lower bound open.
return "(, $MaximumVersion]"
# Only a maximum is provided; lower bound open. Wildcards are exclusive upper bounds.
$upperBound = $maximumVersionIsWildcard ? ')' : ']'
return "(, $MaximumVersion$upperBound"
} else {
return $null
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Requires -Modules Utilities
#Requires -Modules @{ ModuleName = 'PSSemVer'; RequiredVersion = '1.1.4' }
#Requires -Modules @{ ModuleName = 'DynamicParams'; ModuleVersion = '1.1.8' }
#Requires -Modules @{ ModuleName = 'ThreadJob'; ModuleVersion = '1.0.0'; MaximumVersion = '1.*' }
#Requires -Modules @{ ModuleName = 'Store'; ModuleVersion = '0.3.1' }

function Get-PSModuleTest {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Requires -Modules Utilities
#Requires -Modules @{ ModuleName = 'PSSemVer'; RequiredVersion = '1.1.4' }
#Requires -Modules @{ ModuleName = 'DynamicParams'; ModuleVersion = '1.1.8' }
#Requires -Modules @{ ModuleName = 'ThreadJob'; ModuleVersion = '1.0.0'; MaximumVersion = '1.*' }
#Requires -Modules @{ ModuleName = 'Store'; ModuleVersion = '0.3.1' }

function Get-PSModuleTest {
Expand Down
Loading