Skip to content

Commit

Permalink
Support for .NET 9 CommunityToolkit package versions #281 #285
Browse files Browse the repository at this point in the history
  • Loading branch information
@egvijayanand
egvijayanand committed Jan 20, 2025
1 parent 14cdf31 commit 328dfd2
Show file tree
Hide file tree
Showing 18 changed files with 588 additions and 681 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

This repository is to host the .NET MAUI Project Templates, Item Templates, and Code Snippets.

Join me on [**Developer Thoughts**](https://egvijayanand.in/?utm_source=github "Developer Thoughts"), an exclusive blog for .NET MAUI and Blazor, for [articles](https://egvijayanand.in/category/net-maui/templates-net-maui/?utm_source=github) on working with these templates and much more.
Join me on [**Developer Thoughts**](https://egvijayanand.in/?utm_source=github&utm_medium=readme&utm_campaign=templates "Developer Thoughts"), an exclusive blog for .NET MAUI and Blazor, for [articles](https://egvijayanand.in/category/net-maui/templates-net-maui/?utm_source=github&utm_medium=readme&utm_campaign=templates) on working with these templates and much more.

We all know that .NET MAUI is an evolution of Xamarin.Forms.

Expand Down
2 changes: 1 addition & 1 deletion src/MauiTemplatesCLI/MauiAppCS/.template.config/ide.host.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -144,7 +144,7 @@
"text": "Option to configure Windows target as _Unpackaged type."
},
"isVisible": true,
"defaultValue": "false"
"defaultValue": "true"
},
{
"id": "central-pkg-mgmt",
Expand Down
2 changes: 1 addition & 1 deletion src/MauiTemplatesCLI/MauiAppCS/.template.config/template.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -810,7 +810,7 @@
"windows-unpackaged": {
"type": "parameter",
"datatype": "bool",
"defaultValue": "false",
"defaultValue": "true",
"description": "Option to configure Windows target as Unpackaged type.",
"displayName": "Option to configure Windows target as _Unpackaged type"
},
Expand Down
46 changes: 31 additions & 15 deletions src/MauiTemplatesCLI/MauiAppCS/Directory.Packages.props
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
<!--#if (Net9)-->
<!--#if (Nightly)-->
<MauiVersion>9.0.20-ci.main.24578.1</MauiVersion>
<MauiVersion>9.0.40-ci.main.25070.1</MauiVersion>
<!--#else-->
<MauiVersion>9.0.10</MauiVersion>
<MauiVersion>9.0.30</MauiVersion>
<!--#endif-->
<!--#elif (Net8)-->
<!--#if (Nightly)-->
Expand Down Expand Up @@ -56,7 +56,11 @@
<!--#if (AddMaps)-->
<PackageVersion Include="Microsoft.Maui.Controls.Maps" Version="$(MauiVersion)" />
<!--#if (AllPlatforms || IsWindows)-->
<PackageVersion Include="CommunityToolkit.Maui.Maps" Version="2.0.4" />
<!--#if (Net9)-->
<PackageVersion Include="CommunityToolkit.Maui.Maps" Version="3.0.0" />
<!--#else-->
<PackageVersion Include="CommunityToolkit.Maui.Maps" Version="2.0.4*" />
<!--#endif-->
<!--#endif-->
<!--#endif-->
<!--#if (Hybrid || Razor)-->
Expand All @@ -72,10 +76,14 @@
<PackageVersion Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<!--#endif-->
<!--#if (AddToolkit)-->
<!--#if (Net9)-->
<PackageVersion Include="CommunityToolkit.Maui" Version="10.0.0" />
<!--#else-->
<PackageVersion Include="CommunityToolkit.Maui" Version="9.1.1" />
<!--#endif-->
<!--#endif-->
<!--#if (AddSyncfusionToolkit)-->
<PackageVersion Include="Syncfusion.Maui.Toolkit" Version="1.0.2" />
<PackageVersion Include="Syncfusion.Maui.Toolkit" Version="1.0.3" />
<!--#endif-->
<!--#if (AddMarkup)-->
<!--#if (Net9)-->
Expand All @@ -85,36 +93,44 @@
<!--#endif-->
<!--#endif-->
<!--#if (AddCamera)-->
<PackageVersion Include="CommunityToolkit.Maui.Camera" Version="1.0.5" />
<!--#if (Net9)-->
<PackageVersion Include="CommunityToolkit.Maui.Camera" Version="2.0.0" />
<!--#else-->
<PackageVersion Include="CommunityToolkit.Maui.Camera" Version="1.0.5*" />
<!--#endif-->
<!--#endif-->
<!--#if (AddMedia)-->
<PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="4.1.2" />
<!--#if (Net9)-->
<PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="5.0.0" />
<!--#else-->
<PackageVersion Include="CommunityToolkit.Maui.MediaElement" Version="4.1.2*" />
<!--#endif-->
<!--#endif-->
<!--#if (AddSharedToolkit)-->
<!--#if (Net9)-->
<PackageVersion Include="VijayAnand.Toolkit.Markup" Version="4.0.0" />
<PackageVersion Include="VijayAnand.Toolkit.Markup" Version="4.1.0" />
<!--#else-->
<PackageVersion Include="VijayAnand.Toolkit.Markup" Version="3.5.0" />
<PackageVersion Include="VijayAnand.Toolkit.Markup" Version="3.6.0" />
<!--#endif-->
<!--#endif-->
<!--#if (AddMvvmToolkit || (Mvvm && !Razor))-->
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.3.2" />
<PackageVersion Include="CommunityToolkit.Mvvm" Version="8.4.0" />
<!--#endif-->
<!--#if (CompiledBindings)-->
<PackageVersion Include="CompiledBindings.MAUI" Version="1.0.18" />
<!--#endif-->
<!--#if (Reactor)-->
<!--#if (Net9OrLater)-->
<PackageVersion Include="Reactor.Maui" Version="3.0.6-beta" />
<PackageVersion Include="Reactor.Maui.Canvas" Version="3.0.6-beta" />
<PackageVersion Include="Reactor.Maui" Version="3.0.14-beta" />
<PackageVersion Include="Reactor.Maui.Canvas" Version="3.0.14-beta" />
<!--#if (AddMaps)-->
<PackageVersion Include="Reactor.Maui.Maps" Version="3.0.6-beta" />
<PackageVersion Include="Reactor.Maui.Maps" Version="3.0.14-beta" />
<!--#endif-->
<!--#else-->
<PackageVersion Include="Reactor.Maui" Version="2.0.55" />
<PackageVersion Include="Reactor.Maui.Canvas" Version="2.0.55" />
<PackageVersion Include="Reactor.Maui" Version="2.0.59" />
<PackageVersion Include="Reactor.Maui.Canvas" Version="2.0.59" />
<!--#if (AddMaps)-->
<PackageVersion Include="Reactor.Maui.Maps" Version="2.0.55" />
<PackageVersion Include="Reactor.Maui.Maps" Version="2.0.59" />
<!--#endif-->
<!--#endif-->
<!--#endif-->
Expand Down
18 changes: 17 additions & 1 deletion src/MauiTemplatesCLI/MauiAppCS/MauiApp.1.MauiLib/MauiApp.1.MauiLib.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -85,9 +85,13 @@
<!--#if (AddMaps)-->
<PackageReference Include="Microsoft.Maui.Controls.Maps" Version="$(MauiVersion)" />
<!--#if (AllPlatforms || IsWindows)-->
<!--#if (Net9)-->
<PackageReference Include="CommunityToolkit.Maui.Maps" Version="3.*" />
<!--#else-->
<PackageReference Include="CommunityToolkit.Maui.Maps" Version="2.*" />
<!--#endif-->
<!--#endif-->
<!--#endif-->
<!--#if (Hybrid || Razor)-->
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<!--#endif-->
Expand All @@ -101,8 +105,12 @@
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<!--#endif-->
<!--#if (AddToolkit)-->
<!--#if (Net9)-->
<PackageReference Include="CommunityToolkit.Maui" Version="10.*" />
<!--#else-->
<PackageReference Include="CommunityToolkit.Maui" Version="9.*" />
<!--#endif-->
<!--#endif-->
<!--#if (AddSyncfusionToolkit)-->
<PackageReference Include="Syncfusion.Maui.Toolkit" Version="1.*" />
<!--#endif-->
Expand All @@ -114,10 +122,18 @@
<!--#endif-->
<!--#endif-->
<!--#if (AddCamera)-->
<!--#if (Net9)-->
<PackageReference Include="CommunityToolkit.Maui.Camera" Version="2.*" />
<!--#else-->
<PackageReference Include="CommunityToolkit.Maui.Camera" Version="1.*" />
<!--#endif-->
<!--#endif-->
<!--#if (AddMedia)-->
<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="3.*" />
<!--#if (Net9)-->
<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="5.*" />
<!--#else-->
<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="4.*" />
<!--#endif-->
<!--#endif-->
<!--#if (AddSharedToolkit)-->
<!--#if (Net9)-->
Expand Down
18 changes: 17 additions & 1 deletion src/MauiTemplatesCLI/MauiAppCS/MauiApp.1.csproj
View file
Original file line number Diff line number Diff line change
Expand Up @@ -271,9 +271,13 @@
<!--#if (AddMaps)-->
<PackageReference Include="Microsoft.Maui.Controls.Maps" Version="$(MauiVersion)" />
<!--#if (AllPlatforms || IsWindows)-->
<!--#if (Net9)-->
<PackageReference Include="CommunityToolkit.Maui.Maps" Version="3.*" />
<!--#else-->
<PackageReference Include="CommunityToolkit.Maui.Maps" Version="2.*" />
<!--#endif-->
<!--#endif-->
<!--#endif-->
<!--#if (Hybrid || Razor)-->
<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
<!--#endif-->
Expand All @@ -287,8 +291,12 @@
<PackageReference Include="Microsoft.Maui.Controls.Compatibility" Version="$(MauiVersion)" />
<!--#endif-->
<!--#if (AddToolkit)-->
<!--#if (Net9)-->
<PackageReference Include="CommunityToolkit.Maui" Version="10.*" />
<!--#else-->
<PackageReference Include="CommunityToolkit.Maui" Version="9.*" />
<!--#endif-->
<!--#endif-->
<!--#if (AddSyncfusionToolkit)-->
<PackageReference Include="Syncfusion.Maui.Toolkit" Version="1.*" />
<!--#endif-->
Expand All @@ -300,10 +308,18 @@
<!--#endif-->
<!--#endif-->
<!--#if (AddCamera)-->
<!--#if (Net9)-->
<PackageReference Include="CommunityToolkit.Maui.Camera" Version="2.*" />
<!--#else-->
<PackageReference Include="CommunityToolkit.Maui.Camera" Version="1.*" />
<!--#endif-->
<!--#endif-->
<!--#if (AddMedia)-->
<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="3.*" />
<!--#if (Net9)-->
<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="5.*" />
<!--#else-->
<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="4.*" />
<!--#endif-->
<!--#endif-->
<!--#if (AddSharedToolkit)-->
<!--#if (Net9)-->
Expand Down
Loading

0 comments on commit 328dfd2

Please sign in to comment.