From a971489902fb22bace14b7148f6a764d930a8b08 Mon Sep 17 00:00:00 2001
From: Nguyen Quy Hy <nguyenquyhy@live.com.sg>
Date: Mon, 16 Dec 2024 14:59:44 -0500
Subject: [PATCH] Upgrade to .NET 9 and remove AppCenter

---
 FlightStreamDeck.AddOn/App.xaml.cs            |  9 -------
 .../FlightStreamDeck.AddOn.csproj             | 24 +++++++++----------
 .../FlightStreamDeck.Core.csproj              |  2 +-
 .../FlightStreamDeck.Logics.csproj            |  2 +-
 .../FlightStreamDeck.LogicsTests.csproj       | 12 +++++-----
 .../FlightStreamDeck.SimConnectFSX.csproj     |  4 ++--
 build.bat                                     |  4 ++--
 7 files changed, 24 insertions(+), 33 deletions(-)

diff --git a/FlightStreamDeck.AddOn/App.xaml.cs b/FlightStreamDeck.AddOn/App.xaml.cs
index 1104ce8..f9a22df 100644
--- a/FlightStreamDeck.AddOn/App.xaml.cs
+++ b/FlightStreamDeck.AddOn/App.xaml.cs
@@ -1,9 +1,6 @@
 using FlightStreamDeck.Logics;
 using FlightStreamDeck.Logics.Actions;
 using FlightStreamDeck.SimConnectFSX;
-using Microsoft.AppCenter;
-using Microsoft.AppCenter.Analytics;
-using Microsoft.AppCenter.Crashes;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -28,12 +25,6 @@ public partial class App : Application
 
     protected override void OnStartup(StartupEventArgs e)
     {
-#if DEBUG
-        AppCenter.Start("9343b8d4-4141-40c9-9758-5c7e2fb3a1a0", typeof(Analytics), typeof(Crashes));
-#else
-        AppCenter.Start("0d85baad-aa1e-4694-ae3b-c6fed2056656",typeof(Analytics), typeof(Crashes));
-#endif
-
         var builder = new ConfigurationBuilder()
             .SetBasePath(Directory.GetCurrentDirectory())
             .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true);
diff --git a/FlightStreamDeck.AddOn/FlightStreamDeck.AddOn.csproj b/FlightStreamDeck.AddOn/FlightStreamDeck.AddOn.csproj
index 4a8f53f..92881d8 100644
--- a/FlightStreamDeck.AddOn/FlightStreamDeck.AddOn.csproj
+++ b/FlightStreamDeck.AddOn/FlightStreamDeck.AddOn.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <PlatformTarget>x64</PlatformTarget>
     <ApplicationIcon>icon.ico</ApplicationIcon>
@@ -15,17 +15,15 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="H.NotifyIcon.Wpf" Version="2.0.123" />
-    <PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />
-    <PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
-    <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" 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="Serilog" Version="3.1.1" />
-    <PackageReference Include="Serilog.Extensions.Hosting" Version="7.0.0" />
-    <PackageReference Include="Serilog.Sinks.Debug" Version="2.0.0" />
-    <PackageReference Include="Serilog.Sinks.File" Version="5.0.0" />
+	  <PackageReference Include="H.NotifyIcon.Wpf" Version="2.2.0" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.0" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="9.0.0" />
+	  <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.0" />
+	  <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="9.0.0" />
+	  <PackageReference Include="Serilog" Version="4.2.0" />
+	  <PackageReference Include="Serilog.Extensions.Hosting" Version="9.0.0" />
+	  <PackageReference Include="Serilog.Sinks.Debug" Version="3.0.0" />
+	  <PackageReference Include="Serilog.Sinks.File" Version="6.0.0" />
     <PackageReference Include="System.IO" Version="4.3.0" />
     <PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
     <PackageReference Include="System.Runtime.Handles" Version="4.3.0" />
