diff --git a/ProjectTemplates/ShinyApp/.template.config/template.json b/ProjectTemplates/ShinyApp/.template.config/template.json index 8c58783..d0cbf66 100644 --- a/ProjectTemplates/ShinyApp/.template.config/template.json +++ b/ProjectTemplates/ShinyApp/.template.config/template.json @@ -35,14 +35,11 @@ "description": "The target framework for the project.", "datatype": "choice", "choices": [{ - "choice": "net7.0", - "description": "Target .NET 7.0" - },{ "choice": "net8.0", "description": "Target .NET 8.0" }], "replaces": "{DOTNET_TFM}", - "defaultValue": "net7.0" + "defaultValue": "net8.0" }, "markuptype": { "type": "parameter", @@ -319,13 +316,6 @@ "description": "Sets all up all the necessary boilerplate for the MAUI App Actions", "displayName": "Setup MAUI Essentials - App Actions" }, - "pureween": { - "type": "parameter", - "datatype": "bool", - "defaultValue": "false", - "description": "Add MAUI Workarounds from Shane Neuville (MAUI Engineer) - Documentation: https://github.com/PureWeen/ShanedlerSamples", - "displayName": "Add MAUI Workarounds (PureWeen.Maui.FixesAndWorkarounds)" - }, "communitytoolkit":{ "type": "parameter", "datatype": "bool", @@ -429,7 +419,7 @@ "datatype": "bool", "defaultValue": "false", "description": "Add SkiaSharp Extended (Lottie) - Documentation: https://github.com/mono/SkiaSharp.Extended", - "displayName": "Add SkiaSharp Extended (Lottie)" + "displayName": "Add SkiaSharp Extended (Lottie)" }, "embedio": { "type": "parameter", @@ -454,11 +444,6 @@ "type": "bind", "binding": "HostIdentifier" }, - "usenet8":{ - "type": "computed", - "datatype": "bool", - "value": "(Framework == \"net8.0\")" - }, "usewebauthenticator":{ "type": "computed", "datatype": "bool", diff --git a/ProjectTemplates/ShinyApp/MauiProgram.cs b/ProjectTemplates/ShinyApp/MauiProgram.cs index 6ad4f54..46d54ac 100644 --- a/ProjectTemplates/ShinyApp/MauiProgram.cs +++ b/ProjectTemplates/ShinyApp/MauiProgram.cs @@ -34,9 +34,6 @@ #if skia || skiaextended using SkiaSharp.Views.Maui.Controls.Hosting; #endif -#if pureween -using Maui.FixesAndWorkarounds; -#endif #if uraniumui using UraniumUI; #endif @@ -151,21 +148,6 @@ static MauiAppBuilder RegisterInfrastructure(this MauiAppBuilder builder) #endif //+:cnd:noEmit #endif -#if pureween - builder.ConfigureMauiWorkarounds(); - - // OR optional picks - // builder.ConfigureShellWorkarounds(); - // builder.ConfigureTabbedPageWorkarounds(); - // builder.ConfigureEntryNextWorkaround(); - // builder.ConfigureKeyboardAutoScroll(); - // builder.ConfigureFlyoutPageWorkarounds(); -//-:cnd:noEmit - // #if ANDROID - // builder.ConfigureEntryFocusOpensKeyboard(); - // #endif -//+:cnd:noEmit -#endif #if useconfig builder.Configuration.AddJsonPlatformBundle(); #endif diff --git a/ProjectTemplates/ShinyApp/ShinyApp.csproj b/ProjectTemplates/ShinyApp/ShinyApp.csproj index 25e44a2..d007a3f 100644 --- a/ProjectTemplates/ShinyApp/ShinyApp.csproj +++ b/ProjectTemplates/ShinyApp/ShinyApp.csproj @@ -9,12 +9,9 @@ $(TargetFrameworks);{DOTNET_TFM}-maccatalyst - - 8.0.0-rc.2.9511 - + 8.0.3 Exe ShinyApp - true true enable enable @@ -29,7 +26,7 @@ 1.0 1 - 3.1.1 + 3.1.2 @@ -79,54 +76,39 @@ - - - + - + - - - - - - - - - - - - - - + - + @@ -177,7 +159,7 @@ - +