Fixed an issue where ExcludeMultiTargets wasn't working as expected

Arlodotexe · Arlodotexe · commit eb7c4426ef1b · 2024-12-23T18:48:19.000-06:00
diff --git a/MultiTarget/UseTargetFrameworks.ps1 b/MultiTarget/UseTargetFrameworks.ps1
@@ -39,13 +39,14 @@ $AllMultiTargets = @('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios',
 # Exclude as needed
 foreach ($excluded in $ExcludeMultiTargets) {
     $MultiTargets = $MultiTargets.Where({ $_ -ne $excluded });
+    $AllMultiTargets = $AllMultiTargets.Where({ $_ -ne $excluded });
 }
 
 Write-Output "Setting enabled MultiTargets: $MultiTargets"
 
 # 'all' represents all available '$MultiTargets' values
 if ($MultiTargets.Contains("all")) {
-    $enabledMultiTargets = @('$(AvailableMultiTargets)')
+    $enabledMultiTargets = $AllMultiTargets -join ";"
 }
 else {
     $enabledMultiTargets = $AllMultiTargets.Where({ $MultiTargets.Contains($_) }) -join ";"

Original file line number	Diff line number	Diff line change
`@@ -39,13 +39,14 @@ $AllMultiTargets = @('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios',`
`39`	`39`	`# Exclude as needed`
`40`	`40`	`foreach ($excluded in $ExcludeMultiTargets) {`
`41`	`41`	`$MultiTargets = $MultiTargets.Where({ $_ -ne $excluded });`
	`42`	`+ $AllMultiTargets = $AllMultiTargets.Where({ $_ -ne $excluded });`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`Write-Output "Setting enabled MultiTargets: $MultiTargets"`
`45`	`46`
`46`	`47`	`# 'all' represents all available '$MultiTargets' values`
`47`	`48`	`if ($MultiTargets.Contains("all")) {`
`48`		`- $enabledMultiTargets = @('$(AvailableMultiTargets)')`
	`49`	`+ $enabledMultiTargets = $AllMultiTargets -join ";"`
`49`	`50`	`}`
`50`	`51`	`else {`
`51`	`52`	`$enabledMultiTargets = $AllMultiTargets.Where({ $MultiTargets.Contains($_) }) -join ";"`