Version bumps & ffimageloading

shinyorg · Dec 2, 2023 · b3e4dcf · b3e4dcf
1 parent 2fa01be
commit b3e4dcf
Show file tree

Hide file tree

Showing 6 changed files with 31 additions and 10 deletions.
diff --git a/ProjectTemplates/ShinyApp/.template.config/ide.host.json b/ProjectTemplates/ShinyApp/.template.config/ide.host.json
@@ -306,8 +306,13 @@
             "text": "Add Audio (Plugin.Maui.Audio)"
         },
         "isVisible": true
-    },
-    {
+    },{
+        "id": "ffimageloading",
+        "name":{
+            "text": "Add FFImageLoading MAUI (FFImageLoading.Maui)"
+        },
+        "isVisible": true
+    },{        
         "id": "fingerprint",
         "name":{
             "text": "Add Fingerprint/Facial Recognition (Plugin.Fingerprint)"

diff --git a/ProjectTemplates/ShinyApp/.template.config/template.json b/ProjectTemplates/ShinyApp/.template.config/template.json
@@ -428,6 +428,13 @@
             "description": "Add SkiaSharp Extended (Lottie) - Documentation: https://github.com/mono/SkiaSharp.Extended",
             "displayName": "Add SkiaSharp Extended (Lottie)" 
         },
+        "ffimageloading":{
+            "type": "parameter",
+            "datatype": "bool",
+            "defaultValue": "false",
+            "description": "Add FFImageLoading MAUI - Documentation: https://github.com/microspaze/FFImageLoading.Maui",
+            "displayName": "Add FFImageLoading MAUI" 
+        },
         "embedio": {
             "type": "parameter",
             "datatype": "bool",

diff --git a/ProjectTemplates/ShinyApp/MauiProgram.cs b/ProjectTemplates/ShinyApp/MauiProgram.cs
@@ -31,6 +31,9 @@
 #if skia || skiaextended
 using SkiaSharp.Views.Maui.Controls.Hosting;
 #endif
+#if ffimageloading
+using FFImageLoading.Maui;
+#endif
 #if uraniumui
 using UraniumUI;
 #endif
@@ -66,6 +69,9 @@ public static MauiApp CreateMauiApp() => MauiApp
 #if sharpnadocv
         .UseSharpnadoCollectionView(false)
 #endif
+#if ffimageloading
+        .UseFFImageLoading()
+#endif
 #if skia || skiaextended
         .UseSkiaSharp()
 #endif

diff --git a/ProjectTemplates/ShinyApp/ShinyApp.csproj b/ProjectTemplates/ShinyApp/ShinyApp.csproj
@@ -85,13 +85,13 @@
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" Condition="'$(Configuration)' == 'Debug'" />
 
 		<!--#if (shinyframework || communitytoolkit)-->
-		<PackageReference Include="CommunityToolkit.Maui" Version="6.1.0" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="7.0.0" />
 		<!--#endif-->
 		<!--#if (usecsharpmarkup)-->
-		<PackageReference Include="CommunityToolkit.Maui.Markup" Version="3.3.1" />
+		<PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.0.0" />
 		<!--#endif-->
 		<!--#if (mediaelement)-->
-		<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="2.0.0" />
+		<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="3.0.0" />
 		<!--#endif-->
 		<!--#if (usemauimaps)-->
 		<PackageReference Include="Microsoft.Maui.Controls.Maps" Version="$(MauiVersion)" />
@@ -189,16 +189,19 @@
 		<PackageReference Include="Sharpnado.CollectionView.Maui" Version="3.0.0" />
 		<!--#endif-->
 		<!--#if (uraniumui)-->
-		<PackageReference Include="UraniumUI.Material" Version="2.5.6" />
-		<PackageReference Include="UraniumUI.Icons.MaterialIcons" Version="2.5.6" />
-		<PackageReference Include="UraniumUI.Blurs" Version="2.5.6" />
+		<PackageReference Include="UraniumUI.Material" Version="2.7.2" />
+		<PackageReference Include="UraniumUI.Icons.MaterialIcons" Version="2.7.2" />
+		<PackageReference Include="UraniumUI.Blurs" Version="2.7.2" />
 		<!--#endif-->
 		<!--#if (skia)-->
 		<PackageReference Include="SkiaSharp.Views.Maui.Controls" Version="2.88.6" />
 		<!--#endif-->
 		<!--#if (skiaextended)-->
 		<PackageReference Include="SkiaSharp.Extended.UI.Maui" Version="2.0.0-preview.86" />
 		<!--#endif-->
+		<!--#if (ffimageloading)-->
+		<PackageReference Include="FFImageLoading.Maui" Version="1.0.3" />
+		<!--#endif-->
 		<!--#if (embedio)-->
 		<PackageReference Include="EmbedIO" Version="3.5.2" />
 		<!--#endif-->

diff --git a/ProjectTemplates/ShinyAspNet/ShinyAspNet.csproj b/ProjectTemplates/ShinyAspNet/ShinyAspNet.csproj
@@ -5,7 +5,7 @@
         <Nullable>enable</Nullable>
         <ImplicitUsings>enable</ImplicitUsings>
         <MicrosoftVersion>8.0.0</MicrosoftVersion>
-        <FastEndpointsVersion>5.20.0-rc2</FastEndpointsVersion>
+        <FastEndpointsVersion>5.20.1</FastEndpointsVersion>
         <!--#if (orleans)-->
         <OrleansVersion>7.2.3</OrleansVersion>
         <!--#endif-->

diff --git a/Template.csproj b/Template.csproj
@@ -3,7 +3,7 @@
     <PropertyGroup>
         <Description>Shiny.NET Templates - One stop shop to setup almost everything you can imagine within your .NET MAUI application</Description>
         <PackageType>Template</PackageType>
-        <PackageVersion>2.0.0-beta-0001</PackageVersion>
+        <PackageVersion>2.0.0-beta-0002</PackageVersion>
         <PackageId>Shiny.Templates</PackageId>
         <Title>Shiny Templates</Title>
         <Authors>Allan Ritchie</Authors>