Aligned head and MultiTarget generation

Author: Arlodotexe

GenerateAllSolution.ps1

@@ -7,27 +7,31 @@
 
     Otherwise it is recommended to focus on an individual component's solution instead.
 .PARAMETER IncludeHeads
-    List of TFM based projects to include. This can be 'all', 'uwp', or 'winappsdk'.
+    List of TFM based projects to include. This can be 'all', 'uwp', or 'wasdk'.
 
-    Defaults to 'all' for local-use.
+    Defaults to 'all'.
 .PARAMETER UseDiagnostics
     Add extra diagnostic output to running slngen, such as a binlog, etc...
 .EXAMPLE
-    C:\PS> .\GenerateAllSolution -IncludeHeads winappsdk
+    C:\PS> .\GenerateAllSolution -IncludeHeads wasdk
     Build a solution that doesn't contain UWP projects.
 .NOTES
     Author: Windows Community Toolkit Labs Team
     Date:   April 27, 2022
 #>
 Param (
-    [Parameter(HelpMessage = "The heads to include for building platform samples and tests.", ParameterSetName = "IncludeHeads")]
-    [ValidateSet('all', 'uwp', 'winappsdk')]
-    [string]$IncludeHeads = 'all',
+    [Parameter(HelpMessage = "The heads to include for building the sample gallery and tests.", ParameterSetName = "IncludeHeads")]
+    [ValidateSet('all', 'wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android')]
+    [string[]]$IncludeHeads = @('all'),
 
     [Parameter(HelpMessage = "Add extra diagnostic output to slngen generator.")]
     [switch]$UseDiagnostics = $false
 )
 
+if ($IncludeHeads.Contains('all')) {
+    $IncludeHeads = @('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android')
+}
+
 # Generate required props for "All" solution.
 & ./tooling/MultiTarget/GenerateAllProjectReferences.ps1
 
@@ -55,18 +59,21 @@ $projects = [System.Collections.ArrayList]::new()
 # Common/Dependencies for shared infrastructure
 [void]$projects.Add(".\tooling\CommunityToolkit*\*.*proj")
 
-# App Head and Test Head
-if ($IncludeHeads -ne 'winappsdk')
-{
-    [void]$projects.Add(".\tooling\ProjectHeads\AllComponents\**\*.Uwp.csproj")
-}
+# TODO: this handles separate project heads, but won't directly handle the unified Skia head from Uno.
+# Once we have that, just do a transform on the csproj filename inside this loop to decide the same csproj for those separate MultiTargets.
+foreach ($multitarget in $IncludeHeads) {
+    # capitalize first letter, avoid case sensitivity issues on linux
+    $csprojFileNamePartForMultiTarget = $multitarget.substring(0,1).ToUpper() + $multitarget.Substring(1).ToLower()
 
-if ($IncludeHeads -ne 'uwp')
-{
-    [void]$projects.Add(".\tooling\ProjectHeads\AllComponents\**\*.WinAppSdk.csproj")
-}
+    $path = ".\tooling\ProjectHeads\AllComponents\**\*.$csprojFileNamePartForMultiTarget.csproj";
 
-[void]$projects.Add(".\tooling\ProjectHeads\AllComponents\**\*.Wasm.csproj")
+    if (Test-Path $path) {
+        [void]$projects.Add($path)
+    }
+    else {
+        Write-Warning "No project head could be found at $path for MultiTarget $multitarget. Skipping."
+    }
+}
 
 # Individual projects
 [void]$projects.Add(".\components\**\src\*.csproj")

MultiTarget/UseTargetFrameworks.ps1

@@ -3,29 +3,32 @@
     Changes the target frameworks to build for each package created within the repository.
 .DESCRIPTION
     By default, only the UWP, Windows App SDK, and WASM heads are built to simplify dependencies 
-    needed to build projects within the repository. The CI will enable all targets to build a package
+    needed to build projects within the repository. The CI will enable all include to build a package
     that works on all supported platforms.
     
     Note: Projects which rely on target platforms that are excluded will be unable to build.
-.PARAMETER targets
-    List of targets to set as TFM platforms to build for. Possible values match those provided to the <MultiTarget> MSBuild property, as well as 'all', 'all-uwp', 'all-wasdk', or blank.
-    When run as blank, the defaults (uwp, winappsdk, wasm) will be used.
-    'all', 'all-uwp', and 'all-wasdk' shouldn't be used with other targets or each other.
-.PARAMETER allowGitChanges
-    Enabling this flag will allow changes to the props file to be checked into source control.
-    By default the file is ignored so local changes to building don't accidently get checked in.
+.PARAMETER include
+    List of include to set as TFM platforms to build for. Possible values match those provided to the <MultiTarget> MSBuild property.
+    By default, uwp, wasdk, and wasm will included.
+.PARAMETER exclude
+    List to exclude from build. Possible values match those provided to the <MultiTarget> MSBuild property.
+    By default, none will excluded.
 .EXAMPLE
