Skip to content

Commit 8a65ec0

Browse files
committed
Fixed default multitarget values, pass and apply WinUIMajorVersion
1 parent 34e683a commit 8a65ec0

File tree

1 file changed

+9
-7
lines changed

1 file changed

+9
-7
lines changed

GenerateAllSolution.ps1

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@
2020
.PARAMETER ExcludeComponents
2121
The names of the components to exclude when generating solution and project references. Defaults to none.
2222
23+
.PARAMETER WinUIMajorVersion
24+
Specifies the WinUI major version to use when building an Uno head. Also decides the package id and dependency variant. The default value is '2'.
25+
2326
.PARAMETER UseDiagnostics
2427
Add extra diagnostic output to running slngen, such as a binlog, etc...
2528
@@ -32,23 +35,21 @@
3235
Date: April 27, 2022
3336
#>
3437
Param (
35-
[Parameter(HelpMessage = "The heads to include for building the sample gallery and tests.", ParameterSetName = "MultiTargets")]
3638
[ValidateSet('all', 'wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android')]
3739
[Alias("mt")]
38-
[string[]]$MultiTargets = @('all'),
40+
[string[]]$MultiTargets = @('uwp', 'wasm', 'wasdk'),
3941

40-
[Parameter(HelpMessage = "The target frameworks to disable.")]
4142
[ValidateSet('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
42-
[string[]]$ExcludeMultiTargets = @() # default settings
43+
[string[]]$ExcludeMultiTargets = @(), # default settings
4344

44-
[Parameter(HelpMessage = "The names of the components to generate project and solution references for. Defaults to all components.")]
4545
[Alias("c")]
4646
[string[]]$Components = @('all'),
4747

48-
[Parameter(HelpMessage = "The names of the components to exclude when generating solution and project references.")]
48+
[Alias("winui")]
49+
[int]$WinUIMajorVersion = 2,
50+
4951
[string[]]$ExcludeComponents,
5052

51-
[Parameter(HelpMessage = "Add extra diagnostic output to slngen generator.")]
5253
[switch]$UseDiagnostics = $false
5354
)
5455

@@ -66,6 +67,7 @@ $MultiTargets = $MultiTargets | Where-Object { $_ -notin $ExcludeMultiTargets }
6667
# Generate required props for "All" solution.
6768
& ./tooling/MultiTarget/GenerateAllProjectReferences.ps1 -MultiTargets $MultiTargets -Components $Components -ExcludeComponents $ExcludeComponents
6869
& ./tooling/MultiTarget/UseTargetFrameworks.ps1 -MultiTargets $MultiTargets
70+
& ./tooling/MultiTarget/UseUnoWinUI.ps1 $WinUIMajorVersion
6971

7072
# Set up constant values
7173
$generatedSolutionFilePath = 'CommunityToolkit.AllComponents.sln'

0 commit comments

Comments
 (0)