dan/Toolkit2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bump to . net 9

Browse Source
This commit is contained in:
TheXamlGuy
2024-10-07 17:38:04 +01:00
parent ae8d62ceb2
commit 1c28659eac
6 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Toolkit.Avalonia/Toolkit.Avalonia.csproj
+2 -2
View File
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Avalonia" Version="11.2.0-beta2" /> <PackageReference Include="Avalonia" Version="11.2.0-rc1" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Toolkit.Foundation\Toolkit.Foundation.csproj" /> <ProjectReference Include="..\Toolkit.Foundation\Toolkit.Foundation.csproj" />
Toolkit.Foundation/ConfigurationSource.cs
+4 -2
View File
@@ -1,4 +1,5 @@
using Microsoft.Extensions.FileProviders; using Json.More;
using Microsoft.Extensions.FileProviders;
using System.Text.Encodings.Web; using System.Text.Encodings.Web;
using System.Text.Json; using System.Text.Json;
using System.Text.Json.Nodes; using System.Text.Json.Nodes;
@@ -23,7 +24,8 @@ public class ConfigurationSource<TConfiguration>(IConfigurationFile<TConfigurati
Converters = Converters =
{ {
new JsonStringEnumConverter(), new JsonStringEnumConverter(),
new DictionaryStringObjectJsonConverter() new DictionaryStringObjectJsonConverter(),
new JsonArrayTupleConverter()
} }
}; };
}; };
Toolkit.Foundation/DefaultHostBuilder.cs
-5
View File
@@ -10,11 +10,6 @@ public class DefaultHostBuilder :
public static IHostBuilder Create() public static IHostBuilder Create()
{ {
return new HostBuilder() return new HostBuilder()
.UseContentRoot("Local", true)
.ConfigureAppConfiguration((context, config) =>
{
config.AddJsonFile("Settings.json", true, true);
})
.ConfigureServices((context, services) => .ConfigureServices((context, services) =>
{ {
services.AddScoped<IServiceFactory>(provider => services.AddScoped<IServiceFactory>(provider =>
Toolkit.Foundation/Toolkit.Foundation.csproj
+2 -2
View File
@@ -1,12 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CommunityToolkit.Mvvm" Version="8.3.2" /> <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="Microsoft.Extensions.Hosting" Version="9.0.0-rc.1.24431.7" />
<PackageReference Include="System.Reactive" Version="6.0.1" /> <PackageReference Include="System.Reactive" Version="6.0.1" />
</ItemGroup> </ItemGroup>
Toolkit.UI.Avalonia/Toolkit.UI.Avalonia.csproj
+2 -2
View File
@@ -1,11 +1,11 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
</PropertyGroup> </PropertyGroup>
<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.Xaml.Behaviors" Version="11.1.0.4" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
Toolkit.UI.Controls.Avalonia/Toolkit.UI.Controls.Avalonia.csproj
+2 -2
View File
@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk"> <Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<AllowUnsafeBlocks>true</AllowUnsafeBlocks> <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -12,7 +12,7 @@
<AvaloniaResource Include="Fonts\FluentSystemIcons-Resizable.ttf" /> <AvaloniaResource Include="Fonts\FluentSystemIcons-Resizable.ttf" />
</ItemGroup> </ItemGroup>
<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.Xaml.Behaviors" Version="11.1.0.4" />
<PackageReference Include="Avalonia.Labs.Controls" Version="11.1.0" /> <PackageReference Include="Avalonia.Labs.Controls" Version="11.1.0" />
<PackageReference Include="FluentAvaloniaUI" Version="2.1.0" /> <PackageReference Include="FluentAvaloniaUI" Version="2.1.0" />