Fix build issues

Author: bytedreamer

src/Console/Program.cs

@@ -30,7 +30,6 @@ namespace Console;
 
 internal static class Program
 {
-    private static ILogger<ControlPanel> _panelLogger;
     private static ControlPanel _controlPanel;
     private static readonly Queue<string> Messages = new ();
     private static readonly object MessageLock = new ();
@@ -58,7 +57,7 @@ internal static class Program
     private static async Task Main()
     {
         XmlConfigurator.Configure(
-            LogManager.GetRepository(Assembly.GetAssembly(typeof(LogManager))),
+            LogManager.GetRepository(Assembly.GetEntryAssembly() ?? Assembly.GetCallingAssembly()),
             new FileInfo("log4net.config"));
 
         _lastConfigFilePath = Path.Combine(Environment.CurrentDirectory, "appsettings.config");
@@ -95,8 +94,8 @@ private static async Task Main()
                 new MenuItem("_Quit", "", () =>
                 {
                     SaveConfigurationSettings(_settings);
-
-                    Application.RequestStop();
+                    
+                    Application.Shutdown();
                 })
             }),
             new MenuBarItem("Co_nnections", new[]

src/OSDP.Net/OSDP.Net.csproj

@@ -29,15 +29,8 @@
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
-<<<<<<< HEAD
     <PackageReference Include="System.Text.Json" Version="8.0.5" />
-=======
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
-  </ItemGroup>
-
-  <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
->>>>>>> origin/develop
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
     <PackageReference Include="System.IO.Ports" Version="8.0.0" />
   </ItemGroup>