Merge branch 'master' into patch-2

3 files changed, 25 insertions, 12 deletions

diff --git a/MediaBrowser.Model/System/PublicSystemInfo.cs b/MediaBrowser.Model/System/PublicSystemInfo.cs
index b6196a43f..53030843a 100644
--- a/MediaBrowser.Model/System/PublicSystemInfo.cs
+++ b/MediaBrowser.Model/System/PublicSystemInfo.cs
@@ -24,7 +24,7 @@ namespace MediaBrowser.Model.System
         public string Version { get; set; }
 
         /// <summary>
-        /// The product name. This is the AssemblyProduct name.
+        /// Gets or sets the product name. This is the AssemblyProduct name.
         /// </summary>
         public string ProductName { get; set; }
 
@@ -39,5 +39,14 @@ namespace MediaBrowser.Model.System
         /// </summary>
         /// <value>The id.</value>
         public string Id { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether the startup wizard is completed.
+        /// </summary>
+        /// <remarks>
+        /// Nullable for OpenAPI specification only to retain backwards compatibility in apiclients.
+        /// </remarks>
+        /// <value>The startup completion status.</value>]
+        public bool? StartupWizardCompleted { get; set; }
     }
 }
diff --git a/MediaBrowser.Model/System/SystemInfo.cs b/MediaBrowser.Model/System/SystemInfo.cs
index 18ca74ee3..e45b2f33a 100644
--- a/MediaBrowser.Model/System/SystemInfo.cs
+++ b/MediaBrowser.Model/System/SystemInfo.cs
@@ -14,13 +14,16 @@ namespace MediaBrowser.Model.System
     {
         /// <summary>No path to FFmpeg found.</summary>
         NotFound,
+
         /// <summary>Path supplied via command line using switch --ffmpeg.</summary>
         SetByArgument,
+
         /// <summary>User has supplied path via Transcoding UI page.</summary>
         Custom,
+
         /// <summary>FFmpeg tool found on system $PATH.</summary>
         System
-    };
+    }
 
     /// <summary>
     /// Class SystemInfo.
@@ -28,13 +31,21 @@ namespace MediaBrowser.Model.System
     public class SystemInfo : PublicSystemInfo
     {
         /// <summary>
+        /// Initializes a new instance of the <see cref="SystemInfo" /> class.
+        /// </summary>
+        public SystemInfo()
+        {
+            CompletedInstallations = Array.Empty<InstallationInfo>();
+        }
+
+        /// <summary>
         /// Gets or sets the display name of the operating system.
         /// </summary>
         /// <value>The display name of the operating system.</value>
         public string OperatingSystemDisplayName { get; set; }
 
         /// <summary>
-        /// Get or sets the package name.
+        /// Gets or sets the package name.
         /// </summary>
         /// <value>The value of the '-package' command line argument.</value>
         public string PackageName { get; set; }
@@ -119,18 +130,11 @@ namespace MediaBrowser.Model.System
         /// Gets or sets a value indicating whether this instance has update available.
         /// </summary>
         /// <value><c>true</c> if this instance has update available; otherwise, <c>false</c>.</value>
+        [Obsolete("This should be handled by the package manager")]
         public bool HasUpdateAvailable { get; set; }
 
         public FFmpegLocation EncoderLocation { get; set; }
 
         public Architecture SystemArchitecture { get; set; }
-
-        /// <summary>
-        /// Initializes a new instance of the <see cref="SystemInfo" /> class.
-        /// </summary>
-        public SystemInfo()
-        {
-            CompletedInstallations = Array.Empty<InstallationInfo>();
-        }
     }
 }
diff --git a/MediaBrowser.Model/System/WakeOnLanInfo.cs b/MediaBrowser.Model/System/WakeOnLanInfo.cs
index b2cbe737d..aba19a6ba 100644
--- a/MediaBrowser.Model/System/WakeOnLanInfo.cs
+++ b/MediaBrowser.Model/System/WakeOnLanInfo.cs
@@ -36,7 +36,7 @@ namespace MediaBrowser.Model.System
         /// Gets the MAC address of the device.
         /// </summary>
         /// <value>The MAC address.</value>
-        public string? MacAddress { get; set; }
+        public string? MacAddress { get; }
 
         /// <summary>
         /// Gets or sets the wake-on-LAN port.