From eeae99dc2aed2b2a76febe020e7ea57edbfd14c4 Mon Sep 17 00:00:00 2001
From: Xjph <archseraphim@gmail.com>
Date: Sun, 4 Dec 2022 15:01:56 -0330
Subject: [PATCH] Migrate to .NET 6

---
 ObservatoryBotanist/ObservatoryBotanist.csproj          | 5 +++--
 ObservatoryCore/ObservatoryCore.csproj                  | 5 +++--
 ObservatoryCore/PluginManagement/PluginEventHandler.cs  | 2 +-
 ObservatoryCore/UI/Views/NotificationView.axaml.cs      | 2 +-
 ObservatoryExplorer/ObservatoryExplorer.csproj          | 5 +++--
 ObservatoryFramework/ObservatoryFramework.csproj        | 3 ++-
 ObservatoryHerald/NetCoreAudio/Players/WindowsPlayer.cs | 4 ++--
 ObservatoryHerald/ObservatoryHerald.csproj              | 5 +++--
 8 files changed, 18 insertions(+), 13 deletions(-)

diff --git a/ObservatoryBotanist/ObservatoryBotanist.csproj b/ObservatoryBotanist/ObservatoryBotanist.csproj
index b995fce..e89d165 100644
--- a/ObservatoryBotanist/ObservatoryBotanist.csproj
+++ b/ObservatoryBotanist/ObservatoryBotanist.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+	<TargetFramework>net6.0</TargetFramework>
+	<ImplicitUsings>enable</ImplicitUsings>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>ObservatoryKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
@@ -16,7 +17,7 @@
   
   <ItemGroup>
     <Reference Include="ObservatoryFramework">
-      <HintPath>..\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll</HintPath>
+      <HintPath>..\ObservatoryFramework\bin\Release\net6.0\ObservatoryFramework.dll</HintPath>
     </Reference>
   </ItemGroup>
   
diff --git a/ObservatoryCore/ObservatoryCore.csproj b/ObservatoryCore/ObservatoryCore.csproj
index adc74bc..4ffa43d 100644
--- a/ObservatoryCore/ObservatoryCore.csproj
+++ b/ObservatoryCore/ObservatoryCore.csproj
@@ -2,7 +2,8 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFramework>net5.0</TargetFramework>
+	<TargetFramework>net6.0</TargetFramework>
+	<ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Observatory</RootNamespace>
     <SignAssembly>false</SignAssembly>
     <DelaySign>false</DelaySign>
@@ -39,7 +40,7 @@
   
   <ItemGroup>
     <Reference Include="ObservatoryFramework">
-      <HintPath>..\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll</HintPath>
+      <HintPath>..\ObservatoryFramework\bin\Release\net6.0\ObservatoryFramework.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/ObservatoryCore/PluginManagement/PluginEventHandler.cs b/ObservatoryCore/PluginManagement/PluginEventHandler.cs
index 2cc97b4..c9d44ec 100644
--- a/ObservatoryCore/PluginManagement/PluginEventHandler.cs
+++ b/ObservatoryCore/PluginManagement/PluginEventHandler.cs
@@ -14,7 +14,7 @@ namespace Observatory.PluginManagement
         private IEnumerable<IObservatoryWorker> observatoryWorkers;
         private IEnumerable<IObservatoryNotifier> observatoryNotifiers;
         private List<(string error, string detail)> errorList;