-    C:\PS> .\UseTargetFrameworks winappsdk
-    Build targets for just the WindowsAppSDK.
+    C:\PS> .\UseTargetFrameworks wasdk
+    Build include for just the WindowsAppSDK.
 .NOTES
     Author: Windows Community Toolkit Labs Team
     Date:   April 8, 2022
 #>
 Param (
     [Parameter(HelpMessage = "The target frameworks to enable.")]
-    [ValidateSet('all', 'all-uwp', 'all-wasdk', 'wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
-    [string[]]$targets = @('uwp', 'winappsdk', 'wasm') # default settings
-)
+    [ValidateSet('all', 'wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
+    [string[]]$include = @('uwp', 'wasdk', 'wasm'), # default settings
+
+    [Parameter(HelpMessage = "The target frameworks to disable.")]
+    [ValidateSet('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
+    [string[]]$exclude = @() # default settings
+)3
 
 $UwpTfm = "UwpTargetFramework";
 $WinAppSdkTfm = "WinAppSdkTargetFramework";
@@ -39,71 +42,67 @@ $NetstandardTfm = "DotnetStandardCommonTargetFramework";
 
 $fileContents = Get-Content -Path $PSScriptRoot/AvailableTargetFrameworks.props
 
-$allTargetFrameworks = @(
-    $WasmTfm,
-    $UwpTfm,
-    $WinAppSdkTfm,
-    $WpfTfm,
-    $GtkTfm,
-    $macOSTfm,
-    $iOSTfm,
-    $DroidTfm,
-    $NetstandardTfm
-);
-
-$desiredTfmValues = @();
-
-if ($targets.Contains("all")) {
-    $desiredTfmValues = $allTargetFrameworks;
+# 'all' represents many '$include' values
+if ($include.Contains("all")) {
+    $include = @('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')
 }
 
-if ($targets.Contains("all-uwp")) {
-    $desiredTfmValues = $allTargetFrameworks.Replace($UwpTfm, "");
+# Exclude as needed
+foreach ($excluded in $exclude) {
+    $include = $include.Where({ $_ -ne $excluded });
 }
 
-if ($targets.Contains("all-wasdk")) {
-    $desiredTfmValues = $allTargetFrameworks.Replace($WinAppSdkTfm, "");
-}
+Write-Output "Setting enabled TargetFrameworks: $include"
+
+$desiredTfmValues = @();
 
-if ($targets.Contains("wasm")) {
+if ($include.Contains("wasm")) {
     $desiredTfmValues += $WasmTfm;
 }
 
-if ($targets.Contains("uwp")) {
+if ($include.Contains("uwp")) {
     $desiredTfmValues += $UwpTfm;
 }
 
-if ($targets.Contains("wasdk")) {
+if ($include.Contains("wasdk")) {
     $desiredTfmValues += $WinAppSdkTfm;
 }
 
-if ($targets.Contains("wpf")) {
+if ($include.Contains("wpf")) {
     $desiredTfmValues += $WpfTfm;
 }
 
-if ($targets.Contains("linuxgtk")) {
+if ($include.Contains("linuxgtk")) {
     $desiredTfmValues += $GtkTfm;
 }
 
-if ($targets.Contains("macos")) {
+if ($include.Contains("macos")) {
     $desiredTfmValues += $macOSTfm;
 }
 
-if ($targets.Contains("ios")) {
+if ($include.Contains("ios")) {
     $desiredTfmValues += $iOSTfm;
 }
 
-if ($targets.Contains("android")) {
+if ($include.Contains("android")) {
     $desiredTfmValues += $DroidTfm;
 }
 
-if ($targets.Contains("netstandard")) {
+if ($include.Contains("netstandard")) {
     $desiredTfmValues += $NetstandardTfm;
 }
 
-Write-Output "Setting enabled TargetFrameworks: $targets"
-
-$targetFrameworksToRemove = $allTargetFrameworks.Where({ -not $desiredTfmValues.Contains($_) })
+$targetFrameworksToRemove = @(
+    $WasmTfm,
+    $UwpTfm,
+    $WinAppSdkTfm,
+    $WpfTfm,
+    $GtkTfm,
+    $macOSTfm,
+    $iOSTfm,
+    $DroidTfm,
+    $NetstandardTfm
+).Where({ -not $desiredTfmValues.Contains($_) })
 
 $targetFrameworksToRemoveRegexPartial = $targetFrameworksToRemove -join "|";