Merge remote-tracking branch 'upstream/master' into hwaccel

4 files changed, 17 insertions, 18 deletions

diff --git a/MediaBrowser.Model/System/LogFile.cs b/MediaBrowser.Model/System/LogFile.cs
index a2b7016648..aec910c92c 100644
--- a/MediaBrowser.Model/System/LogFile.cs
+++ b/MediaBrowser.Model/System/LogFile.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System;
diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs
index 1775470b54..b6196a43fc 100644
--- a/MediaBrowser.Model/System/PublicSystemInfo.cs
+++ b/MediaBrowser.Model/System/PublicSystemInfo.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 namespace MediaBrowser.Model.System
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index f2c5aa1e39..a67c38c3ac 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -1,3 +1,4 @@
+#nullable disable
 #pragma warning disable CS1591
 
 using System;
@@ -32,7 +33,6 @@ namespace MediaBrowser.Model.System
         /// <value>The display name of the operating system.</value>
         public string OperatingSystemDisplayName { get; set; }
 
-
         /// <summary>
         /// Get or sets the package name.
         /// </summary>
diff --git a/MediaBrowser.Model/System/WakeOnLanInfo.cs b/MediaBrowser.Model/System/WakeOnLanInfo.cs
index 534ad19ecc..b2cbe737d1 100644
--- a/MediaBrowser.Model/System/WakeOnLanInfo.cs
+++ b/MediaBrowser.Model/System/WakeOnLanInfo.cs
@@ -8,35 +8,20 @@ namespace MediaBrowser.Model.System
     public class WakeOnLanInfo
     {
         /// <summary>
-        /// Returns the MAC address of the device.
-        /// </summary>
-        /// <value>The MAC address.</value>
-        public string MacAddress { get; set; }
-
-        /// <summary>
-        /// Returns the wake-on-LAN port.
-        /// </summary>
-        /// <value>The wake-on-LAN port.</value>
-        public int Port { get; set; }
-
-        /// <summary>
         /// Initializes a new instance of the <see cref="WakeOnLanInfo" /> class.
         /// </summary>
         /// <param name="macAddress">The MAC address.</param>
-        public WakeOnLanInfo(PhysicalAddress macAddress)
+        public WakeOnLanInfo(PhysicalAddress macAddress) : this(macAddress.ToString())
         {
-            MacAddress = macAddress.ToString();
-            Port = 9;
         }
 
         /// <summary>
         /// Initializes a new instance of the <see cref="WakeOnLanInfo" /> class.
         /// </summary>
         /// <param name="macAddress">The MAC address.</param>
-        public WakeOnLanInfo(string macAddress)
+        public WakeOnLanInfo(string macAddress) : this()
         {
             MacAddress = macAddress;
-            Port = 9;
         }
 
         /// <summary>
@@ -46,5 +31,17 @@ namespace MediaBrowser.Model.System
         {
             Port = 9;
         }
+
+        /// <summary>
+        /// Gets the MAC address of the device.
+        /// </summary>
+        /// <value>The MAC address.</value>
+        public string? MacAddress { get; set; }
+
+        /// <summary>
+        /// Gets or sets the wake-on-LAN port.
+        /// </summary>
+        /// <value>The wake-on-LAN port.</value>
+        public int Port { get; set; }
     }
 }