@@ -223,4 +221,6 @@
     <Folder Include="Profiles\" />
   </ItemGroup>
 
+  <ProjectExtensions><VisualStudio><UserProperties manifest_1json__JsonSchema="https://github.com/GeekyEggo/SharpDeck/raw/src/SharpDeck.PropertyInspector/manifest-schema.json" /></VisualStudio></ProjectExtensions>
+
 </Project>
\ No newline at end of file
diff --git a/FlightStreamDeck.Core/FlightStreamDeck.Core.csproj b/FlightStreamDeck.Core/FlightStreamDeck.Core.csproj
index 7f77d05..4ae8648 100644
--- a/FlightStreamDeck.Core/FlightStreamDeck.Core.csproj
+++ b/FlightStreamDeck.Core/FlightStreamDeck.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Library</OutputType>
-    <TargetFramework>net7.0</TargetFramework>
+    <TargetFramework>net9.0</TargetFramework>
 	<Nullable>enable</Nullable>
   </PropertyGroup>
 
diff --git a/FlightStreamDeck.Logics/FlightStreamDeck.Logics.csproj b/FlightStreamDeck.Logics/FlightStreamDeck.Logics.csproj
index 942056b..214cf3f 100644
--- a/FlightStreamDeck.Logics/FlightStreamDeck.Logics.csproj
+++ b/FlightStreamDeck.Logics/FlightStreamDeck.Logics.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <UseWPF>true</UseWPF>
     <Nullable>enable</Nullable>
   </PropertyGroup>
diff --git a/FlightStreamDeck.LogicsTests/FlightStreamDeck.LogicsTests.csproj b/FlightStreamDeck.LogicsTests/FlightStreamDeck.LogicsTests.csproj
index b2ac3f4..0f770b1 100644
--- a/FlightStreamDeck.LogicsTests/FlightStreamDeck.LogicsTests.csproj
+++ b/FlightStreamDeck.LogicsTests/FlightStreamDeck.LogicsTests.csproj
@@ -1,16 +1,16 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-    <PackageReference Include="Moq" Version="4.18.4" />
-    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
-    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
-    <PackageReference Include="coverlet.collector" Version="6.0.0">
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="Moq" Version="4.20.72" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.6.4" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.6.4" />
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/FlightStreamDeck.SimConnectFSX/FlightStreamDeck.SimConnectFSX.csproj b/FlightStreamDeck.SimConnectFSX/FlightStreamDeck.SimConnectFSX.csproj
index 6f3a34d..8da0279 100644
--- a/FlightStreamDeck.SimConnectFSX/FlightStreamDeck.SimConnectFSX.csproj
+++ b/FlightStreamDeck.SimConnectFSX/FlightStreamDeck.SimConnectFSX.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net7.0-windows</TargetFramework>
+    <TargetFramework>net9.0-windows</TargetFramework>
 	<Nullable>enable</Nullable>
 	<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="7.0.1" />
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="9.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/build.bat b/build.bat
index 04658fe..c264027 100644
--- a/build.bat
+++ b/build.bat
@@ -1,7 +1,7 @@
 rd build /s /q
 mkdir build
-dotnet publish FlightStreamDeck.AddOn\FlightStreamDeck.AddOn.csproj -c Release -r win10-x64 --self-contained
-XCopy FlightStreamDeck.AddOn\bin\Release\net7.0-windows\win10-x64\publish build\tech.flighttracker.streamdeck.sdPlugin /e /h /c /i
+dotnet publish FlightStreamDeck.AddOn\FlightStreamDeck.AddOn.csproj -c Release -r win-x64 --self-contained
+XCopy FlightStreamDeck.AddOn\bin\Release\net9.0-windows\win-x64\publish build\tech.flighttracker.streamdeck.sdPlugin /e /h /c /i
 cd build
 DistributionTool.exe -b -i tech.flighttracker.streamdeck.sdPlugin -o .
 cd ..
\ No newline at end of file