net9ify - updates and remove some old stuff

ProjectTemplates/ShinyApp/.template.config/ide.host.json

@@ -32,13 +32,7 @@
         },
         "isVisible": true
     },
-    {
-        "id": "shinyframework",
-        "name": {
-            "text": "Add Shiny Framework (Shiny + ReactiveUI + Prism)"
-        },
-        "isVisible": true
-    },
+
     {
         "id": "prism",
         "name": {

ProjectTemplates/ShinyApp/.template.config/template.json

@@ -109,13 +109,6 @@
                 "format": "D"
             }
         },
-        "shinyframework": {
-            "type": "parameter",
-            "datatype": "bool",
-            "defaultValue": "false",
-            "description": "FRAMEWORK - Add Shiny Framework by Allan Ritchie - Documentation https://github.com/shinyorg/framework - Lots of helpful services like navigation, zero boilerplate MVVM properties, viewmodel validation, localization, viewmodel lifecycles, dialog services, and more",
-            "displayName": "FRAMEWORK - Add Shiny Framework (Shiny + ReactiveUI + Prism)"
-        },
         "prism":{
             "type": "parameter",
             "datatype": "bool",
@@ -840,10 +833,6 @@
             "condition": "(sqlite == false)",
             "exclude": "Services/MySqliteConnection.cs"
         },
