Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -85,6 +85,7 @@
     <Compile Include="Serialization\IProtobufSerializer.cs" />
     <Compile Include="Serialization\IXmlSerializer.cs" />
     <Compile Include="Updates\CheckForUpdateResult.cs" />
+    <Compile Include="Updates\PackageTargetSystem.cs" />
     <Compile Include="Updates\InstallationInfo.cs" />
     <Compile Include="Updates\PackageType.cs" />
     <Compile Include="Updates\PackageVersionClass.cs" />

MediaBrowser.Model/Updates/PackageInfo.cs

@@ -115,25 +115,32 @@ namespace MediaBrowser.Model.Updates
         [ProtoMember(15)]
         public float price { get; set; }
 
+        /// <summary>
+        /// Gets or sets the target system for this plug-in (Server, MBTheater, MBClassic).
+        /// </summary>
+        /// <value>The target system.</value>
+        [ProtoMember(16)]
+        public PackageTargetSystem targetSystem { get; set; }
+
         /// <summary>
         /// Gets or sets whether or not this package is registered.
         /// </summary>
         /// <value>True if registered.</value>
-        [ProtoMember(16)]
+        [ProtoMember(17)]
         public bool isRegistered { get; set; }
 
         /// <summary>
         /// Gets or sets the expiration date for this package.
         /// </summary>
         /// <value>Expiration Date.</value>
-        [ProtoMember(17)]
+        [ProtoMember(18)]
         public DateTime expDate { get; set; }
 
         /// <summary>
         /// Gets or sets the versions.
         /// </summary>
         /// <value>The versions.</value>
-        [ProtoMember(18)]
+        [ProtoMember(19)]
         public List<PackageVersionInfo> versions { get; set; }
     }
 }

MediaBrowser.Model/Updates/PackageTargetSystem.cs

@@ -0,0 +1,21 @@
+namespace MediaBrowser.Model.Updates
+{
+    /// <summary>
+    /// Enum PackageType
+    /// </summary>
+    public enum PackageTargetSystem
+    {
+        /// <summary>
+        /// Server
+        /// </summary>
+        Server,
+        /// <summary>
+        /// MB Theater
+        /// </summary>
+        MBTheater,
+        /// <summary>
+        /// MB Classic
+        /// </summary>
+        MBClassic
+    }
+}

MediaBrowser.sln

@@ -205,7 +205,4 @@ Global
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
-	GlobalSection(Performance) = preSolution
-		HasPerformanceSessions = true
-	EndGlobalSection
 EndGlobal