Skip to content
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

Fixed multitarget exclusion preprocessing before UseTargetFrameworks script call #267

Merged
merged 1 commit into from
Mar 3, 2025
Merged

Fixed multitarget exclusion preprocessing before UseTargetFrameworks script call #267

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
35 changes: 18 additions & 17 deletions Build-Toolkit-Components.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
Param (
[ValidateSet('all', 'wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
[Alias("mt")]
[string[]]$MultiTargets = @('uwp', 'wasm'), # default settings
[string[]]$MultiTargets = @('uwp', 'wasm', 'wasdk'), # default settings

[ValidateSet('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
[string[]]$ExcludeMultiTargets = @(), # default settings
Expand Down Expand Up @@ -95,13 +95,6 @@ Param (
[switch]$Verbose
)

# Use the specified MultiTarget TFM and WinUI version
# WinUI 0 indicates non-WinUI projects (e.g. netstandard) should be built.
if ($WinUIMajorVersion -ne 0) {
& $PSScriptRoot\MultiTarget\UseUnoWinUI.ps1 $WinUIMajorVersion
}

& $PSScriptRoot\MultiTarget\UseTargetFrameworks.ps1 -MultiTargets $MultiTargets -ExcludeMultiTargets $ExcludeMultiTargets

if ($MultiTargets -eq 'all') {
$MultiTargets = @('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')
Expand All @@ -114,20 +107,20 @@ if ($null -eq $ExcludeMultiTargets)

# Both uwp and wasdk share a targetframework. Both cannot be enabled at once.
# If both are supplied, remove one based on WinUIMajorVersion.
if ($MultiTargets.Contains('uwp') -and $MultiTargets.Contains('wasdk'))
if ($WinUIMajorVersion -eq 2)
{
if ($WinUIMajorVersion -eq 2)
{
$ExcludeMultiTargets = $ExcludeMultiTargets + 'wasdk'
}
elseif ($WinUIMajorVersion -eq 3)
{
$ExcludeMultiTargets = $ExcludeMultiTargets + 'uwp'
}
$ExcludeMultiTargets = $ExcludeMultiTargets + 'wasdk'
}

if ($WinUIMajorVersion -eq 3)
{
$ExcludeMultiTargets = $ExcludeMultiTargets + 'uwp'
}

$MultiTargets = $MultiTargets | Where-Object { $_ -notin $ExcludeMultiTargets }

Write-Output "Building components '$Components' for MultiTargets: $MultiTargets"

if ($Components -eq @('all')) {
$Components = @('**')
}
Expand All @@ -136,6 +129,14 @@ if ($ExcludeComponents) {
$Components = $Components | Where-Object { $_ -notin $ExcludeComponents }
}

# Use the specified MultiTarget TFM and WinUI version
# WinUI 0 indicates non-WinUI projects (e.g. netstandard) should be built.
if ($WinUIMajorVersion -ne 0) {
& $PSScriptRoot\MultiTarget\UseUnoWinUI.ps1 $WinUIMajorVersion
}

& $PSScriptRoot\MultiTarget\UseTargetFrameworks.ps1 -MultiTargets $MultiTargets -ExcludeMultiTargets $ExcludeMultiTargets

function Invoke-MSBuildWithBinlog {
param (
[string]$TargetHeadPath
Expand Down
Loading