Z-bit-Systems-LLC · bytedreamer · Oct 28, 2024 · Aug 1, 2024 · Oct 2, 2024 · Oct 3, 2024
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -16,7 +16,7 @@ variables:
   buildConfiguration: 'Release'
   major: 5
   minor: 0
-  patch: 3
+  patch: 4
   AssemblyVersion: $(major).$(minor).$(patch)
   NugetVersion: $(major).$(minor).$(patch)-beta
 

diff --git a/src/Console/Console.csproj b/src/Console/Console.csproj
@@ -20,13 +20,13 @@
 
     <ItemGroup>
       <PackageReference Include="apache.log4net.Extensions.Logging" Version="2.0.0.12" />
-      <PackageReference Include="log4net" Version="2.0.15" />
+      <PackageReference Include="log4net" Version="3.0.2" />
       <PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
       <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3">
         <PrivateAssets>all</PrivateAssets>
         <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       </PackageReference>
-      <PackageReference Include="Terminal.Gui" Version="1.16.0" />
+      <PackageReference Include="Terminal.Gui" Version="1.17.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Console/Program.cs b/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,17 +57,16 @@ 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");
         _lastOsdpConfigFilePath = Environment.CurrentDirectory;
 
         var factory = new LoggerFactory();
         factory.AddLog4Net();
-        _panelLogger = factory.CreateLogger<ControlPanel>();
 
-        _controlPanel = new ControlPanel(_panelLogger);
+        _controlPanel = new ControlPanel(factory);
 
         _settings = GetConnectionSettings();
 
