From 4f77e18e860dbf57d02d1dfa8a70a0e4cedf91d9 Mon Sep 17 00:00:00 2001
From: Eric Reed <ebr@mediabrowser3.com>
Date: Tue, 26 Feb 2013 10:39:55 -0500
Subject: Add SystemUpdateLevel back to server config

We get this back with the new installer/update mechanism
---
 MediaBrowser.Model/Configuration/ServerConfiguration.cs | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

(limited to 'MediaBrowser.Model/Configuration/ServerConfiguration.cs')

diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 56bc43425..0922e0d15 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -1,4 +1,5 @@
-using MediaBrowser.Model.Weather;
+using MediaBrowser.Model.Updates;
+using MediaBrowser.Model.Weather;
 using ProtoBuf;
 using System;
 
@@ -298,8 +299,14 @@ namespace MediaBrowser.Model.Configuration
         /// <value><c>true</c> if [enable developer tools]; otherwise, <c>false</c>.</value>
         [ProtoMember(57)]
         public bool EnableDeveloperTools { get; set; }
+
+        /// <summary>
+        /// Gets of sets a value indicating the level of system updates (Release, Beta, Dev)
+        /// </summary>
+        [ProtoMember(59)]
+        public PackageVersionClass SystemUpdateLevel { get; set; }
         
-        // Next Proto number ====> 59
+        // Next Proto number ====> 60
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
-- 
cgit v1.2.3


From c76c74fb24c471218a43cb3538080f3c86dabfba Mon Sep 17 00:00:00 2001
From: Eric Reed <ebr@mediabrowser3.com>
Date: Tue, 26 Feb 2013 11:02:16 -0500
Subject: Should have been in base config

---
 MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs | 9 ++++++++-
 MediaBrowser.Model/Configuration/ServerConfiguration.cs          | 8 +-------
 2 files changed, 9 insertions(+), 8 deletions(-)

(limited to 'MediaBrowser.Model/Configuration/ServerConfiguration.cs')

diff --git a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
index 61b177df9..474d985f2 100644
--- a/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs
@@ -1,4 +1,5 @@
-using ProtoBuf;
+using MediaBrowser.Model.Updates;
+using ProtoBuf;
 
 namespace MediaBrowser.Model.Configuration
 {
@@ -38,6 +39,12 @@ namespace MediaBrowser.Model.Configuration
         [ProtoMember(3)]
         public bool EnableAutoUpdate { get; set; }
 
+        /// <summary>
+        /// Gets of sets a value indicating the level of system updates (Release, Beta, Dev)
+        /// </summary>
+        [ProtoMember(60)]
+        public PackageVersionClass SystemUpdateLevel { get; set; }
+
         /// <summary>
         /// The number of days we should retain log files
         /// </summary>
diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
index 0922e0d15..71f368397 100644
--- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs
+++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs
@@ -300,13 +300,7 @@ namespace MediaBrowser.Model.Configuration
         [ProtoMember(57)]
         public bool EnableDeveloperTools { get; set; }
 
-        /// <summary>
-        /// Gets of sets a value indicating the level of system updates (Release, Beta, Dev)
-        /// </summary>
-        [ProtoMember(59)]
-        public PackageVersionClass SystemUpdateLevel { get; set; }
-        
-        // Next Proto number ====> 60
+        // Next Proto number ====> 61
 
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
-- 
cgit v1.2.3