Skip to content

Commit 11f8b64

Browse files
authored
Merge pull request #271 from CommunityToolkit/fix/slngen/netstandard
Fixed solution generation for netstandard2.0-only projects
2 parents 4e3c95e + 614db2a commit 11f8b64

File tree

1 file changed

+7
-3
lines changed

1 file changed

+7
-3
lines changed

GenerateAllSolution.ps1

+7-3
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
Date: April 27, 2022
3636
#>
3737
Param (
38-
[ValidateSet('all', 'wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android')]
38+
[ValidateSet('all', 'wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')]
3939
[Alias("mt")]
4040
[string[]]$MultiTargets = @('uwp', 'wasm', 'wasdk'),
4141

@@ -54,7 +54,7 @@ Param (
5454
)
5555

5656
if ($MultiTargets.Contains('all')) {
57-
$MultiTargets = @('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android')
57+
$MultiTargets = @('wasm', 'uwp', 'wasdk', 'wpf', 'linuxgtk', 'macos', 'ios', 'android', 'netstandard')
5858
}
5959

6060
if ($null -eq $ExcludeMultiTargets)
@@ -81,8 +81,12 @@ $MultiTargets = $MultiTargets | Where-Object { $_ -notin $ExcludeMultiTargets }
8181
# Generate required props for "All" solution preferences.
8282
& ./tooling/MultiTarget/GenerateAllProjectReferences.ps1 -MultiTargets $MultiTargets -Components $Components -ExcludeComponents $ExcludeComponents
8383
& ./tooling/MultiTarget/UseTargetFrameworks.ps1 -MultiTargets $MultiTargets
84-
& ./tooling/MultiTarget/UseUnoWinUI.ps1 $WinUIMajorVersion
8584

85+
# Use the specified MultiTarget TFM and WinUI version
86+
# WinUI 0 indicates non-WinUI projects (e.g. netstandard) should be built.
87+
if ($WinUIMajorVersion -ne 0) {
88+
& $PSScriptRoot\MultiTarget\UseUnoWinUI.ps1 $WinUIMajorVersion
89+
}
8690
# Set up constant values
8791
$generatedSolutionFilePath = 'CommunityToolkit.AllComponents.sln'
8892
$platforms = 'Any CPU;x64;x86;ARM64'

0 commit comments

Comments
 (0)