@@ -96,10 +94,8 @@ private static async Task Main()
                 new MenuItem("_Quit", "", () =>
                 {
                     SaveConfigurationSettings(_settings);
-
-                    Application.RequestStop();
-
-                    Environment.Exit(Environment.ExitCode);
+
+                    Application.Shutdown();
                 })
             }),
             new MenuBarItem("Co_nnections", new[]

diff --git a/src/OSDP.Net.Tests/ControlPanelTest.cs b/src/OSDP.Net.Tests/ControlPanelTest.cs
@@ -3,6 +3,7 @@
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
+using Microsoft.Extensions.Logging.Abstractions;
 using Moq;
 using NUnit.Framework;
 using OSDP.Net.Connections;
@@ -24,7 +25,7 @@ public async Task DeviceGoesOnlineTest()
             // Arrange
             var mockConnection = new MockConnection();
 
-            var panel = new ControlPanel();
+            var panel = new ControlPanel(NullLoggerFactory.Instance);
             Guid id = panel.StartConnection(mockConnection.Object);
             panel.AddDevice(id, 0, true, false);
 
@@ -40,7 +41,7 @@ public async Task ShutdownTest()
             // Arrange
             var mockConnection = new MockConnection();
 
-            var panel = new ControlPanel();
+            var panel = new ControlPanel(NullLoggerFactory.Instance);
             Guid id = panel.StartConnection(mockConnection.Object);
             panel.AddDevice(id, 0, true, false);
 
@@ -59,7 +60,7 @@ public async Task StartConnectionTest()
         {
             // Arrange
             var mockConnection = new MockConnection();
-            var panel = new ControlPanel();
+            var panel = new ControlPanel(NullLoggerFactory.Instance);
 
             // Act
             Guid id = panel.StartConnection(mockConnection.Object);
@@ -75,7 +76,7 @@ public void StartConnectionWithSameConnectionTwiceTest()
         {
             // Arrange
             var mockConnection = new MockConnection();
-            var panel = new ControlPanel();
+            var panel = new ControlPanel(NullLoggerFactory.Instance);
             var id = panel.StartConnection(mockConnection.Object);
 
             // Act/Assert
@@ -91,7 +92,7 @@ public void StartSameConnectionConcurrentlyShouldOnlyStartItOnce()
             // Arrange
             var mockConnection = new MockConnection();
             var instance = mockConnection.Object;
-            var panel = new ControlPanel();
+            var panel = new ControlPanel(NullLoggerFactory.Instance);
 
             // Act
             var tasks = Enumerable
@@ -115,7 +116,7 @@ public void StopSameConnectionConcurrentlyShouldSucceed()
         {
             // Arrange
             var mockConnection = new MockConnection();
-            var panel = new ControlPanel();
+            var panel = new ControlPanel(NullLoggerFactory.Instance);
             var id = panel.StartConnection(mockConnection.Object);
 
             // Act
@@ -139,7 +140,7 @@ public async Task StartConnectionRestartWithSameConnectionTest()
         {
             // Arrange
             var mockConnection = new MockConnection();
-            var panel = new ControlPanel();
+            var panel = new ControlPanel(NullLoggerFactory.Instance);
 
             // Act
             var id1 = panel.StartConnection(mockConnection.Object);
@@ -157,7 +158,7 @@ public async Task StopConnectionTest()
         {
             // Arrange
             var mockConnection = new MockConnection();
-            var panel = new ControlPanel();
+            var panel = new ControlPanel(NullLoggerFactory.Instance);
 
             Guid id = panel.StartConnection(mockConnection.Object);
             panel.AddDevice(id, 0, true, false);
@@ -178,7 +179,7 @@ public class IdRequestCommandTest
             [Test]
             public async Task ReturnsValidReportTest()
             {
-                var panel = new ControlPanel(GlobalSetup.CreateLogger<ControlPanel>());
+                var panel = new ControlPanel(NullLoggerFactory.Instance);
                 var idReportCommand = new IdReport();
                 var deviceIdentificationReply =
                     new DeviceIdentification([0x5C, 0x26, 0x23], 0x19, 0x02, 719912960, 0x03, 0x00, 0x00);
@@ -203,7 +204,7 @@ public async Task ReturnsValidReportTest()
             [Test]
             public void ThrowOnNakReplyTest()
             {
-                var panel = new ControlPanel(GlobalSetup.CreateLogger<ControlPanel>());
+                var panel = new ControlPanel(NullLoggerFactory.Instance);
                 var idReportCommand = new IdReport();
                 var nakReply = new Nak(ErrorCode.UnknownCommandCode);
 

diff --git a/src/OSDP.Net.Tests/Global.cs b/src/OSDP.Net.Tests/Global.cs
diff --git a/src/OSDP.Net.Tests/IntegrationTests/PeripheryDeviceTest.cs b/src/OSDP.Net.Tests/IntegrationTests/PeripheryDeviceTest.cs
@@ -11,7 +11,6 @@
 
 namespace OSDP.Net.Tests.IntegrationTests;
 
-
 //
 // NOTE: Majority of naming/structure in this file is very much a work-in-progress
 // and will be updated if we continue to build out a set of integration tests

diff --git a/src/OSDP.Net.Tests/OSDP.Net.Tests.csproj b/src/OSDP.Net.Tests/OSDP.Net.Tests.csproj
@@ -10,9 +10,9 @@
 
     <ItemGroup>
         <PackageReference Include="apache.log4net.Extensions.Logging" Version="2.0.0.12" />
-        <PackageReference Include="log4net" Version="2.0.15" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+        <PackageReference Include="log4net" Version="3.0.2" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
         <PackageReference Include="Microsoft.NETCore.Platforms" Version="7.0.4" />
         <PackageReference Include="Moq" Version="4.20.69" />
         <PackageReference Include="nunit" Version="3.13.3" />

diff --git a/src/OSDP.Net/Bus.cs b/src/OSDP.Net/Bus.cs
@@ -13,6 +13,7 @@
 using OSDP.Net.Model.CommandData;
 using OSDP.Net.Model.ReplyData;
 using OSDP.Net.Tracing;
+
 #if NETSTANDARD2_0
 using OSDP.Net.Utilities;
 #endif

diff --git a/src/OSDP.Net/ControlPanel.cs b/src/OSDP.Net/ControlPanel.cs
@@ -6,6 +6,7 @@
 using System.Threading;
 using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
 using OSDP.Net.Connections;
 using OSDP.Net.Messages;
 using OSDP.Net.Model.CommandData;
@@ -37,11 +38,32 @@ public class ControlPanel
 
         /// <summary>Initializes a new instance of the <see cref="T:OSDP.Net.ControlPanel" /> class.</summary>
         /// <param name="logger">The logger definition used for logging.</param>
+        [Obsolete("Sending a ILogger is deprecated, please send ILoggerFactory instead.")]
         public ControlPanel(ILogger<ControlPanel> logger = null) : this(null, logger) { }
 
+        /// <summary>Initializes a new instance of the <see cref="T:OSDP.Net.ControlPanel" /> class.</summary>
+        /// <param name="loggerFactory">The logger factory used to create logging facilities.</param>
+        public ControlPanel(ILoggerFactory loggerFactory = null) : this(null, loggerFactory) { }
+
         internal ControlPanel(IDeviceProxyFactory deviceProxyFactory, ILogger<ControlPanel> logger = null)
         {
-            _logger = logger;
+            _logger = logger ?? NullLoggerFactory.Instance.CreateLogger<ControlPanel>();
+            _deviceProxyFactory = deviceProxyFactory ?? new DeviceProxyFactory();
+
+            Task.Factory.StartNew(() =>
+            {
+                foreach (var reply in _replies.GetConsumingEnumerable())
+                {
+                    OnReplyReceived(reply);
+                }
+            }, TaskCreationOptions.LongRunning);
+        }
+
+        internal ControlPanel(IDeviceProxyFactory deviceProxyFactory, ILoggerFactory loggerFactory = null)
+        {
+            _logger = loggerFactory != null
+                ? loggerFactory.CreateLogger<ControlPanel>()
+                : NullLoggerFactory.Instance.CreateLogger<ControlPanel>();
             _deviceProxyFactory = deviceProxyFactory ?? new DeviceProxyFactory();
 
             Task.Factory.StartNew(() =>

diff --git a/src/OSDP.Net/OSDP.Net.csproj b/src/OSDP.Net/OSDP.Net.csproj
@@ -25,14 +25,17 @@
     <None Include="Images\icon.png" Pack="true" PackagePath="" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup  Condition="'$(TargetFramework)' == 'netstandard2.0'">
     <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
-    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.0" />
+    <PackageReference Include="System.Text.Json" Version="8.0.5" />
     <PackageReference Include="System.Collections" Version="4.3.0" />
-    <PackageReference Include="System.IO.Ports" Version="8.0.0" />
     <PackageReference Include="System.Memory" Version="4.5.5" />
-    <PackageReference Include="System.Text.Json" Version="8.0.4" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="8.0.2" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0" PrivateAssets="All" />
+    <PackageReference Include="System.IO.Ports" Version="8.0.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/samples/CardReader/CardReader.csproj b/src/samples/CardReader/CardReader.csproj
@@ -14,9 +14,9 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.0" />
-        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging" Version="8.0.1" />
+        <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/samples/PivDataReader/PivDataReader.csproj b/src/samples/PivDataReader/PivDataReader.csproj
@@ -14,8 +14,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <PackageReference Include="Microsoft.Extensions.Configuration" Version="7.0.0" />
-      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration" Version="8.0.0" />
+      <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/samples/PivDataReader/Program.cs b/src/samples/PivDataReader/Program.cs
@@ -1,4 +1,5 @@
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.Logging.Abstractions;
 using OSDP.Net;
 using OSDP.Net.Connections;
 using OSDP.Net.Model.CommandData;
@@ -30,7 +31,7 @@ private static async Task Main()
         byte elementId = Convert.FromHexString(pivDataSection["ElementId"]!)[0];
         ushort offset = ushort.Parse(pivDataSection["Offset"]!);
 
-        var panel = new ControlPanel();
+        var panel = new ControlPanel(NullLoggerFactory.Instance);
         panel.ConnectionStatusChanged += async (_, eventArgs) =>
         {
             Console.WriteLine();
-Original file line number
+Diff line change
@@ Expand Up / @@ -11,7 +11,6 @@ @@
     namespace OSDP.Net.Tests.IntegrationTests;
     //
     // NOTE: Majority of naming/structure in this file is very much a work-in-progress
     // and will be updated if we continue to build out a set of integration tests
@@ Expand Down @@