Sort out dependancy mess

bricefriha · Jan 29, 2024 · 0816bfb · 0816bfb
1 parent f984de3
commit 0816bfb
Show file tree

Hide file tree

Showing 5 changed files with 20 additions and 86 deletions.
diff --git a/Wordster.sln b/Wordster.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.7.34024.191
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wordster", "Wordster\Wordster.csproj", "{4B0086D2-33D3-450F-B339-07D2AD8E7B54}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Wordster", "Wordster\Wordster.csproj", "{4B0086D2-33D3-450F-B339-07D2AD8E7B54}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution

diff --git a/Wordster/MauiProgram.cs b/Wordster/MauiProgram.cs
@@ -1,6 +1,6 @@
-
-using Maui.NeoControls;
+using Maui.NeoControls;
 using Microsoft.Extensions.Logging;
+using CommunityToolkit.Maui;
 
 namespace Wordster
 {
@@ -9,22 +9,17 @@ public static class MauiProgram
         public static MauiApp CreateMauiApp()
         {
             var builder = MauiApp.CreateBuilder();
-            builder
-                .UseMauiApp<App>()
-                .UseNeoControls()
-                .ConfigureFonts(fonts =>
-                {
-                    fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
-                    fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
-                    fonts.AddFont("ComicShark.otf", "ComicShark");
-                    fonts.AddFont("SonicComics.ttf", "SonicComics");
-                    fonts.AddFont("MouseMemoirs-Regular.ttf", "MouseMemoirs-Regular");
-                });
-
+            builder.UseMauiApp<App>().UseNeoControls().ConfigureFonts(fonts =>
+            {
+                fonts.AddFont("OpenSans-Regular.ttf", "OpenSansRegular");
+                fonts.AddFont("OpenSans-Semibold.ttf", "OpenSansSemibold");
+                fonts.AddFont("ComicShark.otf", "ComicShark");
+                fonts.AddFont("SonicComics.ttf", "SonicComics");
+                fonts.AddFont("MouseMemoirs-Regular.ttf", "MouseMemoirs-Regular");
+            }).UseMauiCommunityToolkit();
 #if DEBUG
-		builder.Logging.AddDebug();
+            builder.Logging.AddDebug();
 #endif
-
             return builder.Build();
         }
     }

diff --git a/Wordster/Views/MainPage.xaml b/Wordster/Views/MainPage.xaml
diff --git a/Wordster/Views/MainPage.xaml.cs b/Wordster/Views/MainPage.xaml.cs
diff --git a/Wordster/Wordster.csproj b/Wordster/Wordster.csproj
@@ -1,8 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFrameworks>net7.0-android;net7.0-ios;net7.0-maccatalyst</TargetFrameworks>
-		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net7.0-windows10.0.19041.0</TargetFrameworks>
+		<TargetFrameworks>net8.0-android;net8.0-ios;net8.0-maccatalyst</TargetFrameworks>
+		<TargetFrameworks Condition="$([MSBuild]::IsOSPlatform('windows'))">$(TargetFrameworks);net8.0-windows10.0.19041.0</TargetFrameworks>
 		<!-- Uncomment to also build the tizen app. You will need to install tizen by following this: https://github.com/Samsung/Tizen.NET -->
 		<!-- <TargetFrameworks>$(TargetFrameworks);net7.0-tizen</TargetFrameworks> -->
 		<OutputType>Exe</OutputType>
@@ -55,6 +55,7 @@
 	</ItemGroup>
 
 	<ItemGroup>
+		<PackageReference Include="CommunityToolkit.Maui" Version="7.0.1" />
 		<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="7.0.0" />
 		<PackageReference Include="Refractored.MvvmHelpers" Version="1.6.2" />
 	</ItemGroup>
@@ -66,15 +67,18 @@
 	  <MauiXaml Update="Views\MenuPage.xaml">
 	    <Generator>MSBuild:Compile</Generator>
 	  </MauiXaml>
+	  <MauiXaml Update="Views\PopUps\VictoryPopUp.xaml">
+	    <Generator>MSBuild:Compile</Generator>
+	  </MauiXaml>
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-android'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-android'">
 	  <PackageReference Include="NeoControls.Maui">
 	    <Version>1.0.22</Version>
 	  </PackageReference>
 	</ItemGroup>
 
-	<ItemGroup Condition="'$(TargetFramework)' == 'net7.0-ios'">
+	<ItemGroup Condition="'$(TargetFramework)' == 'net8.0-ios'">
 	  <PackageReference Include="NeoControls.Maui">
 	    <Version>1.0.22</Version>
 	  </PackageReference>