Skip to content

Commit 4afeaef

Browse files
ArlodotexeArlodotexe
committed
Fixed remaining bugs with netstandard support
1 parent 8b4b75b commit 4afeaef

20 files changed

Lines changed: 55 additions & 54 deletions

‎CommunityToolkit.Tooling.SampleGen/ToolkitSampleMetadataGenerator.Documentation.cs‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -245,9 +245,7 @@ public static class ToolkitDocumentRegistry
245245
{{
246246
public static System.Collections.Generic.IEnumerable<{typeof(ToolkitFrontMatter).FullName}> Execute()
247247
{{
248-
{
249-
string.Join("\n ", sampleMetadata.Select(FrontMatterToRegistryCall).ToArray())
250-
}
248+
{string.Join("\n ", sampleMetadata.Select(FrontMatterToRegistryCall).ToArray())}
251249
}}
252250
}}";
253251
}

‎MultiTarget/DefinedConstants.props‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project>
22
<PropertyGroup>
3-
<DefineConstants Condition="'(HasWinUI)' == 'true'">$(DefineConstants);WINUI$(WinUIMajorVersion);</DefineConstants>
3+
<DefineConstants Condition="'$(HasWinUI)' == 'true'">$(DefineConstants);WINUI$(WinUIMajorVersion);</DefineConstants>
44

55
<DefineConstants Condition="'$(IsUno)' == 'true'">$(DefineConstants);HAS_UNO;</DefineConstants>
66
<DefineConstants Condition="'$(IsUwp)' == 'true'">$(DefineConstants);WINDOWS_UWP;NETFX_CORE;</DefineConstants>

‎MultiTarget/Library.props‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,8 @@
1919
<!-- Add platform package dependencies -->
2020
<Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\Netstandard.props" Condition="$(IsNetstandard) == 'true'" />
2121
<Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\Uno.props" Condition="$(IsUno) == 'true'" />
22-
<Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\Windows.props" Condition="$(HasWinUI) == 'true' AND $(IsUno) != 'true'"/>
22+
<Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\Uwp.props" Condition="$(IsUwp) == 'true'"/>
23+
<Import Project="$(ToolingDirectory)\MultiTarget\PackageReferences\WinAppSdk.props" Condition="$(IsWinAppSdk) == 'true'"/>
2324

2425
<!-- Configure WinUI -->
2526
<Import Project="$(ToolingDirectory)\MultiTarget\WinUI.AutoIncludeXamlPages.props" Condition="$(HasWinUI) == 'true'" />

‎MultiTarget/PackageReferences/Uwp.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Include="Microsoft.UI.Xaml" Version="2.7.0" />
4+
<PackageReference Include="System.Collections.Immutable" Version="5.0.0" />
5+
</ItemGroup>
6+
</Project>

‎MultiTarget/PackageReferences/WinAppSdk.props‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
<Project>
2+
<ItemGroup>
3+
<PackageReference Include="Microsoft.WindowsAppSDK" Version="1.3.230331000" />
4+
<PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
5+
</ItemGroup>
6+
</Project>

‎MultiTarget/PackageReferences/Windows.props‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

‎ProjectHeads/AllComponents/Tests.Uwp/CommunityToolkit.Tests.Uwp.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$([MSBuild]::GetPathOfFileAbove(directory.build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(directory.build.props))')" />
44

5-
<Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
65
<PropertyGroup>
76
<IsDeployableHead>true</IsDeployableHead>
87
<IsUno>false</IsUno>
@@ -22,8 +21,10 @@
2221
<IsGtkLib>false</IsGtkLib>
2322
</PropertyGroup>
2423

24+
<Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
2525
<Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
2626
<Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
27+
2728
<Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.Uwp.props" />
2829
<Import Project="$(ToolingDirectory)\ProjectHeads\AllComponents\Tests.Head.AllComponents.props" />
2930

‎ProjectHeads/AllComponents/Tests.WinAppSdk/CommunityToolkit.Tests.WinAppSdk.csproj‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

3-
<Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
43
<PropertyGroup>
54
<IsDeployableHead>true</IsDeployableHead>
65
<IsUno>false</IsUno>
@@ -20,8 +19,10 @@
2019
<IsGtkLib>false</IsGtkLib>
2120
</PropertyGroup>
2221

22+
<Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
2323
<Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
2424
<Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
25+
2526
<Import Project="$(ToolingDirectory)\ProjectHeads\Tests.Head.WinAppSdk.props" />
2627
<Import Project="$(ToolingDirectory)\ProjectHeads\AllComponents\Tests.Head.AllComponents.props" />
2728

‎ProjectHeads/AllComponents/Uwp/CommunityToolkit.App.Uwp.csproj‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,29 +1,30 @@
11
<?xml version="1.0" encoding="utf-8"?>
2-
<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
2+
<Project ToolsVersion="15.0" DefaultTargets="Build"
3+
xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
34
<Import Project="$([MSBuild]::GetPathOfFileAbove(directory.build.props))" Condition="Exists('$([MSBuild]::GetPathOfFileAbove(directory.build.props))')" />
4-
5-
<Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
6-
5+
76
<PropertyGroup>
7+
<IsAllExperimentHead>true</IsAllExperimentHead>
88
<IsDeployableHead>true</IsDeployableHead>
9+
<IsUwp>true</IsUwp>
10+
<IsWinAppSdk>false</IsWinAppSdk>
911
<IsUno>false</IsUno>
1012
<IsWasm>false</IsWasm>
1113
<IsWasmHead>false</IsWasmHead>
1214
<IsWasmLib>false</IsWasmLib>
1315
<IsDroid>false</IsDroid>
1416
<IsMacOS>false</IsMacOS>
1517
<IsiOS>false</IsiOS>
16-
<IsUwp>true</IsUwp>
17-
<IsWinAppSdk>false</IsWinAppSdk>
1818
<IsWpf>false</IsWpf>
1919
<IsWpfHead>false</IsWpfHead>
2020
<IsWpfLib>false</IsWpfLib>
2121
<IsGtk>false</IsGtk>
2222
<IsGtkHead>false</IsGtkHead>
2323
<IsGtkLib>false</IsGtkLib>
24+
<HasWinUI>true</HasWinUI>
2425
</PropertyGroup>
2526

26-
<Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
27+
<Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
2728
<Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
2829
<Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.Uwp.props" />
2930
<Import Project="$(ToolingDirectory)\MultiTarget\Generated\*.props" />

‎ProjectHeads/AllComponents/Wasm/CommunityToolkit.App.Wasm.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web" TreatAsLocalProperty="TargetFramework">
22

3-
<Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
43
<PropertyGroup>
4+
<IsAllExperimentHead>true</IsAllExperimentHead>
55
<IsDeployableHead>true</IsDeployableHead>
66
<IsUno>true</IsUno>
77
<IsWasm>true</IsWasm>
@@ -20,7 +20,7 @@
2020
<IsGtkLib>false</IsGtkLib>
2121
</PropertyGroup>
2222

23-
<Import Project="$(ToolingDirectory)\MultiTarget\ProjectIdentifiers.props" />
23+
<Import Project="$(ToolingDirectory)\MultiTarget\EnabledTargetFrameworks.props" />
2424
<Import Project="$(ToolingDirectory)\MultiTarget\DefinedConstants.props" />
2525
<Import Project="$(ToolingDirectory)\MultiTarget\Generated\*.props" />
2626
<Import Project="$(ToolingDirectory)\ProjectHeads\App.Head.Wasm.props" />

0 commit comments

Comments
 (0)