From 1c28659eac357e41e510f951801becec3a2a18a0 Mon Sep 17 00:00:00 2001
From: TheXamlGuy <dan_clark@outlook.com>
Date: Mon, 7 Oct 2024 17:38:04 +0100
Subject: [PATCH] Bump to . net 9

---
 Toolkit.Avalonia/Toolkit.Avalonia.csproj                    | 4 ++--
 Toolkit.Foundation/ConfigurationSource.cs                   | 6 ++++--
 Toolkit.Foundation/DefaultHostBuilder.cs                    | 5 -----
 Toolkit.Foundation/Toolkit.Foundation.csproj                | 4 ++--
 Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj              | 4 ++--
 .../Toolkit.UI.Controls.Avalonia.csproj                     | 4 ++--
 6 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/Toolkit.Avalonia/Toolkit.Avalonia.csproj b/Toolkit.Avalonia/Toolkit.Avalonia.csproj
index bc05345..718702e 100644
--- a/Toolkit.Avalonia/Toolkit.Avalonia.csproj
+++ b/Toolkit.Avalonia/Toolkit.Avalonia.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.2.0-beta2" />
+		<PackageReference Include="Avalonia" Version="11.2.0-rc1" />
 	</ItemGroup>
 	<ItemGroup>
 	  <ProjectReference Include="..\Toolkit.Foundation\Toolkit.Foundation.csproj" />
diff --git a/Toolkit.Foundation/ConfigurationSource.cs b/Toolkit.Foundation/ConfigurationSource.cs
index 142f10b..c464212 100644
--- a/Toolkit.Foundation/ConfigurationSource.cs
+++ b/Toolkit.Foundation/ConfigurationSource.cs
@@ -1,4 +1,5 @@
-using Microsoft.Extensions.FileProviders;
+using Json.More;
+using Microsoft.Extensions.FileProviders;
 using System.Text.Encodings.Web;
 using System.Text.Json;
 using System.Text.Json.Nodes;
@@ -23,7 +24,8 @@ public class ConfigurationSource<TConfiguration>(IConfigurationFile<TConfigurati
             Converters =
             {
                 new JsonStringEnumConverter(),
-                new DictionaryStringObjectJsonConverter()
+                new DictionaryStringObjectJsonConverter(),
+                new JsonArrayTupleConverter()
             }
         };
     };
diff --git a/Toolkit.Foundation/DefaultHostBuilder.cs b/Toolkit.Foundation/DefaultHostBuilder.cs
index 4cc1518..c2f431d 100644
--- a/Toolkit.Foundation/DefaultHostBuilder.cs
+++ b/Toolkit.Foundation/DefaultHostBuilder.cs
@@ -10,11 +10,6 @@ public class DefaultHostBuilder :
     public static IHostBuilder Create()
     {
         return new HostBuilder()
-            .UseContentRoot("Local", true)
-            .ConfigureAppConfiguration((context, config) =>
-            {
-                config.AddJsonFile("Settings.json", true, true);
-            })
             .ConfigureServices((context, services) =>
             {
                 services.AddScoped<IServiceFactory>(provider =>
diff --git a/Toolkit.Foundation/Toolkit.Foundation.csproj b/Toolkit.Foundation/Toolkit.Foundation.csproj
index f3f2d96..d4c5b75 100644
--- a/Toolkit.Foundation/Toolkit.Foundation.csproj
+++ b/Toolkit.Foundation/Toolkit.Foundation.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
 		<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" />
-		<PackageReference Include="JsonPatch.Net" Version="3.1.1" />
+		<PackageReference Include="Json.More.Net" Version="2.0.2" />
 		<PackageReference Include="Microsoft.Extensions.Hosting" Version="9.0.0-rc.1.24431.7" />
 		<PackageReference Include="System.Reactive" Version="6.0.1" />
 	</ItemGroup>
diff --git a/Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj b/Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj
index 991b0b7..b49d0ba 100644
--- a/Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj
+++ b/Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj
@@ -1,11 +1,11 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.2.0-beta2" />
+		<PackageReference Include="Avalonia" Version="11.2.0-rc1" />
 		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0.4" />
 	</ItemGroup>
 	<ItemGroup>
diff --git a/Toolkit.UI.Controls.Avalonia/Toolkit.UI.Controls.Avalonia.csproj b/Toolkit.UI.Controls.Avalonia/Toolkit.UI.Controls.Avalonia.csproj
index 64e67c3..45e96cb 100644
--- a/Toolkit.UI.Controls.Avalonia/Toolkit.UI.Controls.Avalonia.csproj
+++ b/Toolkit.UI.Controls.Avalonia/Toolkit.UI.Controls.Avalonia.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net8.0</TargetFramework>
+		<TargetFramework>net9.0</TargetFramework>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -12,7 +12,7 @@
 	  <AvaloniaResource Include="Fonts\FluentSystemIcons-Resizable.ttf" />
 	</ItemGroup>
 	<ItemGroup>
-		<PackageReference Include="Avalonia" Version="11.2.0-beta2" />
+		<PackageReference Include="Avalonia" Version="11.2.0-rc1" />
 		<PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.1.0.4" />
 		<PackageReference Include="Avalonia.Labs.Controls" Version="11.1.0" />
 		<PackageReference Include="FluentAvaloniaUI" Version="2.1.0" />