-        {
-            "condition": "(shinyframework == false)",
-            "exclude": "FodyWeavers.xml"
-        },
         {
             "condition": "(authservice == false)",
             "exclude": "Services/IAuthenticationService.cs"

ProjectTemplates/ShinyApp/Documentation.md

@@ -6,6 +6,13 @@ _Microsoft Application User Interface Library_
 * [Documentation](https://learn.microsoft.com/en-us/dotnet/maui/)
 * [GitHub](https://github.com/dotnet/maui)
 
+## Shiny
+
+_A cross platform framework designed to make working with device services and background processes easy, testable, and consistent while bringing things like dependency injection & logging in a structured way to your code! - Written by Allan Ritchie_
+
+* [Documentation](https://shinylib.net/)
+* [GitHub](https://github.com/shinyorg/shiny)
+
 <!--#if (useblazor)-->
 ## .NET Blazor
 Blazor is a .NET frontend web framework that supports both server-side rendering and client interactivity in a single programming model:
@@ -18,13 +25,6 @@ Blazor is a .NET frontend web framework that supports both server-side rendering
 * [Documentation](https://learn.microsoft.com/en-us/aspnet/core/blazor/)
 
 <!--#endif-->
-## Shiny
-
-_A cross platform framework designed to make working with device services and background processes easy, testable, and consistent while bringing things like dependency injection & logging in a structured way to your code! - Written by Allan Ritchie_
-
-* [Documentation](https://shinylib.net/)
-* [GitHub](https://github.com/shinyorg/shiny)
-
 <!--#if (shinymediator)-->
 ## Shiny Mediator
 
@@ -65,18 +65,7 @@ Reference Implementation - Lean and performant, providing implementations for in
 
 <!--#endif-->
 
-<!--#if (shinyframework)-->
-## Prism Library
-
-_Framework combines the best of MVVM using Prism & ReactiveUI while also combining Shiny. - Written by Allan Ritchie_
-
-* [Documentation](https://github.com/shinyorg/framework)
-* Third Party Libraries
-    * [ReactiveUI](https://reactiveui.net)
-    * [Prism](https://prismlibrary.com)
-    * [DryIoc](https://github.com/dadhi/DryIoc)
-<!--#endif-->
-<!--#if (shinyframework || prism)-->
+<!--#if (prism)-->
 ## Prism Library
 
 _Empower Your XAML Applications. Leverage the power of the Prism Library to build robust and maintainable WPF, Uno Platform, .NET MAUI and Xamarin.Forms applications with ease.  Written by Dan Siegel & Brian Lagunas_
@@ -85,7 +74,7 @@ _Empower Your XAML Applications. Leverage the power of the Prism Library to buil
 * [Container Extension Library - DryIoc](https://github.com/dadhi/DryIoc)
 
 <!--#endif-->
-<!--#if (reactiveui || shinyframework)-->
+<!--#if (reactiveui)-->
 ## ReactiveUI
 
 ReactiveUI is a composable, cross-platform model-view-viewmodel framework for all .NET platforms that is inspired by functional reactive programming, which is a paradigm that allows you to abstract mutable state away from your user interfaces and express the idea around a feature in one readable place and improve the testability of your application.
@@ -94,15 +83,7 @@ ReactiveUI is a composable, cross-platform model-view-viewmodel framework for al
 * [GitHub](https://github.com/reactiveui/ReactiveUI)
 
 <!--#endif-->
-<!--#if (health)-->
-## Shiny Health
-
-_Apple Health & Google Fit for your .NET MAUI apps - Written by Allan Ritchie_
-
-* [GitHub](https://github.com/shinyorg/health)
-
-<!--#endif-->
-<!--#if (shinyframework || communitytoolkit)-->
+<!--#if (communitytoolkit)-->
 ## MAUI Community Toolkit
 
 _A collection of reusable elements for application development with .NET MAUI, including animations, behaviors, converters, effects, and helpers. It simplifies and demonstrates common developer tasks when building iOS, Android, macOS and WinUI applications._

ProjectTemplates/ShinyApp/MainViewModel.cs

@@ -1,12 +1,12 @@
 namespace ShinyApp;
 
-#if shinyframework
+#if reactiveui
 public class MainViewModel : ViewModel
 {
     public MainViewModel(BaseServices services) : base(services) {}
 
 
-    [Reactive] public string Property { get; set; }
+    [Reactive] string property;
 }
 #elif ctmvvm
 public partial class MainViewModel : ObservableObject

ProjectTemplates/ShinyApp/MauiProgram.cs

@@ -52,7 +52,7 @@
 #if camera
 using Camera.MAUI;
 #endif
-#if shinyframework || communitytoolkit || mediaelement
+#if communitytoolkit || mediaelement
 using CommunityToolkit.Maui;
 #endif
 #if useblazor
@@ -82,6 +82,7 @@ public static MauiApp CreateMauiApp()
         var builder = MauiApp
             .CreateBuilder()
             .UseMauiApp<App>()
+            .uSeShiny()
 #if userdialogs
             .UseUserDialogs()
 #endif
@@ -96,7 +97,7 @@ public static MauiApp CreateMauiApp()
             .UseUraniumUIMaterial()
             .UseUraniumUIBlurs()
 #endif
-#if shinyframework || communitytoolkit
+#if communitytoolkit
             .UseMauiCommunityToolkit()
 #endif
 #if mediaelement
@@ -135,28 +136,11 @@ public static MauiApp CreateMauiApp()
 #if skia || skiaextended || livecharts
             .UseSkiaSharp()
 #endif
-#if shinyframework         
-            .UseShinyFramework(
-                new DryIocContainerExtension(),
-                prism => prism.CreateWindow("NavigationPage/MainPage"),
-                new (
-//-:cnd:noEmit
-#if DEBUG
-                    ErrorAlertType.FullError
-#else
-                    ErrorAlertType.NoLocalize
-#endif
-//+:cnd:noEmit
-                )
-            )
-#elif prism
+#if prism
             .UsePrism(
                 new DryIocContainerExtension(),
                 prism => prism.CreateWindow("NavigationPage/MainPage")                
             )
-            .UseShiny()
-#else
-            .UseShiny()
 #endif
 #if screenrecord
             .UseScreenRecording()
@@ -421,11 +405,8 @@ public static MauiApp CreateMauiApp()
 #if storereview
         builder.Services.AddSingleton(Plugin.StoreReview.CrossStoreReview.Current);
 #endif
-#if shinyframework
-        builder.Services.AddDataAnnotationValidation();
-#endif
 
-#if (shinyframework || prism)
+#if (prism)
         builder.Services.RegisterForNavigation<MainPage, MainViewModel>();
 #else
         builder.Services.AddTransient<MainPage>();

ProjectTemplates/ShinyApp/ShinyApp.csproj

@@ -26,10 +26,10 @@
 		<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
 		<ApplicationVersion>1</ApplicationVersion>
 
-		<MauiVersion>8.0.92</MauiVersion>
+		<MauiVersion>9.0.21</MauiVersion>
 		<ShinyVersion>3.3.3</ShinyVersion>
 		<!--#if (shinymediator)-->
-		<MediatorVersion>2.1.0</MediatorVersion>
+		<MediatorVersion>2.1.1</MediatorVersion>
 		<!--#endif-->
 		<!--slower build, faster runtime in DEBUG-->
 		<!-- <_MauiForceXamlCForDebug Condition="'$(Configuration)' == 'Debug'">true</_MauiForceXamlCForDebug> -->
@@ -62,7 +62,7 @@
     </PropertyGroup>
 
 	<PropertyGroup Condition="$([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'ios' OR $([MSBuild]::GetTargetPlatformIdentifier('$(TargetFramework)')) == 'maccatalyst'">
-		<SupportedOSPlatformVersion>14.2</SupportedOSPlatformVersion>
+		<SupportedOSPlatformVersion>15.0</SupportedOSPlatformVersion>
 		<DefineConstants>$(DefineConstants);APPLE;PLATFORM</DefineConstants>	
 	</PropertyGroup>
 
@@ -147,19 +147,19 @@
 		<!--#if (useblazor)-->
 		<PackageReference Include="Microsoft.AspNetCore.Components.WebView.Maui" Version="$(MauiVersion)" />
 		<!--#endif-->
-		<PackageReference Include="Microsoft.Extensions.Telemetry" Version="8.9.1" />
-		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="8.0.0" Condition="'$(Configuration)' == 'Debug'" />
+		<PackageReference Include="Microsoft.Extensions.Telemetry" Version="9.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="9.0.0" Condition="'$(Configuration)' == 'Debug'" />
 		<!--#if (ctmvvm)-->
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
 		<!--#endif-->
-		<!--#if (shinyframework || communitytoolkit || speechrecognition)-->
-		<PackageReference Include="CommunityToolkit.Maui" Version="9.1.0" />
+		<!--#if (communitytoolkit || speechrecognition)-->
+		<PackageReference Include="CommunityToolkit.Maui" Version="9.1.1" />
 		<!--#endif-->
 		<!--#if (usecsharpmarkup)-->
-		<PackageReference Include="CommunityToolkit.Maui.Markup" Version="4.2.0" />
+		<PackageReference Include="CommunityToolkit.Maui.Markup" Version="5.1.0" />
 		<!--#endif-->
 		<!--#if (mediaelement)-->
-		<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="4.1.1" />
+		<PackageReference Include="CommunityToolkit.Maui.MediaElement" Version="4.1.2" />
 		<!--#endif-->
 		<!--#if (cameraview)-->
 		<PackageReference Include="CommunityToolkit.Maui.Camera" Version="1.0.5" />
@@ -168,33 +168,31 @@
 		<PackageReference Include="Camera.Maui" Version="1.5.1" />
 		<!--#endif-->
 		<!--#if (usegooglemaps)-->
-		<PackageReference Include="Onion.Maui.GoogleMaps" Version="6.0.0" />
+		<PackageReference Include="Onion.Maui.GoogleMaps" Version="6.1.0" />
 		<!--#endif-->
-		<!--#if (shinyframework || prism)-->
+		<!--#if (prism)-->
 		<PackageReference Include="Prism.DryIoc.Maui" Version="9.0.537" />
 		<!--#endif-->
 		<!--#if (reactiveui)-->
 		<PackageReference Include="ReactiveUI" Version="20.1.63" />
 		<PackageReference Include="ReactiveUI.Maui" Version="20.1.63" />
-		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
+		<PackageReference Include="ReactiveUI.SourceGenerators" Version="2.0.17">
+			<PrivateAssets>all</PrivateAssets>
+			<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
+		</PackageReference>
 		<!--#if (useblazor)-->
 		<PackageReference Include="ReactiveUI.Blazor" Version="20.1.63" />
 		<!--#endif-->
 		<!--#endif-->
-		<!--#if (shinyframework)-->
-		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
-		<PackageReference Include="Shiny.Framework" Version="4.1.0" />
-		<!--#else-->
 		<PackageReference Include="Shiny.Core" Version="$(ShinyVersion)" />
 		<PackageReference Include="Shiny.Hosting.Maui" Version="$(ShinyVersion)" />
 		<PackageReference Include="Shiny.Support.DeviceMonitoring" Version="$(ShinyVersion)" />
-		<!--#endif-->
 		<!--#if (shinymediator)-->
 		<PackageReference Include="Shiny.Mediator" Version="$(MediatorVersion)" />
 		<PackageReference Include="Shiny.Mediator.Maui" Version="$(MediatorVersion)" />
 		<PackageReference Include="Shiny.Mediator.Caching" Version="$(MediatorVersion)" />
 		<PackageReference Include="Shiny.Mediator.Resilience" Version="$(MediatorVersion)" />
-		<!--#if (shinyframework || prism)-->
+		<!--#if (prism)-->
 		<PackageReference Include="Shiny.Mediator.Prism" Version="$(MediatorVersion)" />
 		<!--#endif-->
 		<!--#if (useblazor)-->
@@ -209,7 +207,7 @@
 		<PackageReference Include="M.BindableProperty.Generator" Version="0.11.1" />
 		<!--#endif-->
 		<!--#if (localization)-->
-		<PackageReference Include="Microsoft.Extensions.Localization" Version="8.0.6" />
+		<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.0" />
 		<!--#endif-->
 		<!--#if (usemsal)-->
 		<PackageReference Include="Microsoft.Identity.Client" Version="4.60.3" />
@@ -218,7 +216,7 @@
 		<PackageReference Include="Shiny.Extensions.Configuration" Version="$(ShinyVersion)" />
 		<!--#endif-->
 		<!--#if (sentry)-->
-		<PackageReference Include="Sentry.Maui" Version="4.12.0" />
+		<PackageReference Include="Sentry.Maui" Version="4.13.0" />
 		<!--#endif-->
 		<!--#if (sqlitelogging)-->
 		<PackageReference Include="Shiny.Logging.Sqlite" Version="$(ShinyVersion)" />