From bfdb4911828ce11f36ae48b45ca5989d76299e73 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?M=C3=A5rten=20=C3=85sberg?= <marten.asberg@outlook.com>
Date: Sun, 17 Mar 2024 08:09:24 +0100
Subject: [PATCH] Upgrade to .NET 8.0

---
 app/Directory.Build.props                        |  2 +-
 .../TimeKeep.App.Android.csproj                  |  6 +++---
 .../TimeKeep.App.Desktop.csproj                  |  2 +-
 app/TimeKeep.App/TimeKeep.App.csproj             |  6 +++---
 client/TimeKeep.Client.csproj                    | 16 ++++++++--------
 common/TimeKeep.Common.csproj                    |  2 +-
 rpc/TimeKeep.RPC.csproj                          |  8 ++++----
 server/TimeKeep.csproj                           | 12 ++++++------
 8 files changed, 27 insertions(+), 27 deletions(-)

diff --git a/app/Directory.Build.props b/app/Directory.Build.props
index f8ea059..cb95408 100644
--- a/app/Directory.Build.props
+++ b/app/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
     <Nullable>enable</Nullable>
-    <AvaloniaVersion>11.0.0</AvaloniaVersion>
+    <AvaloniaVersion>11.0.10</AvaloniaVersion>
   </PropertyGroup>
 </Project>
diff --git a/app/TimeKeep.App.Android/TimeKeep.App.Android.csproj b/app/TimeKeep.App.Android/TimeKeep.App.Android.csproj
index 11c24fa..9a324c1 100644
--- a/app/TimeKeep.App.Android/TimeKeep.App.Android.csproj
+++ b/app/TimeKeep.App.Android/TimeKeep.App.Android.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFramework>net7.0-android</TargetFramework>
+    <TargetFramework>net8.0-android</TargetFramework>
     <SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
     <Nullable>enable</Nullable>
     <ApplicationId>net.xn--sberg-lra.timekeep</ApplicationId>
@@ -20,8 +20,8 @@
 
   <ItemGroup>
     <PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
-    <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
-    <PackageReference Include="Xamarin.Essentials" Version="1.7.7" />
+    <PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.6" />
+    <PackageReference Include="Xamarin.Essentials" Version="1.8.1" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/app/TimeKeep.App.Desktop/TimeKeep.App.Desktop.csproj b/app/TimeKeep.App.Desktop/TimeKeep.App.Desktop.csproj
index 5d9868b..04e5879 100644
--- a/app/TimeKeep.App.Desktop/TimeKeep.App.Desktop.csproj
+++ b/app/TimeKeep.App.Desktop/TimeKeep.App.Desktop.csproj
@@ -3,7 +3,7 @@
     <OutputType>WinExe</OutputType>
     <!--If you are willing to use Windows/MacOS native APIs you will need to create 3 projects.
     One for Windows with net7.0-windows TFM, one for MacOS with net7.0-macos and one with net7.0 TFM for Linux.-->
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net8.0</TargetFramework>
     <Nullable>enable</Nullable>
     <BuiltInComInteropSupport>true</BuiltInComInteropSupport>
   </PropertyGroup>
diff --git a/app/TimeKeep.App/TimeKeep.App.csproj b/app/TimeKeep.App/TimeKeep.App.csproj
index bcc759f..adc4b3a 100644
--- a/app/TimeKeep.App/TimeKeep.App.csproj
+++ b/app/TimeKeep.App/TimeKeep.App.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<LangVersion>latest</LangVersion>
 		<AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
@@ -19,8 +19,8 @@
 		<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
 		<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
 		<PackageReference Include="FluentAvalonia.FluentIcons" Version="1.1.201.1-preview7" />
-		<PackageReference Include="FluentAvaloniaUI" Version="2.0.0-rc1" />
-		<PackageReference Include="ReactiveUI.Fody" Version="19.4.1" />
+		<PackageReference Include="FluentAvaloniaUI" Version="2.0.5" />
+		<PackageReference Include="ReactiveUI.Fody" Version="19.5.41" />
 		<PackageReference Include="System.Linq.Async" Version="6.0.1" />
 	</ItemGroup>
 
diff --git a/client/TimeKeep.Client.csproj b/client/TimeKeep.Client.csproj
index db16dec..fd63b3c 100644
--- a/client/TimeKeep.Client.csproj
+++ b/client/TimeKeep.Client.csproj
@@ -1,17 +1,17 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
 		<OutputType>Exe</OutputType>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
-		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="7.0.0"/>
-		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="7.0.0" />
-		<PackageReference Include="Spectre.Console.Cli" Version="0.46.0"/>
+		<PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0"/>
+		<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
+		<PackageReference Include="Spectre.Console.Cli" Version="0.48.0"/>
 		<ProjectReference Include="..\rpc\TimeKeep.RPC.csproj" />
 		<ProjectReference Include="..\common\TimeKeep.Common.csproj" />
 	</ItemGroup>
diff --git a/common/TimeKeep.Common.csproj b/common/TimeKeep.Common.csproj
index cced976..30b1c96 100644
--- a/common/TimeKeep.Common.csproj
+++ b/common/TimeKeep.Common.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 
diff --git a/rpc/TimeKeep.RPC.csproj b/rpc/TimeKeep.RPC.csproj
index 8c28121..874c599 100644
--- a/rpc/TimeKeep.RPC.csproj
+++ b/rpc/TimeKeep.RPC.csproj
@@ -1,12 +1,12 @@
 <Project Sdk="Microsoft.NET.Sdk">
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Google.Protobuf" Version="3.21.12"/>
-		<PackageReference Include="Grpc.Net.Client" Version="2.51.0"/>
-		<PackageReference Include="Grpc.Tools" Version="2.51.0">
+		<PackageReference Include="Google.Protobuf" Version="3.26.0"/>
+		<PackageReference Include="Grpc.Net.Client" Version="2.61.0"/>
+		<PackageReference Include="Grpc.Tools" Version="2.62.0">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
diff --git a/server/TimeKeep.csproj b/server/TimeKeep.csproj
index ee81c2d..86ab973 100644
--- a/server/TimeKeep.csproj
+++ b/server/TimeKeep.csproj
@@ -1,20 +1,20 @@
 <Project Sdk="Microsoft.NET.Sdk.Web">
 	<PropertyGroup>
-		<TargetFramework>net7.0</TargetFramework>
+		<TargetFramework>net8.0</TargetFramework>
 		<Nullable>enable</Nullable>
 		<DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
 		<WarningsAsErrors>CS8509,CS8524</WarningsAsErrors>
 		<NoWarn>CS8524</NoWarn>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="Grpc.AspNetCore" Version="2.51.0" />
-		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="7.0.1" />
-		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="7.0.1">
+		<PackageReference Include="Grpc.AspNetCore" Version="2.61.0" />
+		<PackageReference Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="8.0.3" />
+		<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="8.0.3">
 			<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
 			<PrivateAssets>all</PrivateAssets>
 		</PackageReference>
-		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.17.0" />
-		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="7.0.1" />
+		<PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.19.6" />
+		<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.2" />
 		<ProjectReference Include="..\rpc\TimeKeep.RPC.csproj" />
 	</ItemGroup>
 </Project>
\ No newline at end of file