Skip to content

Commit 06aedae

Browse files
committed
Merged PR 9996: Fix ExperimentalFeature list generation
1 parent 29f1c31 commit 06aedae

File tree

1 file changed

+10
-1
lines changed

1 file changed

+10
-1
lines changed

build.psm1

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -490,10 +490,19 @@ Fix steps:
490490
}
491491

492492
# ARM is cross compiled, so we can't run pwsh to enumerate Experimental Features
493-
if ((Test-IsPreview $psVersion) -and -not $Runtime.Contains("arm")) {
493+
if ((Test-IsPreview $psVersion) -and -not $Runtime.Contains("arm") -and -not ($Runtime -like 'fxdependent*')) {
494494
$json = & $publishPath\pwsh -noprofile -command {
495495
$expFeatures = [System.Collections.Generic.List[string]]::new()
496496
Get-ExperimentalFeature | ForEach-Object { $expFeatures.Add($_.Name) }
497+
498+
# Make sure ExperimentalFeatures from modules in PSHome are added
499+
# https://github.com/PowerShell/PowerShell/issues/10550
500+
@("PSDesiredStateConfiguration.InvokeDscResource") | ForEach-Object {
501+
if (!$expFeatures.Contains($_)) {
502+
$expFeatures.Add($_)
503+
}
504+
}
505+
497506
ConvertTo-Json $expFeatures.ToArray()
498507
}
499508

0 commit comments

Comments
 (0)