Skip to content

Commit 53f3195

Browse files
committed
Remove Uno workaround, fix TFMs
1 parent f4ec6f5 commit 53f3195

File tree

4 files changed

+13
-10
lines changed

4 files changed

+13
-10
lines changed

components/AppServices/src/CommunityToolkit.AppServices.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,13 @@
88
<PackageId>$(PackageIdPrefix).$(ToolkitComponentName)</PackageId>
99
<HasWindowsUIXaml>false</HasWindowsUIXaml>
1010
<HasWinUI>false</HasWinUI>
11+
<EnableXamlCompilerMismatchedTfmUnoWorkaround>false</EnableXamlCompilerMismatchedTfmUnoWorkaround>
1112

1213
<!--
13-
We also include 'net9.0-windows10.0.19041.0' explicitly for UWP as a workaround for https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/238.
14-
We target 19041 and not 17763 to avoid an issue with NuGet resolving no assemblies due to the empty TFM lib folders for Uno platform (which should be removed).
14+
We also include 'net9.0-windows10.0.17763.0' explicitly for UWP as a workaround for https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/238.
15+
We target 17763 and not 17763 to avoid an issue with NuGet resolving no assemblies due to the empty TFM lib folders for Uno platform (which should be removed).
1516
-->
16-
<UwpTargetFrameworks>uap10.0.17763;net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;</UwpTargetFrameworks>
17+
<UwpTargetFrameworks>uap10.0.17763;net8.0-windows10.0.17763.0;net9.0-windows10.0.17763.0;</UwpTargetFrameworks>
1718
</PropertyGroup>
1819

1920
<!-- Sets this up as a toolkit component's source project -->

components/DependencyPropertyGenerator/src/CommunityToolkit.WinUI.DependencyPropertyGenerator.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
not a UWP library per se. So to support the 17763 SDK, we can just disable the UWP build tools.
1616
-->
1717
<UseUwpTools>false</UseUwpTools>
18+
<EnableXamlCompilerMismatchedTfmUnoWorkaround>false</EnableXamlCompilerMismatchedTfmUnoWorkaround>
1819

1920
<!--
20-
We also include 'net9.0-windows10.0.19041.0' explicitly for UWP as a workaround for https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/238.
21-
We target 19041 and not 17763 to avoid an issue with NuGet resolving no assemblies due to the empty TFM lib folders for Uno platform (which should be removed).
21+
We also include 'net9.0-windows10.0.17763.0' explicitly for UWP as a workaround for https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/238.
22+
We target 17763 and not 17763 to avoid an issue with NuGet resolving no assemblies due to the empty TFM lib folders for Uno platform (which should be removed).
2223
-->
23-
<UwpTargetFrameworks>uap10.0.17763;net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;</UwpTargetFrameworks>
24+
<UwpTargetFrameworks>uap10.0.17763;net8.0-windows10.0.17763.0;net9.0-windows10.0.17763.0;</UwpTargetFrameworks>
2425
</PropertyGroup>
2526

2627
<!-- Sets this up as a toolkit component's source project -->

components/Notifications/src/CommunityToolkit.Notifications.csproj

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,13 @@
1515
<Nullable>disable</Nullable>
1616
<HasWindowsUIXaml>false</HasWindowsUIXaml>
1717
<HasWinUI>false</HasWinUI>
18+
<EnableXamlCompilerMismatchedTfmUnoWorkaround>false</EnableXamlCompilerMismatchedTfmUnoWorkaround>
1819

1920
<!--
20-
We also include 'net9.0-windows10.0.19041.0' explicitly for UWP as a workaround for https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/238.
21-
We target 19041 and not 17763 to avoid an issue with NuGet resolving no assemblies due to the empty TFM lib folders for Uno platform (which should be removed).
21+
We also include 'net9.0-windows10.0.17763.0' explicitly for UWP as a workaround for https://github.com/CommunityToolkit/Tooling-Windows-Submodule/issues/238.
22+
We target 17763 and not 17763 to avoid an issue with NuGet resolving no assemblies due to the empty TFM lib folders for Uno platform (which should be removed).
2223
-->
23-
<UwpTargetFrameworks>uap10.0.17763;net8.0-windows10.0.19041.0;net9.0-windows10.0.19041.0;</UwpTargetFrameworks>
24+
<UwpTargetFrameworks>uap10.0.17763;net8.0-windows10.0.17763.0;net9.0-windows10.0.17763.0;</UwpTargetFrameworks>
2425
</PropertyGroup>
2526

2627
<!-- Sets this up as a toolkit component's source project -->

0 commit comments

Comments
 (0)