Skip to content
Open
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
4 changes: 3 additions & 1 deletion src/code/PSResourceInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1145,7 +1145,9 @@ public static bool TryConvertFromHashtableForPsd1(
List<Hashtable> requiredModulesHashList = new List<Hashtable>();
if (pkgMetadata.ContainsKey("RequiredModules"))
{
var requiredModules = pkgMetadata["RequiredModules"] as Object[];
// A manifest can specify a single module name or hashtable instead of an array.
var requiredModules = LanguagePrimitives.ConvertTo<object[]>(pkgMetadata["RequiredModules"])
?? Array.Empty<object>();
foreach (Object obj in requiredModules)
{
if (obj != null)
Expand Down
106 changes: 106 additions & 0 deletions test/PSResourceInfo.Tests.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -45,3 +45,109 @@ Describe "Write PSGetModuleInfo xml file" -tags 'CI' {
CheckForExpectedPSGetInfo $newGetInfo
}
}

Describe "Convert local module manifest dependencies" -tags 'CI' {
$testCases = @(
@{
Shape = 'a single hashtable with ModuleVersion'
RequiredModules = @{ ModuleName = 'Test.Dependency'; ModuleVersion = '2.0.0' }
ExpectedNames = @('Test.Dependency')
ExpectedRanges = @('[2.0.0, )')
},
@{
Shape = 'a single hashtable with RequiredVersion'
RequiredModules = @{ ModuleName = 'Test.Dependency'; RequiredVersion = '2.0.0' }
ExpectedNames = @('Test.Dependency')
ExpectedRanges = @('[2.0.0, 2.0.0]')
},
@{
Shape = 'a single hashtable with MaximumVersion'
RequiredModules = @{ ModuleName = 'Test.Dependency'; MaximumVersion = '2.0.0' }
ExpectedNames = @('Test.Dependency')
ExpectedRanges = @('(, 2.0.0]')
},
@{
Shape = 'a single hashtable with a version range'
RequiredModules = @{ ModuleName = 'Test.Dependency'; ModuleVersion = '1.0.0'; MaximumVersion = '2.0.0' }
ExpectedNames = @('Test.Dependency')
ExpectedRanges = @('[1.0.0, 2.0.0]')
},
@{
Shape = 'a single module name'
RequiredModules = 'Test.Dependency'
ExpectedNames = @('Test.Dependency')
ExpectedRanges = @('(, )')
},
@{
Shape = 'an array containing a hashtable'
RequiredModules = @(@{ ModuleName = 'Test.Dependency'; ModuleVersion = '2.0.0' })
ExpectedNames = @('Test.Dependency')
ExpectedRanges = @('[2.0.0, )')
},
@{
Shape = 'an array of module names'
RequiredModules = @('Test.Dependency', 'Test.OtherDependency')
ExpectedNames = @('Test.Dependency', 'Test.OtherDependency')
ExpectedRanges = @('(, )', '(, )')
},
@{
Shape = 'an array mixing module names and hashtables'
RequiredModules = @('Test.Dependency', @{ ModuleName = 'Test.OtherDependency'; ModuleVersion = '2.0.0' })
ExpectedNames = @('Test.Dependency', 'Test.OtherDependency')
ExpectedRanges = @('(, )', '[2.0.0, )')
},
@{
Shape = 'an empty array'
RequiredModules = @()
ExpectedNames = @()
ExpectedRanges = @()
},
@{
Shape = 'null'
RequiredModules = $null
ExpectedNames = @()
ExpectedRanges = @()
},
@{
Shape = 'an array containing null'
RequiredModules = @($null, 'Test.Dependency')
ExpectedNames = @('Test.Dependency')
ExpectedRanges = @('(, )')
},
@{
Shape = 'an omitted RequiredModules entry'
OmitRequiredModules = $true
ExpectedNames = @()
ExpectedRanges = @()
}
)

It "converts RequiredModules specified as <Shape>" -TestCases $testCases {
param($Shape, $RequiredModules, $ExpectedNames, $ExpectedRanges, $OmitRequiredModules)

$repository = [Microsoft.PowerShell.PSResourceGet.UtilClasses.PSRepositoryInfo]::new(
'TestRepository', [uri][string]$TestDrive, 50, $true, $null, 'None', 'Local', $true)
$metadata = @{
Id = 'Test.Module'
ModuleVersion = '1.0.0'
Tags = [string[]]@()
}
if (-not $OmitRequiredModules) {
$metadata['RequiredModules'] = $RequiredModules
}

$resource = $null
$errorMessage = $null
$success = [Microsoft.PowerShell.PSResourceGet.UtilClasses.PSResourceInfo]::TryConvertFromHashtableForPsd1(
$metadata, [ref]$resource, [ref]$errorMessage, $repository)

$success | Should -BeTrue -Because "$Shape is a supported manifest form. $errorMessage"
$errorMessage | Should -BeNullOrEmpty
$resource.Name | Should -BeExactly 'Test.Module'
$resource.Dependencies | Should -HaveCount $ExpectedNames.Count
for ($i = 0; $i -lt $ExpectedNames.Count; $i++) {
$resource.Dependencies[$i].Name | Should -BeExactly $ExpectedNames[$i]
$resource.Dependencies[$i].VersionRange.ToString() | Should -BeExactly $ExpectedRanges[$i]
}
}
}