Skip to content

Ensure alpine and arm SKUs have powershell.config.json file with experimental features enabled #16823

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
adityapatwardhan merged 10 commits into from
Feb 4, 2022
Merged

Ensure alpine and arm SKUs have powershell.config.json file with experimental features enabled #16823

Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d4811f9
Update build.psm1 to statically get list of experimental features
adityapatwardhan Jan 28, 2022
79a48f8
Update all calls to Start-PSBuild
adityapatwardhan Jan 28, 2022
e0111f9
Fix path to json file
adityapatwardhan Feb 1, 2022
ddea380
Add conditions for preview and RC
adityapatwardhan Feb 1, 2022
bafb88b
Add latest experimental feature
adityapatwardhan Feb 1, 2022
241e178
Remove else block
adityapatwardhan Feb 2, 2022
6a226ff
Always get experimental feature list from json file
adityapatwardhan Feb 4, 2022
4933d40
Remove formatting change
adityapatwardhan Feb 4, 2022
689b7e6
Update build.psm1
adityapatwardhan Feb 4, 2022
9349d03
Make sure windows has config file when there are not experimental fea…
adityapatwardhan Feb 4, 2022
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
43 changes: 18 additions & 25 deletions build.psm1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -619,40 +619,33 @@ Fix steps:

# publish powershell.config.json
$config = @{}
if ($environment.IsWindows) {

if ($Options.Runtime -like "*win*") {
# Execution Policy is only supported on Windows
$config = @{ "Microsoft.PowerShell:ExecutionPolicy" = "RemoteSigned";
"WindowsPowerShellCompatibilityModuleDenyList" = @("PSScheduledJob","BestPractices","UpdateServices") }
"WindowsPowerShellCompatibilityModuleDenyList" = @("PSScheduledJob", "BestPractices", "UpdateServices")
}
}

# When building preview, we want the configuration to enable all experiemental features by default
# ARM is cross compiled, so we can't run pwsh to enumerate Experimental Features
if (-not $SkipExperimentalFeatureGeneration -and
(Test-IsPreview $psVersion) -and
-not (Test-IsReleaseCandidate $psVersion) -and
-not $Runtime.Contains("arm") -and
-not ($Runtime -like 'fxdependent*')) {

$json = & $publishPath\pwsh -noprofile -command {
# Special case for DSC code in PS;
# this experimental feature requires new DSC module that is not inbox,
# so we don't want default DSC use case be broken
[System.Collections.ArrayList] $expFeatures = Get-ExperimentalFeature | Where-Object Name -NE PS7DscSupport | ForEach-Object -MemberName Name

$expFeatures | Out-String | Write-Verbose -Verbose

# Make sure ExperimentalFeatures from modules in PSHome are added
# https://github.com/PowerShell/PowerShell/issues/10550
$ExperimentalFeaturesFromGalleryModulesInPSHome = @()
$ExperimentalFeaturesFromGalleryModulesInPSHome | ForEach-Object {
if (!$expFeatures.Contains($_)) {
$null = $expFeatures.Add($_)
}
}
-not (Test-IsReleaseCandidate $psVersion)
) {

ConvertTo-Json $expFeatures
$ExperimentalFeatureJsonFilePath = if ($Options.Runtime -like "*win*") {
"$PSScriptRoot/experimental-feature-windows.json"
} else {
"$PSScriptRoot/experimental-feature-linux.json"
}

if (-not (Test-Path $ExperimentalFeatureJsonFilePath)) {
throw "ExperimentalFeatureJsonFilePath: $ExperimentalFeatureJsonFilePath does not exist"
}

$json = Get-Content -Raw $ExperimentalFeatureJsonFilePath
$config += @{ ExperimentalFeatures = ([string[]] ($json | ConvertFrom-Json)) }
} else {
Write-Warning -Message "Experimental features are not enabled in powershell.config.json file"
}

if ($config.Count -gt 0) {
Expand Down