Many nuget bumps and add msft fluent ui

shinyorg · Oct 4, 2024 · 783d4aa · 783d4aa
1 parent 8e4bbf0
commit 783d4aa
Show file tree

Hide file tree

Showing 10 changed files with 93 additions and 49 deletions.
diff --git a/ProjectTemplates/ShinyApp/.template.config/ide.host.json b/ProjectTemplates/ShinyApp/.template.config/ide.host.json
@@ -222,43 +222,37 @@
             "text": "Android Maps API Key (MAUI Maps)"
         },
         "isVisible": true
-    }, 
-    {
+    },{
         "id": "essentialsmedia",
         "name": {
             "text": "Setup MAUI Essentials - Media Picker"
         },
         "isVisible": true
-    },
-    {
+    },{
         "id": "essentialsfilepicker",
         "name": {
             "text": "Setup MAUI Essentials - File Picker"
         },
         "isVisible": true
-    },
-    {
+    },{
         "id": "appactions",
         "name": {
             "text": "Setup MAUI Essentials - App Actions"
         },
         "isVisible": true
-    },
-    {
+    },{
         "id": "deeplinks",
         "name": {
             "text": "Setup Deep Linking Support"
         },
         "isVisible": true
-    },
-    {
+    },{
         "id": "compiledbindings",
         "name": {
             "text": "Add Compiled Bindings"
         },
         "isVisible": true
-    },
-    {
+    },{
         "id": "binablegenerator",
         "name": {
             "text": "Add Bindable Property Generator"
@@ -285,15 +279,13 @@
             "text": "Add MAUI Community Toolkit Camera"
         },
         "isVisible": true
-    },
-    {
+    },{
         "id": "camera",
         "name": {
             "text": "Add Camera.MAUI"
         },
         "isVisible": true
-    },
-    {
+    },{
         "id": "virtuallist",
         "name":{
             "text": "Add MAUI Virtual List View"
@@ -313,15 +305,13 @@
             "text": "Add Skeleton"
         },
         "isVisible": true
-    },
-    {
+    },{
         "id": "bottomsheet",
         "name":{
             "text": "Add Bottom Sheet"
         },
         "isVisible": true
-    },
-    {
+    },{
         "id": "contextmenu",
         "name":{
             "text": "Add Context Menu"
@@ -494,6 +484,12 @@
             "text": "BLAZOR - Add Radzen.Blazor"
         },
         "isVisible": true
+    },{
+        "id": "fluentui",
+        "name":{
+            "text": "BLAZOR - Add Microsoft FluentUI"
+        },
+        "isVisible": true
     },{
         "id": "syslinqasync",
         "name":{

diff --git a/ProjectTemplates/ShinyApp/.template.config/template.json b/ProjectTemplates/ShinyApp/.template.config/template.json
@@ -624,7 +624,14 @@
             "defaultValue": "false",
             "description": "BLAZOR - Add Radzen.Blazor",
             "displayName": "BLAZOR - Add Radzen.Blazor"  
-        },        
+        },
+        "fluentui": {
+            "type": "parameter",
+            "datatype": "bool",
+            "defaultValue": "false",
+            "description": "BLAZOR - Add Microsoft FluentUI",
+            "displayName": "BLAZOR - Add Microsoft FluentUI"  
+        },
         "androidauto":{
             "type": "parameter",
             "datatype": "bool",
@@ -747,7 +754,7 @@
         "useblazor":{
             "type": "computed",
             "datatype": "bool",
-            "value": "(blazor || radzen || mudblazor)"
+            "value": "(blazor || radzen || mudblazor || fluentui)"
         }
     },
     "sources": [{

diff --git a/ProjectTemplates/ShinyApp/Components/Layout/MainLayout.razor b/ProjectTemplates/ShinyApp/Components/Layout/MainLayout.razor
@@ -9,6 +9,13 @@
 <RadzenTheme Theme="material" @rendermode="new InteractiveAutoRenderMode()" />
 <RadzenComponents @rendermode="new InteractiveAutoRenderMode()" />
 #endif*@
+@*#if (fluentui)
+<FluentToastProvider />
+<FluentDialogProvider />
+<FluentTooltipProvider />
+<FluentMessageBarProvider />
+<FluentMenuProvider />
+#endif*@
 
 @*
 <MudLayout>

diff --git a/ProjectTemplates/ShinyApp/Components/_Imports.razor b/ProjectTemplates/ShinyApp/Components/_Imports.razor
@@ -11,4 +11,7 @@
 @*#if (radzen)
 @using Radzen
 @using Radzen.Blazor
+#endif*@
+@*#if (fluentui)
+@using Microsoft.FluentUI.AspNetCore.Components
 #endif*@
diff --git a/ProjectTemplates/ShinyApp/Documentation.md b/ProjectTemplates/ShinyApp/Documentation.md
@@ -435,7 +435,16 @@ Trusted by thousands of users, from hobby developers to large enterprises. Use M
 [Documentation](https://mudblazor.com/)
 
 <!--#endif-->
-<!--#if (useblazor && mudblazor)-->
+<!--#if (useblazor && fluentui)-->
+## Microsoft Fluent UI
+
+The Fluent UI Blazor library provides a robust and extensive set of Blazor components. Some of those components are wrappers around Microsoft's official Fluent UI Web Components. Others are components that leverage the Fluent Design System or just make it easier to work with Fluent in general.
+
+[Documentation](https://www.fluentui-blazor.net/)
+[GitHub](https://github.com/microsoft/fluentui-blazor)
+
+<!--#endif-->
+<!--#if (useblazor && radzen)-->
 ## Radzen Blazor
 
 _Rapid Application Development for Blazor_

diff --git a/ProjectTemplates/ShinyApp/MauiProgram.cs b/ProjectTemplates/ShinyApp/MauiProgram.cs
@@ -62,6 +62,13 @@
 #if radzen
 using Radzen;
 #endif
+#if fluentui
+using Microsoft.FluentUI.AspNetCore.Components;
+#endif
+#endif
+#if shinymediator
+using Polly;
+using Polly.Retry;
 #endif
 
 namespace ShinyApp;
@@ -256,6 +263,9 @@ public static MauiApp CreateMauiApp()
         #if radzen
         builder.Services.AddRadzenComponents();
         #endif
+        #if fluentui
+        builder.Services.AddFluentUIComponents();
+        #endif
 //-:cnd:noEmit
 #if DEBUG
         builder.Services.AddBlazorWebViewDeveloperTools();

diff --git a/ProjectTemplates/ShinyApp/ShinyApp.csproj b/ProjectTemplates/ShinyApp/ShinyApp.csproj
@@ -26,10 +26,10 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<MauiVersion>8.0.90</MauiVersion>
+		<MauiVersion>8.0.91</MauiVersion>
 		<ShinyVersion>3.3.3</ShinyVersion>
 		<!--#if (shinymediator)-->
-		<MediatorVersion>1.8.1</MediatorVersion>
+		<MediatorVersion>2.0.0</MediatorVersion>
 		<!--#endif-->
 		<!--slower build, faster runtime in DEBUG-->
 		<!-- <_MauiForceXamlCForDebug Condition="'$(Configuration)' == 'Debug'">true</_MauiForceXamlCForDebug> -->
@@ -149,16 +149,16 @@
 		<!--#endif-->
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" Condition="'$(Configuration)' == 'Debug'" />
 		<!--#if (shinyframework || communitytoolkit || speechrecognition)-->
-		<PackageReference Include="CommunityToolkit.Maui" Version="9.0.3" />
+		<PackageReference Include="CommunityToolkit.Maui" Version="9.1.0" />
 		<!--#endif-->
 		<!--#if (usecsharpmarkup)-->
 		<PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.1.0" />
 		<!--#endif-->
 		<!--#if (mediaelement)-->
-		<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="4.1.0" />
+		<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="4.1.1" />
 		<!--#endif-->
 		<!--#if (cameraview)-->
-		<PackageReference Include="CommunityToolkit.Maui.Camera" Version="1.0.4" />
+		<PackageReference Include="CommunityToolkit.Maui.Camera" Version="1.0.5" />
 		<!--#endif-->
 		<!--#if (camera)-->
 		<PackageReference Include="Camera.Maui" Version="1.5.1" />
@@ -170,11 +170,11 @@
 		<PackageReference Include="Prism.DryIoc.Maui" Version="9.0.537" />
 		<!--#endif-->
 		<!--#if (reactiveui)-->
-		<PackageReference Include="ReactiveUI" Version="20.1.1" />
-		<PackageReference Include="ReactiveUI.Maui" Version="20.1.1" />
+		<PackageReference Include="ReactiveUI" Version="20.1.63" />
+		<PackageReference Include="ReactiveUI.Maui" Version="20.1.63" />
 		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
 		<!--#if (useblazor)-->
-		<PackageReference Include="ReactiveUI.Blazor" Version="20.1.1" />
+		<PackageReference Include="ReactiveUI.Blazor" Version="20.1.63" />
 		<!--#endif-->
 		<!--#endif-->
 		<!--#if (shinyframework)-->
@@ -215,7 +215,7 @@
 		<PackageReference Include="Shiny.Extensions.Configuration" Version="$(ShinyVersion)" />
 		<!--#endif-->
 		<!--#if (sentry)-->
-		<PackageReference Include="Sentry.Maui" Version="4.9.0" />
+		<PackageReference Include="Sentry.Maui" Version="4.12.0" />
 		<!--#endif-->
 		<!--#if (sqlitelogging)-->
 		<PackageReference Include="Shiny.Logging.Sqlite" Version="$(ShinyVersion)" />
@@ -257,19 +257,19 @@
 		<PackageReference Include="Redth.Maui.VirtualListView" Version="0.4.0" />
 		<!--#endif-->
 		<!--#if (barcodes)-->
-		<PackageReference Include="BarcodeScanning.Native.Maui" Version="1.5.7" />
+		<PackageReference Include="BarcodeScanning.Native.Maui" Version="1.5.8" />
 		<!--#endif-->
 		<!--#if (storereview)-->
 		<PackageReference Include="Plugin.StoreReview" Version="6.2.0" />
 		<!--#endif-->
 		<!--#if (inappbilling)-->
-		<PackageReference Include="Plugin.InAppBilling" Version="7.1.0" />
+		<PackageReference Include="Plugin.InAppBilling" Version="8.0.4" />
 		<!--#endif-->
 		<!--#if (calendar)-->
 		<PackageReference Include="Plugin.Maui.CalendarStore" Version="2.0.0" />
 		<!--#endif-->
 		<!--#if (audio)-->
-		<PackageReference Include="Plugin.Maui.Audio" Version="3.0.0" />
+		<PackageReference Include="Plugin.Maui.Audio" Version="3.0.1" />
 		<!--#endif-->
 		<!--#if (ocr)-->
 		<PackageReference Include="Plugin.Maui.OCR" Version="1.0.12" />
@@ -278,7 +278,7 @@
 		<PackageReference Include="Oscore.Maui.Biometric" Version="1.0.1" />
 		<!--#endif-->
 		<!--#if usehttp-->
-		<PackageReference Include="Refit" Version="7.1.2" />
+		<PackageReference Include="Refit" Version="7.2.1" />
 		<!--#endif-->
 		<!--#if (sqlite)-->
 		<PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
@@ -302,15 +302,15 @@
 		<PackageReference Include="AlohaKit.Animations" Version="1.1.0" />
 		<!--#endif-->
 		<!--#if (cards)-->
-		<PackageReference Include="CardsView.Maui" Version="0.0.9" />
+		<PackageReference Include="CardsView.Maui" Version="1.0.2" />
 		<!--#endif-->
 		<!--#if (uraniumui)-->
-		<PackageReference Include="UraniumUI.Material" Version="2.9.1" />
-		<PackageReference Include="UraniumUI.Icons.MaterialIcons" Version="2.9.1" />
-		<PackageReference Include="UraniumUI.Blurs" Version="2.9.1" />
+		<PackageReference Include="UraniumUI.Material" Version="2.10.2" />
+		<PackageReference Include="UraniumUI.Icons.MaterialIcons" Version="2.10.2" />
+		<PackageReference Include="UraniumUI.Blurs" Version="2.10.2" />
 		<!--#endif-->
 		<!--#if (ctmvvm)-->
-		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.1" />
+		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
 		<!--#endif-->
 		<!--#if (skeleton)-->
 		<PackageReference Include="HorusStudio.Maui.Skeleton" Version="2.0.0" />
@@ -340,22 +340,27 @@
 		<PackageReference Include="Plugin.Maui.DebugRainbows" Version="1.2.1" Condition="'$(Configuration)' == 'Debug'" />
 		<!--#endif-->
 		<!--#if (ffimageloading)-->
-		<PackageReference Include="FFImageLoading.Maui" Version="1.2.6" />
+		<PackageReference Include="FFImageLoading.Maui" Version="1.2.7" />
 		<!--#endif-->
 		<!--#if (embedio)-->
 		<PackageReference Include="EmbedIO" Version="3.5.2" />
 		<!--#endif-->
 		<!--#if (mudblazor)-->
-		<PackageReference Include="MudBlazor" Version="7.4.0" />
+		<PackageReference Include="MudBlazor" Version="7.8.0" />
 		<!--#endif-->
 		<!--#if (radzen)-->
-		<PackageReference Include="Radzen.Blazor" Version="5.0.4" />
+		<PackageReference Include="Radzen.Blazor" Version="5.2.9" />
+		<!--#endif-->
+		<!--#if (fluentui)-->
+		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components" Version="4.10.1" />
+		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Icons" Version="4.10.1" />
+		<PackageReference Include="Microsoft.FluentUI.AspNetCore.Components.Emoji" Version="4.6.0" />
 		<!--#endif-->
 		<!--#if (syslinqasync)-->
 		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
 		<!--#endif-->
 		<!--#if (unitsnet)-->
-		<PackageReference Include="UnitsNet" Version="5.56.0" />
+		<PackageReference Include="UnitsNet" Version="5.59.0" />
 		<!--#endif-->
 		<!--#if (humanizer)-->
 		<PackageReference Include="Humanizer" Version="2.14.1" />

diff --git a/ProjectTemplates/ShinyApp/wwwroot/index.html b/ProjectTemplates/ShinyApp/wwwroot/index.html
@@ -30,10 +30,16 @@
         <a class="dismiss">🗙</a>
     </div>
 
+    <!--#if (fluentui)-->
+    <script app-name="{APPLICATION_ID}" src="./_content/Microsoft.FluentUI.AspNetCore.Components/js/initializersLoader.webview.js"></script>
+    <!--#endif-->
     <script src="_framework/blazor.webview.js" autostart="false"></script>
     <!--#if (mudblazor)-->
     <script src="_content/MudBlazor/MudBlazor.min.js"></script>
     <!--#endif-->
+    <!--#if (fluentui)-->
+    <script src="_content/Microsoft.FluentUI.AspNetCore.Components/Microsoft.FluentUI.AspNetCore.Components.lib.module.js" type="module" async></script>
+    <!--#endif-->
 </body>
 
 </html>
diff --git a/README.md b/README.md
@@ -87,8 +87,6 @@ Works with Visual Studio 2022 & JetBrains Rider 2024+
 	* [Drastic Flipper](https://github.com/drasticactions/Drastic.Flipper) by Tim Miller
 	* [Embed.IO](https://unosquare.github.io/embedio/) by Unosquare
 	* [SkiaSharp](https://github.com/mono/SkiaSharp) by Matthew Leibowitz
-	* [MudBlazor](https://mudblazor.com)
-	* [Radzen Blazor](https://blazor.radzen.com/)
 	* [ACR User Dialogs](https://github.com/aritchie/userdialogs) by Allan Ritchie
 	* [Debug Rainbows](https://github.com/sthewissen/Plugin.Maui.DebugRainbows) by Steven Thewissen
 	* [Live Charts](https://livecharts.dev/) by Alberto Rodríguez
@@ -102,7 +100,10 @@ Works with Visual Studio 2022 & JetBrains Rider 2024+
 	* [System.Linq.Async](https://github.com/dotnet/reactive)
 	* [Humanizer](https://github.com/Humanizr/Humanizer)
 	* [Units .NET](https://github.com/angularsen/UnitsNet) by Andreas Gullberg Larsen
-
+	* Blazor Libraries
+		* [MudBlazor](https://mudblazor.com)
+		* [Radzen Blazor](https://blazor.radzen.com/)
+		* [Microsoft FluentUI](https://github.com/microsoft/fluentui-blazor)
 
 <img src="vs4win.png" />
 

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.61.2</PackageVersion>
+        <PackageVersion>2.64.0</PackageVersion>
         <PackageId>Shiny.Templates</PackageId>
         <Title>Shiny Templates</Title>
         <Authors>Allan Ritchie</Authors>