-        private Timer timer;
+        private System.Timers.Timer timer;
 
         public PluginEventHandler(IEnumerable<IObservatoryWorker> observatoryWorkers, IEnumerable<IObservatoryNotifier> observatoryNotifiers)
         {
diff --git a/ObservatoryCore/UI/Views/NotificationView.axaml.cs b/ObservatoryCore/UI/Views/NotificationView.axaml.cs
index 7df0f65..7c39f7b 100644
--- a/ObservatoryCore/UI/Views/NotificationView.axaml.cs
+++ b/ObservatoryCore/UI/Views/NotificationView.axaml.cs
@@ -12,7 +12,7 @@ namespace Observatory.UI.Views
     public partial class NotificationView : Window
     {
         private readonly double scale;
-        private readonly Timer timer;
+        private readonly System.Timers.Timer timer;
         private readonly Guid guid;
         private bool defaultPosition = true;
         private PixelPoint originalPosition;
diff --git a/ObservatoryExplorer/ObservatoryExplorer.csproj b/ObservatoryExplorer/ObservatoryExplorer.csproj
index 32a168b..2267812 100644
--- a/ObservatoryExplorer/ObservatoryExplorer.csproj
+++ b/ObservatoryExplorer/ObservatoryExplorer.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+	<TargetFramework>net6.0</TargetFramework>
+	<ImplicitUsings>enable</ImplicitUsings>
     <SignAssembly>false</SignAssembly>
     <AssemblyOriginatorKeyFile>ObservatoryKey.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
@@ -36,7 +37,7 @@
 
   <ItemGroup>
     <Reference Include="ObservatoryFramework">
-      <HintPath>..\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll</HintPath>
+      <HintPath>..\ObservatoryFramework\bin\Release\net6.0\ObservatoryFramework.dll</HintPath>
     </Reference>
   </ItemGroup>
 
diff --git a/ObservatoryFramework/ObservatoryFramework.csproj b/ObservatoryFramework/ObservatoryFramework.csproj
index fd23247..8da2df4 100644
--- a/ObservatoryFramework/ObservatoryFramework.csproj
+++ b/ObservatoryFramework/ObservatoryFramework.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+	<TargetFramework>net6.0</TargetFramework>
+	<ImplicitUsings>enable</ImplicitUsings>
     <RootNamespace>Observatory.Framework</RootNamespace>
   </PropertyGroup>
 
diff --git a/ObservatoryHerald/NetCoreAudio/Players/WindowsPlayer.cs b/ObservatoryHerald/NetCoreAudio/Players/WindowsPlayer.cs
index 2b59603..c92c1ed 100644
--- a/ObservatoryHerald/NetCoreAudio/Players/WindowsPlayer.cs
+++ b/ObservatoryHerald/NetCoreAudio/Players/WindowsPlayer.cs
@@ -19,7 +19,7 @@ namespace NetCoreAudio.Players
         [DllImport("winmm.dll")]
         public static extern int waveOutSetVolume(IntPtr hwo, uint dwVolume);
 
-		private Timer _playbackTimer;
+		private System.Timers.Timer _playbackTimer;
         private Stopwatch _playStopwatch;
 
 		private string _fileName;
@@ -32,7 +32,7 @@ namespace NetCoreAudio.Players
         public Task Play(string fileName)
         {
             _fileName = $"\"{fileName}\"";
-            _playbackTimer = new Timer
+            _playbackTimer = new System.Timers.Timer
             {
                 AutoReset = false
             };
diff --git a/ObservatoryHerald/ObservatoryHerald.csproj b/ObservatoryHerald/ObservatoryHerald.csproj
index 1c4d093..18db54b 100644
--- a/ObservatoryHerald/ObservatoryHerald.csproj
+++ b/ObservatoryHerald/ObservatoryHerald.csproj
@@ -1,7 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+	<TargetFramework>net6.0</TargetFramework>
+	<ImplicitUsings>enable</ImplicitUsings>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
   </PropertyGroup>
 
@@ -16,7 +17,7 @@
 
   <ItemGroup>
     <Reference Include="ObservatoryFramework">
-      <HintPath>..\ObservatoryFramework\bin\Release\net5.0\ObservatoryFramework.dll</HintPath>
+      <HintPath>..\ObservatoryFramework\bin\Release\net6.0\ObservatoryFramework.dll</HintPath>
     </Reference>
   </ItemGroup>