From 783d4aab5aeef443493b90179f031ce1f1d3d2f5 Mon Sep 17 00:00:00 2001 From: Allan Ritchie Date: Fri, 4 Oct 2024 18:42:52 -0400 Subject: [PATCH] Many nuget bumps and add msft fluent ui --- .../ShinyApp/.template.config/ide.host.json | 36 ++++++-------- .../ShinyApp/.template.config/template.json | 11 ++++- .../Components/Layout/MainLayout.razor | 7 +++ .../ShinyApp/Components/_Imports.razor | 3 ++ ProjectTemplates/ShinyApp/Documentation.md | 11 ++++- ProjectTemplates/ShinyApp/MauiProgram.cs | 10 ++++ ProjectTemplates/ShinyApp/ShinyApp.csproj | 49 ++++++++++--------- ProjectTemplates/ShinyApp/wwwroot/index.html | 6 +++ README.md | 7 +-- Template.csproj | 2 +- 10 files changed, 93 insertions(+), 49 deletions(-) diff --git a/ProjectTemplates/ShinyApp/.template.config/ide.host.json b/ProjectTemplates/ShinyApp/.template.config/ide.host.json index 1b09a79..835687e 100644 --- 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 index 1478f87..a14c656 100644 --- 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 index 286d43b..2ef3747 100644 --- a/ProjectTemplates/ShinyApp/Components/Layout/MainLayout.razor +++ b/ProjectTemplates/ShinyApp/Components/Layout/MainLayout.razor @@ -9,6 +9,13 @@ #endif*@ +@*#if (fluentui) + + + + + +#endif*@ @* diff --git a/ProjectTemplates/ShinyApp/Components/_Imports.razor b/ProjectTemplates/ShinyApp/Components/_Imports.razor index 5466f56..6c706f0 100644 --- 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*@ \ No newline at end of file diff --git a/ProjectTemplates/ShinyApp/Documentation.md b/ProjectTemplates/ShinyApp/Documentation.md index 0136ff5..d24a7ed 100644 --- 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/) - + +## 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) + + + ## Radzen Blazor _Rapid Application Development for Blazor_ diff --git a/ProjectTemplates/ShinyApp/MauiProgram.cs b/ProjectTemplates/ShinyApp/MauiProgram.cs index 83b53bd..b422e6e 100644 --- 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 index 6658068..ebab437 100644 --- a/ProjectTemplates/ShinyApp/ShinyApp.csproj +++ b/ProjectTemplates/ShinyApp/ShinyApp.csproj @@ -26,10 +26,10 @@ 1.0 1 - 8.0.90 + 8.0.91 3.3.3 - 1.8.1 + 2.0.0 @@ -149,16 +149,16 @@ - + - + - + @@ -170,11 +170,11 @@ - - + + - + @@ -215,7 +215,7 @@ - + @@ -257,19 +257,19 @@ - + - + - + @@ -278,7 +278,7 @@ - + @@ -302,15 +302,15 @@ - + - - - + + + - + @@ -340,22 +340,27 @@ - + - + - + + + + + + - + diff --git a/ProjectTemplates/ShinyApp/wwwroot/index.html b/ProjectTemplates/ShinyApp/wwwroot/index.html index 860a3ae..f184d55 100644 --- a/ProjectTemplates/ShinyApp/wwwroot/index.html +++ b/ProjectTemplates/ShinyApp/wwwroot/index.html @@ -30,10 +30,16 @@ 🗙 + + + + + + \ No newline at end of file diff --git a/README.md b/README.md index 491325f..ff3b09b 100644 --- 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) diff --git a/Template.csproj b/Template.csproj index b770f6e..1e9083c 100644 --- a/Template.csproj +++ b/Template.csproj @@ -3,7 +3,7 @@ Shiny.NET Templates - One stop shop to setup almost everything you can imagine within your .NET MAUI application Template - 2.61.2 + 2.64.0 Shiny.Templates Shiny Templates Allan Ritchie