removed unused attributes

MediaBrowser.Controller/Entities/UserItemData.cs

@@ -1,5 +1,4 @@
-using ProtoBuf;
-using System;
+using System;
 using System.Runtime.Serialization;
 
 namespace MediaBrowser.Controller.Entities
@@ -7,14 +6,12 @@ namespace MediaBrowser.Controller.Entities
     /// <summary>
     /// Class UserItemData
     /// </summary>
-    [ProtoContract]
     public class UserItemData
     {
         /// <summary>
         /// Gets or sets the user id.
         /// </summary>
         /// <value>The user id.</value>
-        [ProtoMember(1)]
         public Guid UserId { get; set; }
 
         /// <summary>
@@ -27,7 +24,6 @@ namespace MediaBrowser.Controller.Entities
         /// <value>The rating.</value>
         /// <exception cref="System.ArgumentOutOfRangeException">A 0-10 rating is required for UserItemData.</exception>
         /// <exception cref="System.InvalidOperationException">A 0-10 rating is required for UserItemData.</exception>
-        [ProtoMember(2)]
         public float? Rating
         {
             get
@@ -52,35 +48,30 @@ namespace MediaBrowser.Controller.Entities
         /// Gets or sets the playback position ticks.
         /// </summary>
         /// <value>The playback position ticks.</value>
-        [ProtoMember(3)]
         public long PlaybackPositionTicks { get; set; }
 
         /// <summary>
         /// Gets or sets the play count.
         /// </summary>
         /// <value>The play count.</value>
-        [ProtoMember(4)]
         public int PlayCount { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is favorite.
         /// </summary>
         /// <value><c>true</c> if this instance is favorite; otherwise, <c>false</c>.</value>
-        [ProtoMember(5)]
         public bool IsFavorite { get; set; }
 
         /// <summary>
         /// Gets or sets the last played date.
         /// </summary>
         /// <value>The last played date.</value>
-        [ProtoMember(6)]
         public DateTime? LastPlayedDate { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this <see cref="UserItemData" /> is played.
         /// </summary>
         /// <value><c>true</c> if played; otherwise, <c>false</c>.</value>
-        [ProtoMember(7)]
         public bool Played { get; set; }
 
         /// <summary>

MediaBrowser.Controller/MediaBrowser.Controller.csproj

@@ -53,9 +53,6 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="protobuf-net">
-      <HintPath>..\packages\protobuf-net.2.0.0.621\lib\net40\protobuf-net.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
@@ -199,9 +196,6 @@
       <Name>MediaBrowser.Model</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <PropertyGroup>
     <PostBuildEvent>if $(ConfigurationName) == Release (

MediaBrowser.Controller/packages.config

@@ -1,4 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<packages>
-  <package id="protobuf-net" version="2.0.0.621" targetFramework="net45" />
-</packages>

MediaBrowser.Model/Configuration/BaseApplicationConfiguration.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Updates;
-using ProtoBuf;
 
 namespace MediaBrowser.Model.Configuration
 {
@@ -8,48 +7,41 @@ namespace MediaBrowser.Model.Configuration
     /// ProtoInclude tells Protobuf about subclasses,
     /// The number 50 can be any number, so long as it doesn't clash with any of the ProtoMember numbers either here or in subclasses.
     /// </summary>
-    [ProtoContract, ProtoInclude(965, typeof(ServerConfiguration))]
     public class BaseApplicationConfiguration
     {
         /// <summary>
         /// Gets or sets a value indicating whether [enable debug level logging].
         /// </summary>
         /// <value><c>true</c> if [enable debug level logging]; otherwise, <c>false</c>.</value>
-        [ProtoMember(1)]
         public bool EnableDebugLevelLogging { get; set; }
 
         /// <summary>
         /// Enable automatically and silently updating of the application
         /// </summary>
         /// <value><c>true</c> if [enable auto update]; otherwise, <c>false</c>.</value>
-        [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>
         /// <value>The log file retention days.</value>
-        [ProtoMember(5)]
         public int LogFileRetentionDays { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether [run at startup].
         /// </summary>
         /// <value><c>true</c> if [run at startup]; otherwise, <c>false</c>.</value>
-        [ProtoMember(58)]
         public bool RunAtStartup { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is first run.
         /// </summary>
         /// <value><c>true</c> if this instance is first run; otherwise, <c>false</c>.</value>
-        [ProtoMember(4)]
         public bool IsStartupWizardCompleted { get; set; }
         
         /// <summary>

MediaBrowser.Model/Configuration/ServerConfiguration.cs

@@ -1,6 +1,5 @@
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.Weather;
-using ProtoBuf;
 using System;
 
 namespace MediaBrowser.Model.Configuration
@@ -8,212 +7,181 @@ namespace MediaBrowser.Model.Configuration
     /// <summary>
     /// Represents the server configuration.
     /// </summary>
-    [ProtoContract]
     public class ServerConfiguration : BaseApplicationConfiguration
     {
         /// <summary>
         /// Gets or sets a value indicating whether [enable HTTP level logging].
         /// </summary>
         /// <value><c>true</c> if [enable HTTP level logging]; otherwise, <c>false</c>.</value>
-        [ProtoMember(56)]
         public bool EnableHttpLevelLogging { get; set; }
 
         /// <summary>
         /// Gets or sets the HTTP server port number.
         /// </summary>
         /// <value>The HTTP server port number.</value>
-        [ProtoMember(2)]
         public int HttpServerPortNumber { get; set; }
 
         /// <summary>
         /// Gets or sets the legacy web socket port number.
         /// </summary>
         /// <value>The legacy web socket port number.</value>
-        [ProtoMember(59)]
         public int LegacyWebSocketPortNumber { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether [enable internet providers].
         /// </summary>
         /// <value><c>true</c> if [enable internet providers]; otherwise, <c>false</c>.</value>
-        [ProtoMember(6)]
         public bool EnableInternetProviders { get; set; }
 
         /// <summary>
         /// Gets or sets the zip code to use when displaying weather
         /// </summary>
         /// <value>The weather location.</value>
-        [ProtoMember(7)]
         public string WeatherLocation { get; set; }
 
         /// <summary>
         /// Gets or sets the weather unit to use when displaying weather
         /// </summary>
         /// <value>The weather unit.</value>
-        [ProtoMember(8)]
         public WeatherUnits WeatherUnit { get; set; }
 
         /// <summary>
         /// Gets or sets the metadata refresh days.
         /// </summary>
         /// <value>The metadata refresh days.</value>
-        [ProtoMember(9)]
         public int MetadataRefreshDays { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether [save local meta].
         /// </summary>
         /// <value><c>true</c> if [save local meta]; otherwise, <c>false</c>.</value>
-        [ProtoMember(10)]
         public bool SaveLocalMeta { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether [refresh item images].
         /// </summary>
         /// <value><c>true</c> if [refresh item images]; otherwise, <c>false</c>.</value>
-        [ProtoMember(11)]
         public bool RefreshItemImages { get; set; }
 
         /// <summary>
         /// Gets or sets the preferred metadata language.
         /// </summary>
         /// <value>The preferred metadata language.</value>
-        [ProtoMember(12)]
         public string PreferredMetadataLanguage { get; set; }
 
         /// <summary>
         /// Gets or sets the metadata country code.
         /// </summary>
         /// <value>The metadata country code.</value>
-        [ProtoMember(13)]
         public string MetadataCountryCode { get; set; }
 
         /// <summary>
         /// Gets or sets the size of the TMDB fetched poster.
         /// </summary>
         /// <value>The size of the TMDB fetched poster.</value>
-        [ProtoMember(14)]
         public string TmdbFetchedPosterSize { get; set; }
 
         /// <summary>
         /// Gets or sets the size of the TMDB fetched profile.
         /// </summary>
         /// <value>The size of the TMDB fetched profile.</value>
-        [ProtoMember(15)]
         public string TmdbFetchedProfileSize { get; set; }
 
         /// <summary>
         /// Gets or sets the size of the TMDB fetched backdrop.
         /// </summary>
         /// <value>The size of the TMDB fetched backdrop.</value>
-        [ProtoMember(16)]
         public string TmdbFetchedBackdropSize { get; set; }
 
         /// <summary>
         /// Gets or sets the max backdrops.
         /// </summary>
         /// <value>The max backdrops.</value>
-        [ProtoMember(17)]
         public int MaxBackdrops { get; set; }
 
         /// <summary>
         /// Options for specific art to download for movies.
         /// </summary>
-        [ProtoMember(40)]
         public ImageDownloadOptions DownloadMovieImages { get; set; }
 
         /// <summary>
         /// Options for specific art to download for Series.
         /// </summary>
-        [ProtoMember(41)]
         public ImageDownloadOptions DownloadSeriesImages { get; set; }
 
         /// <summary>
         /// Options for specific art to download for Seasons.
         /// </summary>
-        [ProtoMember(42)]
         public ImageDownloadOptions DownloadSeasonImages { get; set; }
 
         /// <summary>
         /// Options for specific art to download for MusicArtists.
         /// </summary>
-        [ProtoMember(43)]
         public ImageDownloadOptions DownloadMusicArtistImages { get; set; }
 
         /// <summary>
         /// Options for specific art to download for MusicAlbums.
         /// </summary>
-        [ProtoMember(44)]
         public ImageDownloadOptions DownloadMusicAlbumImages { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether [download TV season backdrops].
         /// </summary>
         /// <value><c>true</c> if [download TV season banner]; otherwise, <c>false</c>.</value>
-        [ProtoMember(52)]
         public bool DownloadHDFanArt { get; set; }
 
         /// <summary>
         /// Characters to be replaced with a ' ' in strings to create a sort name
         /// </summary>
         /// <value>The sort replace characters.</value>
-        [ProtoMember(27)]
         public string[] SortReplaceCharacters { get; set; }
 
         /// <summary>
         /// Characters to be removed from strings to create a sort name
         /// </summary>
         /// <value>The sort remove characters.</value>
-        [ProtoMember(28)]
         public string[] SortRemoveCharacters { get; set; }
 
         /// <summary>
         /// Words to be removed from strings to create a sort name
         /// </summary>
         /// <value>The sort remove words.</value>
-        [ProtoMember(29)]
         public string[] SortRemoveWords { get; set; }
 
         /// <summary>
         /// Show an output log window for debugging
         /// </summary>
         /// <value><c>true</c> if [show log window]; otherwise, <c>false</c>.</value>
-        [ProtoMember(30)]
         public bool ShowLogWindow { get; set; }
 
         /// <summary>
         /// The list of types that will NOT be allowed to have internet providers run against them even if they are turned on.
         /// </summary>
         /// <value>The internet provider exclude types.</value>
-        [ProtoMember(32)]
         public string[] InternetProviderExcludeTypes { get; set; }
 
         /// <summary>
         /// Gets or sets the recent item days.
         /// </summary>
         /// <value>The recent item days.</value>
-        [ProtoMember(34)]
         public int RecentItemDays { get; set; }
 
         /// <summary>
         /// Gets or sets the minimum percentage of an item that must be played in order for playstate to be updated.
         /// </summary>
         /// <value>The min resume PCT.</value>
-        [ProtoMember(36)]
         public int MinResumePct { get; set; }
 
         /// <summary>
         /// Gets or sets the maximum percentage of an item that can be played while still saving playstate. If this percentage is crossed playstate will be reset to the beginning and the item will be marked watched.
         /// </summary>
         /// <value>The max resume PCT.</value>
-        [ProtoMember(37)]
         public int MaxResumePct { get; set; }
 
         /// <summary>
         /// Gets or sets the minimum duration that an item must have in order to be eligible for playstate updates..
         /// </summary>
         /// <value>The min resume duration seconds.</value>
-        [ProtoMember(38)]
         public int MinResumeDurationSeconds { get; set; }
 
         /// <summary>
@@ -222,14 +190,12 @@ namespace MediaBrowser.Model.Configuration
         /// different directories and files.
         /// </summary>
         /// <value>The file watcher delay.</value>
-        [ProtoMember(55)]
         public int FileWatcherDelay { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether [enable developer tools].
         /// </summary>
         /// <value><c>true</c> if [enable developer tools]; otherwise, <c>false</c>.</value>
-        [ProtoMember(57)]
         public bool EnableDeveloperTools { get; set; }
 
         /// <summary>
@@ -237,18 +203,14 @@ namespace MediaBrowser.Model.Configuration
         /// Allows potential contributors without visual studio to modify production dashboard code and test changes.
         /// </summary>
         /// <value><c>true</c> if [enable dashboard response caching]; otherwise, <c>false</c>.</value>
-        [ProtoMember(61)]
         public bool EnableDashboardResponseCaching { get; set; }
 
         /// <summary>
         /// Allows the dashboard to be served from a custom path.
         /// </summary>
         /// <value>The dashboard source path.</value>
-        [ProtoMember(62)]
         public string DashboardSourcePath { get; set; }
 
-        // Next Proto number ====> 62
-
         /// <summary>
         /// Initializes a new instance of the <see cref="ServerConfiguration" /> class.
         /// </summary>

MediaBrowser.Model/Configuration/UserConfiguration.cs

@@ -1,53 +1,45 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.Configuration
 {
     /// <summary>
     /// Class UserConfiguration
     /// </summary>
-    [ProtoContract]
     public class UserConfiguration
     {
         /// <summary>
         /// Gets or sets the max parental rating.
         /// </summary>
         /// <value>The max parental rating.</value>
-        [ProtoMember(1)]
         public int? MaxParentalRating { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether [use custom library].
         /// </summary>
         /// <value><c>true</c> if [use custom library]; otherwise, <c>false</c>.</value>
-        [ProtoMember(2)]
         public bool UseCustomLibrary { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is administrator.
         /// </summary>
         /// <value><c>true</c> if this instance is administrator; otherwise, <c>false</c>.</value>
-        [ProtoMember(3)]
         public bool IsAdministrator { get; set; }
 
         /// <summary>
         /// Gets or sets the audio language preference.
         /// </summary>
         /// <value>The audio language preference.</value>
-        [ProtoMember(4)]
         public string AudioLanguagePreference { get; set; }
 
         /// <summary>
         /// Gets or sets the subtitle language preference.
         /// </summary>
         /// <value>The subtitle language preference.</value>
-        [ProtoMember(5)]
         public string SubtitleLanguagePreference { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether [use forced subtitles only].
         /// </summary>
         /// <value><c>true</c> if [use forced subtitles only]; otherwise, <c>false</c>.</value>
-        [ProtoMember(6)]
         public bool UseForcedSubtitlesOnly { get; set; }
         
         /// <summary>

MediaBrowser.Model/Connectivity/ClientConnectionInfo.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Entities;
-using ProtoBuf;
 using System;
 
 namespace MediaBrowser.Model.Connectivity
@@ -7,56 +6,48 @@ namespace MediaBrowser.Model.Connectivity
     /// <summary>
     /// Class ClientConnectionInfo
     /// </summary>
-    [ProtoContract]
     public class ClientConnectionInfo
     {
         /// <summary>
         /// Gets or sets the user id.
         /// </summary>
         /// <value>The user id.</value>
-        [ProtoMember(1)]
         public string UserId { get; set; }
 
         /// <summary>
         /// Gets or sets the type of the client.
         /// </summary>
         /// <value>The type of the client.</value>
-        [ProtoMember(2)]
         public string Client { get; set; }
 
         /// <summary>
         /// Gets or sets the last activity date.
         /// </summary>
         /// <value>The last activity date.</value>
-        [ProtoMember(3)]
         public DateTime LastActivityDate { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the device.
         /// </summary>
         /// <value>The name of the device.</value>
-        [ProtoMember(4)]
         public string DeviceName { get; set; }
 
         /// <summary>
         /// Gets or sets the now playing item.
         /// </summary>
         /// <value>The now playing item.</value>
-        [ProtoMember(5)]
         public BaseItemInfo NowPlayingItem { get; set; }
 
         /// <summary>
         /// Gets or sets the now playing position ticks.
         /// </summary>
         /// <value>The now playing position ticks.</value>
-        [ProtoMember(6)]
         public long? NowPlayingPositionTicks { get; set; }
 
         /// <summary>
         /// Gets or sets the device id.
         /// </summary>
         /// <value>The device id.</value>
-        [ProtoMember(7)]
         public string DeviceId { get; set; }
     }
 }

MediaBrowser.Model/DTO/BaseItemDto.cs

@@ -1,8 +1,7 @@
-using System.ComponentModel;
-using MediaBrowser.Model.Entities;
-using ProtoBuf;
+using MediaBrowser.Model.Entities;
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Runtime.Serialization;
 
 namespace MediaBrowser.Model.Dto
@@ -11,343 +10,294 @@ namespace MediaBrowser.Model.Dto
     /// This is strictly used as a data transfer object from the api layer.
     /// This holds information about a BaseItem in a format that is convenient for the client.
     /// </summary>
-    [ProtoContract]
     public class BaseItemDto : IHasProviderIds, INotifyPropertyChanged, IItemDto
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
-        [ProtoMember(2)]
         public string Id { get; set; }
 
         /// <summary>
         /// Gets or sets the date created.
         /// </summary>
         /// <value>The date created.</value>
-        [ProtoMember(3)]
         public DateTime? DateCreated { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the sort.
         /// </summary>
         /// <value>The name of the sort.</value>
-        [ProtoMember(4)]
         public string SortName { get; set; }
 
         /// <summary>
         /// Gets or sets the premiere date.
         /// </summary>
         /// <value>The premiere date.</value>
-        [ProtoMember(5)]
         public DateTime? PremiereDate { get; set; }
 
         /// <summary>
         /// Gets or sets the path.
         /// </summary>
         /// <value>The path.</value>
-        [ProtoMember(6)]
         public string Path { get; set; }
 
         /// <summary>
         /// Gets or sets the official rating.
         /// </summary>
         /// <value>The official rating.</value>
-        [ProtoMember(7)]
         public string OfficialRating { get; set; }
 
         /// <summary>
         /// Gets or sets the overview.
         /// </summary>
         /// <value>The overview.</value>
-        [ProtoMember(8)]
         public string Overview { get; set; }
 
         /// <summary>
         /// Gets or sets the taglines.
         /// </summary>
         /// <value>The taglines.</value>
-        [ProtoMember(9)]
         public List<string> Taglines { get; set; }
 
         /// <summary>
         /// Gets or sets the genres.
         /// </summary>
         /// <value>The genres.</value>
-        [ProtoMember(10)]
         public List<string> Genres { get; set; }
 
         /// <summary>
         /// Gets or sets the community rating.
         /// </summary>
         /// <value>The community rating.</value>
-        [ProtoMember(11)]
         public float? CommunityRating { get; set; }
 
         /// <summary>
         /// Gets or sets the run time ticks.
         /// </summary>
         /// <value>The run time ticks.</value>
-        [ProtoMember(12)]
         public long? RunTimeTicks { get; set; }
 
         /// <summary>
         /// Gets or sets the aspect ratio.
         /// </summary>
         /// <value>The aspect ratio.</value>
-        [ProtoMember(13)]
         public string AspectRatio { get; set; }
 
         /// <summary>
         /// Gets or sets the production year.
         /// </summary>
         /// <value>The production year.</value>
-        [ProtoMember(14)]
         public int? ProductionYear { get; set; }
 
         /// <summary>
         /// Gets or sets the index number.
         /// </summary>
         /// <value>The index number.</value>
-        [ProtoMember(15)]
         public int? IndexNumber { get; set; }
 
         /// <summary>
         /// Gets or sets the parent index number.
         /// </summary>
         /// <value>The parent index number.</value>
-        [ProtoMember(16)]
         public int? ParentIndexNumber { get; set; }
 
         /// <summary>
         /// Gets or sets the trailer urls.
         /// </summary>
         /// <value>The trailer urls.</value>
-        [ProtoMember(17)]
         public List<string> TrailerUrls { get; set; }
 
         /// <summary>
         /// Gets or sets the provider ids.
         /// </summary>
         /// <value>The provider ids.</value>
-        [ProtoMember(18)]
         public Dictionary<string, string> ProviderIds { get; set; }
 
         /// <summary>
         /// Gets or sets the language.
         /// </summary>
         /// <value>The language.</value>
-        [ProtoMember(24)]
         public string Language { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is folder.
         /// </summary>
         /// <value><c>true</c> if this instance is folder; otherwise, <c>false</c>.</value>
-        [ProtoMember(25)]
         public bool IsFolder { get; set; }
 
         /// <summary>
         /// Gets or sets the parent id.
         /// </summary>
         /// <value>The parent id.</value>
-        [ProtoMember(28)]
         public string ParentId { get; set; }
 
         /// <summary>
         /// Gets or sets the type.
         /// </summary>
         /// <value>The type.</value>
-        [ProtoMember(29)]
         public string Type { get; set; }
 
         /// <summary>
         /// Gets or sets the people.
         /// </summary>
         /// <value>The people.</value>
-        [ProtoMember(30)]
         public BaseItemPerson[] People { get; set; }
 
         /// <summary>
         /// Gets or sets the studios.
         /// </summary>
         /// <value>The studios.</value>
-        [ProtoMember(31)]
         public List<string> Studios { get; set; }
 
         /// <summary>
         /// If the item does not have a logo, this will hold the Id of the Parent that has one.
         /// </summary>
         /// <value>The parent logo item id.</value>
-        [ProtoMember(32)]
         public string ParentLogoItemId { get; set; }
 
         /// <summary>
         /// If the item does not have any backdrops, this will hold the Id of the Parent that has one.
         /// </summary>
         /// <value>The parent backdrop item id.</value>
-        [ProtoMember(33)]
         public string ParentBackdropItemId { get; set; }
 
         /// <summary>
         /// Gets or sets the parent backdrop image tags.
         /// </summary>
         /// <value>The parent backdrop image tags.</value>
-        [ProtoMember(34)]
         public List<Guid> ParentBackdropImageTags { get; set; }
 
         /// <summary>
         /// Gets or sets the local trailer count.
         /// </summary>
         /// <value>The local trailer count.</value>
-        [ProtoMember(35)]
         public int? LocalTrailerCount { get; set; }
 
         /// <summary>
         /// User data for this item based on the user it's being requested for
         /// </summary>
         /// <value>The user data.</value>
-        [ProtoMember(36)]
         public UserItemDataDto UserData { get; set; }
 
         /// <summary>
         /// Gets or sets the recently added item count.
         /// </summary>
         /// <value>The recently added item count.</value>
-        [ProtoMember(38)]
         public int? RecentlyAddedItemCount { get; set; }
 
         /// <summary>
         /// Gets or sets the played percentage.
         /// </summary>
         /// <value>The played percentage.</value>
-        [ProtoMember(41)]
         public double? PlayedPercentage { get; set; }
 
         /// <summary>
         /// Gets or sets the recursive item count.
         /// </summary>
         /// <value>The recursive item count.</value>
-        [ProtoMember(42)]
         public int? RecursiveItemCount { get; set; }
 
         /// <summary>
         /// Gets or sets the child count.
         /// </summary>
         /// <value>The child count.</value>
-        [ProtoMember(44)]
         public int? ChildCount { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the series.
         /// </summary>
         /// <value>The name of the series.</value>
-        [ProtoMember(45)]
         public string SeriesName { get; set; }
 
         /// <summary>
         /// Gets or sets the series id.
         /// </summary>
         /// <value>The series id.</value>
-        [ProtoMember(46)]
         public string SeriesId { get; set; }
 
         /// <summary>
         /// Gets or sets the special feature count.
         /// </summary>
         /// <value>The special feature count.</value>
-        [ProtoMember(48)]
         public int? SpecialFeatureCount { get; set; }
 
         /// <summary>
         /// Gets or sets the display preferences id.
         /// </summary>
         /// <value>The display preferences id.</value>
-        [ProtoMember(49)]
         public string DisplayPreferencesId { get; set; }
 
         /// <summary>
         /// Gets or sets the status.
         /// </summary>
         /// <value>The status.</value>
-        [ProtoMember(50)]
         public SeriesStatus? Status { get; set; }
 
         /// <summary>
         /// Gets or sets the air time.
         /// </summary>
         /// <value>The air time.</value>
-        [ProtoMember(51)]
         public string AirTime { get; set; }
 
         /// <summary>
         /// Gets or sets the air days.
         /// </summary>
         /// <value>The air days.</value>
-        [ProtoMember(52)]
         public List<DayOfWeek> AirDays { get; set; }
 
         /// <summary>
         /// Gets or sets the index options.
         /// </summary>
         /// <value>The index options.</value>
-        [ProtoMember(54)]
         public string[] IndexOptions { get; set; }
 
         /// <summary>
         /// Gets or sets the primary image aspect ratio.
         /// </summary>
         /// <value>The primary image aspect ratio.</value>
-        [ProtoMember(55)]
         public double? PrimaryImageAspectRatio { get; set; }
 
         /// <summary>
         /// Gets or sets the artist.
         /// </summary>
         /// <value>The artist.</value>
-        [ProtoMember(56)]
         public string Artist { get; set; }
 
         /// <summary>
         /// Gets or sets the album.
         /// </summary>
         /// <value>The album.</value>
-        [ProtoMember(57)]
         public string Album { get; set; }
 
         /// <summary>
         /// Gets or sets the album artist.
         /// </summary>
         /// <value>The album artist.</value>
-        [ProtoMember(58)]
         public string AlbumArtist { get; set; }
 
         /// <summary>
         /// Gets or sets the media streams.
         /// </summary>
         /// <value>The media streams.</value>
-        [ProtoMember(59)]
         public List<MediaStream> MediaStreams { get; set; }
 
         /// <summary>
         /// Gets or sets the type of the video.
         /// </summary>
         /// <value>The type of the video.</value>
-        [ProtoMember(60)]
         public VideoType? VideoType { get; set; }
 
         /// <summary>
         /// Gets or sets the display type of the media.
         /// </summary>
         /// <value>The display type of the media.</value>
-        [ProtoMember(61)]
         public string DisplayMediaType { get; set; }
 
         /// <summary>
@@ -374,98 +324,84 @@ namespace MediaBrowser.Model.Dto
         /// Gets or sets the image tags.
         /// </summary>
         /// <value>The image tags.</value>
-        [ProtoMember(62)]
         public Dictionary<ImageType, Guid> ImageTags { get; set; }
 
         /// <summary>
         /// Gets or sets the backdrop image tags.
         /// </summary>
         /// <value>The backdrop image tags.</value>
-        [ProtoMember(63)]
         public List<Guid> BackdropImageTags { get; set; }
 
         /// <summary>
         /// Gets or sets the parent logo image tag.
         /// </summary>
         /// <value>The parent logo image tag.</value>
-        [ProtoMember(64)]
         public Guid? ParentLogoImageTag { get; set; }
 
         /// <summary>
         /// Gets or sets the chapters.
         /// </summary>
         /// <value>The chapters.</value>
-        [ProtoMember(65)]
         public List<ChapterInfoDto> Chapters { get; set; }
 
         /// <summary>
         /// Gets or sets the video format.
         /// </summary>
         /// <value>The video format.</value>
-        [ProtoMember(66)]
         public VideoFormat? VideoFormat { get; set; }
 
         /// <summary>
         /// Gets or sets the type of the location.
         /// </summary>
         /// <value>The type of the location.</value>
-        [ProtoMember(67)]
         public LocationType LocationType { get; set; }
 
         /// <summary>
         /// Gets or sets the type of the iso.
         /// </summary>
         /// <value>The type of the iso.</value>
-        [ProtoMember(68)]
         public IsoType? IsoType { get; set; }
 
         /// <summary>
         /// Gets or sets the type of the media.
         /// </summary>
         /// <value>The type of the media.</value>
-        [ProtoMember(69)]
         public string MediaType { get; set; }
 
         /// <summary>
         /// Gets or sets the overview HTML.
         /// </summary>
         /// <value>The overview HTML.</value>
-        [ProtoMember(70)]
         public string OverviewHtml { get; set; }
 
         /// <summary>
         /// Gets or sets the end date.
         /// </summary>
         /// <value>The end date.</value>
-        [ProtoMember(71)]
         public DateTime? EndDate { get; set; }
 
         /// <summary>
         /// Gets or sets the home page URL.
         /// </summary>
         /// <value>The home page URL.</value>
-        [ProtoMember(72)]
         public string HomePageUrl { get; set; }
 
         /// <summary>
         /// Gets or sets the production locations.
         /// </summary>
         /// <value>The production locations.</value>
-        [ProtoMember(73)]
         public List<string> ProductionLocations { get; set; }
 
         /// <summary>
         /// Gets or sets the budget.
         /// </summary>
         /// <value>The budget.</value>
-        [ProtoMember(74)]
         public double? Budget { get; set; }
 
         /// <summary>
         /// Gets or sets the revenue.
         /// </summary>
         /// <value>The revenue.</value>
-        [ProtoMember(75)]
         public double? Revenue { get; set; }
         
         /// <summary>

MediaBrowser.Model/DTO/BaseItemPerson.cs

@@ -1,5 +1,4 @@
-using ProtoBuf;
-using System;
+using System;
 using System.ComponentModel;
 using System.Runtime.Serialization;
 
@@ -8,35 +7,30 @@ namespace MediaBrowser.Model.Dto
     /// <summary>
     /// This is used by the api to get information about a Person within a BaseItem
     /// </summary>
-    [ProtoContract]
     public class BaseItemPerson : INotifyPropertyChanged
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the role.
         /// </summary>
         /// <value>The role.</value>
-        [ProtoMember(2)]
         public string Role { get; set; }
 
         /// <summary>
         /// Gets or sets the type.
         /// </summary>
         /// <value>The type.</value>
-        [ProtoMember(3)]
         public string Type { get; set; }
 
         /// <summary>
         /// Gets or sets the primary image tag.
         /// </summary>
         /// <value>The primary image tag.</value>
-        [ProtoMember(4)]
         public Guid? PrimaryImageTag { get; set; }
 
         /// <summary>

MediaBrowser.Model/DTO/ChapterInfoDto.cs

@@ -1,5 +1,4 @@
-using ProtoBuf;
-using System;
+using System;
 using System.ComponentModel;
 using System.Runtime.Serialization;
 
@@ -8,28 +7,24 @@ namespace MediaBrowser.Model.Dto
     /// <summary>
     /// Class ChapterInfo
     /// </summary>
-    [ProtoContract]
     public class ChapterInfoDto : INotifyPropertyChanged
     {
         /// <summary>
         /// Gets or sets the start position ticks.
         /// </summary>
         /// <value>The start position ticks.</value>
-        [ProtoMember(1)]
         public long StartPositionTicks { get; set; }
 
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(2)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the image tag.
         /// </summary>
         /// <value>The image tag.</value>
-        [ProtoMember(3)]
         public Guid? ImageTag { get; set; }
 
         /// <summary>

MediaBrowser.Model/DTO/UserDto.cs

@@ -1,6 +1,5 @@
 using System.ComponentModel;
 using MediaBrowser.Model.Configuration;
-using ProtoBuf;
 using System;
 using System.Runtime.Serialization;
 
@@ -9,63 +8,54 @@ namespace MediaBrowser.Model.Dto
     /// <summary>
     /// Class UserDto
     /// </summary>
-    [ProtoContract]
     public class UserDto : INotifyPropertyChanged, IItemDto
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
-        [ProtoMember(2)]
         public string Id { get; set; }
 
         /// <summary>
         /// Gets or sets the primary image tag.
         /// </summary>
         /// <value>The primary image tag.</value>
-        [ProtoMember(3)]
         public Guid? PrimaryImageTag { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance has password.
         /// </summary>
         /// <value><c>true</c> if this instance has password; otherwise, <c>false</c>.</value>
-        [ProtoMember(4)]
         public bool HasPassword { get; set; }
 
         /// <summary>
         /// Gets or sets the last login date.
         /// </summary>
         /// <value>The last login date.</value>
-        [ProtoMember(5)]
         public DateTime? LastLoginDate { get; set; }
 
         /// <summary>
         /// Gets or sets the last activity date.
         /// </summary>
         /// <value>The last activity date.</value>
-        [ProtoMember(6)]
         public DateTime? LastActivityDate { get; set; }
 
         /// <summary>
         /// Gets or sets the configuration.
         /// </summary>
         /// <value>The configuration.</value>
-        [ProtoMember(7)]
         public UserConfiguration Configuration { get; set; }
 
         /// <summary>
         /// Gets or sets the primary image aspect ratio.
         /// </summary>
         /// <value>The primary image aspect ratio.</value>
-        [ProtoMember(8)]
         public double? PrimaryImageAspectRatio { get; set; }
         
         /// <summary>

MediaBrowser.Model/DTO/UserItemDataDto.cs

@@ -1,62 +1,53 @@
 using System;
 using System.ComponentModel;
-using ProtoBuf;
 
 namespace MediaBrowser.Model.Dto
 {
     /// <summary>
     /// Class UserItemDataDto
     /// </summary>
-    [ProtoContract]
     public class UserItemDataDto : INotifyPropertyChanged
     {
         /// <summary>
         /// Gets or sets the rating.
         /// </summary>
         /// <value>The rating.</value>
-        [ProtoMember(1)]
         public float? Rating { get; set; }
 
         /// <summary>
         /// Gets or sets the playback position ticks.
         /// </summary>
         /// <value>The playback position ticks.</value>
-        [ProtoMember(2)]
         public long PlaybackPositionTicks { get; set; }
 
         /// <summary>
         /// Gets or sets the play count.
         /// </summary>
         /// <value>The play count.</value>
-        [ProtoMember(3)]
         public int PlayCount { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is favorite.
         /// </summary>
         /// <value><c>true</c> if this instance is favorite; otherwise, <c>false</c>.</value>
-        [ProtoMember(4)]
         public bool IsFavorite { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this <see cref="UserItemDataDto" /> is likes.
         /// </summary>
         /// <value><c>null</c> if [likes] contains no value, <c>true</c> if [likes]; otherwise, <c>false</c>.</value>
-        [ProtoMember(5)]
         public bool? Likes { get; set; }
 
         /// <summary>
         /// Gets or sets the last played date.
         /// </summary>
         /// <value>The last played date.</value>
-        [ProtoMember(6)]
         public DateTime? LastPlayedDate { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this <see cref="UserItemDataDto" /> is played.
         /// </summary>
         /// <value><c>true</c> if played; otherwise, <c>false</c>.</value>
-        [ProtoMember(7)]
         public bool Played { get; set; }
 
         public event PropertyChangedEventHandler PropertyChanged;

MediaBrowser.Model/Entities/BaseItemInfo.cs

@@ -1,5 +1,4 @@
-using ProtoBuf;
-using System;
+using System;
 using System.Runtime.Serialization;
 
 namespace MediaBrowser.Model.Entities
@@ -7,56 +6,48 @@ namespace MediaBrowser.Model.Entities
     /// <summary>
     /// This is a stub class containing only basic information about an item
     /// </summary>
-    [ProtoContract]
     public class BaseItemInfo
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
-        [ProtoMember(2)]
         public string Id { get; set; }
 
         /// <summary>
         /// Gets or sets the type.
         /// </summary>
         /// <value>The type.</value>
-        [ProtoMember(3)]
         public string Type { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is folder.
         /// </summary>
         /// <value><c>true</c> if this instance is folder; otherwise, <c>false</c>.</value>
-        [ProtoMember(4)]
         public bool IsFolder { get; set; }
 
         /// <summary>
         /// Gets or sets the run time ticks.
         /// </summary>
         /// <value>The run time ticks.</value>
-        [ProtoMember(5)]
         public long? RunTimeTicks { get; set; }
 
         /// <summary>
         /// Gets or sets the primary image tag.
         /// </summary>
         /// <value>The primary image tag.</value>
-        [ProtoMember(6)]
         public Guid? PrimaryImageTag { get; set; }
 
         /// <summary>
         /// Gets or sets the backdrop image tag.
         /// </summary>
         /// <value>The backdrop image tag.</value>
-        [ProtoMember(7)]
         public Guid? BackdropImageTag { get; set; }
 
         /// <summary>

MediaBrowser.Model/Entities/ChapterInfo.cs

@@ -1,32 +1,27 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
     /// Class ChapterInfo
     /// </summary>
-    [ProtoContract]
     public class ChapterInfo
     {
         /// <summary>
         /// Gets or sets the start position ticks.
         /// </summary>
         /// <value>The start position ticks.</value>
-        [ProtoMember(1)]
         public long StartPositionTicks { get; set; }
 
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(2)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the image path.
         /// </summary>
         /// <value>The image path.</value>
-        [ProtoMember(3)]
         public string ImagePath { get; set; }
     }
 }

MediaBrowser.Model/Entities/DisplayPreferences.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Drawing;
-using ProtoBuf;
 using System;
 using System.Collections.Generic;
 
@@ -8,7 +7,6 @@ namespace MediaBrowser.Model.Entities
     /// <summary>
     /// Defines the display preferences for any item that supports them (usually Folders)
     /// </summary>
-    [ProtoContract]
     public class DisplayPreferences
     {
         /// <summary>
@@ -31,67 +29,56 @@ namespace MediaBrowser.Model.Entities
         /// Gets or sets the user id.
         /// </summary>
         /// <value>The user id.</value>
-        [ProtoMember(1)]
         public Guid Id { get; set; }
         /// <summary>
         /// Gets or sets the type of the view.
         /// </summary>
         /// <value>The type of the view.</value>
-        [ProtoMember(2)]
         public string ViewType { get; set; }
         /// <summary>
         /// Gets or sets the sort by.
         /// </summary>
         /// <value>The sort by.</value>
-        [ProtoMember(4)]
         public string SortBy { get; set; }
         /// <summary>
         /// Gets or sets the index by.
         /// </summary>
         /// <value>The index by.</value>
-        [ProtoMember(5)]
         public string IndexBy { get; set; }
         /// <summary>
         /// Gets or sets a value indicating whether [remember indexing].
         /// </summary>
         /// <value><c>true</c> if [remember indexing]; otherwise, <c>false</c>.</value>
-        [ProtoMember(6)]
         public bool RememberIndexing { get; set; }
         /// <summary>
         /// Gets or sets the height of the primary image.
         /// </summary>
         /// <value>The height of the primary image.</value>
-        [ProtoMember(7)]
         public int PrimaryImageHeight { get; set; }
         /// <summary>
         /// Gets or sets the width of the primary image.
         /// </summary>
         /// <value>The width of the primary image.</value>
-        [ProtoMember(8)]
         public int PrimaryImageWidth { get; set; }
         /// <summary>
         /// Gets or sets the custom prefs.
         /// </summary>
         /// <value>The custom prefs.</value>
-        [ProtoMember(9)]
         public Dictionary<string, string> CustomPrefs { get; set; }
         /// <summary>
         /// Gets or sets the scroll direction.
         /// </summary>
         /// <value>The scroll direction.</value>
-        [ProtoMember(10)]
         public ScrollDirection ScrollDirection { get; set; }
         /// <summary>
         /// Gets or sets a value indicating whether [remember sorting].
         /// </summary>
         /// <value><c>true</c> if [remember sorting]; otherwise, <c>false</c>.</value>
-        [ProtoMember(11)]
         public bool RememberSorting { get; set; }
         /// <summary>
         /// Gets or sets the sort order.
         /// </summary>
         /// <value>The sort order.</value>
-        [ProtoMember(12)]
         public SortOrder SortOrder { get; set; }
 
         /// <summary>

MediaBrowser.Model/Entities/ImageDownloadOptions.cs

@@ -1,50 +1,41 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.Entities
 {
-    [ProtoContract]
     public class ImageDownloadOptions
     {
         /// <summary>
         /// Download Art Image
         /// </summary>
-        [ProtoMember(1)]
         public bool Art { get; set; }
 
         /// <summary>
         /// Download Logo Image
         /// </summary>
-        [ProtoMember(2)]
         public bool Logo { get; set; }
 
         /// <summary>
         /// Download Primary Image
         /// </summary>
-        [ProtoMember(3)]
         public bool Primary { get; set; }
 
         /// <summary>
         /// Download Backdrop Images
         /// </summary>
-        [ProtoMember(4)]
         public bool Backdrops { get; set; }
 
         /// <summary>
         /// Download Disc Image
         /// </summary>
-        [ProtoMember(5)]
         public bool Disc { get; set; }
 
         /// <summary>
         /// Download Thumb Image
         /// </summary>
-        [ProtoMember(6)]
         public bool Thumb { get; set; }
 
         /// <summary>
         /// Download Banner Image
         /// </summary>
-        [ProtoMember(7)]
         public bool Banner { get; set; }
 
     }

MediaBrowser.Model/Entities/MediaStream.cs

@@ -1,151 +1,129 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
     /// Class MediaStream
     /// </summary>
-    [ProtoContract]
     public class MediaStream
     {
         /// <summary>
         /// Gets or sets the codec.
         /// </summary>
         /// <value>The codec.</value>
-        [ProtoMember(1)]
         public string Codec { get; set; }
 
         /// <summary>
         /// Gets or sets the language.
         /// </summary>
         /// <value>The language.</value>
-        [ProtoMember(2)]
         public string Language { get; set; }
 
+        /// <summary>
+        /// Gets or sets the type of the scan.
+        /// </summary>
+        /// <value>The type of the scan.</value>
+        public string ScanType { get; set; }
+        
         /// <summary>
         /// Gets or sets the bit rate.
         /// </summary>
         /// <value>The bit rate.</value>
-        [ProtoMember(3)]
         public int? BitRate { get; set; }
 
         /// <summary>
         /// Gets or sets the channels.
         /// </summary>
         /// <value>The channels.</value>
-        [ProtoMember(4)]
         public int? Channels { get; set; }
 
         /// <summary>
         /// Gets or sets the sample rate.
         /// </summary>
         /// <value>The sample rate.</value>
-        [ProtoMember(5)]
         public int? SampleRate { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is default.
         /// </summary>
         /// <value><c>true</c> if this instance is default; otherwise, <c>false</c>.</value>
-        [ProtoMember(6)]
         public bool IsDefault { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is forced.
         /// </summary>
         /// <value><c>true</c> if this instance is forced; otherwise, <c>false</c>.</value>
-        [ProtoMember(7)]
         public bool IsForced { get; set; }
 
         /// <summary>
         /// Gets or sets the height.
         /// </summary>
         /// <value>The height.</value>
-        [ProtoMember(8)]
         public int? Height { get; set; }
 
         /// <summary>
         /// Gets or sets the width.
         /// </summary>
         /// <value>The width.</value>
-        [ProtoMember(9)]
         public int? Width { get; set; }
 
-        /// <summary>
-        /// Gets or sets the type of the scan.
-        /// </summary>
-        /// <value>The type of the scan.</value>
-        [ProtoMember(10)]
-        public string ScanType { get; set; }
-
         /// <summary>
         /// Gets or sets the average frame rate.
         /// </summary>
         /// <value>The average frame rate.</value>
-        [ProtoMember(11)]
         public float? AverageFrameRate { get; set; }
 
         /// <summary>
         /// Gets or sets the real frame rate.
         /// </summary>
         /// <value>The real frame rate.</value>
-        [ProtoMember(12)]
         public float? RealFrameRate { get; set; }
 
         /// <summary>
         /// Gets or sets the profile.
         /// </summary>
         /// <value>The profile.</value>
-        [ProtoMember(13)]
         public string Profile { get; set; }
 
         /// <summary>
         /// Gets or sets the type.
         /// </summary>
         /// <value>The type.</value>
-        [ProtoMember(14)]
         public MediaStreamType Type { get; set; }
 
         /// <summary>
         /// Gets or sets the aspect ratio.
         /// </summary>
         /// <value>The aspect ratio.</value>
-        [ProtoMember(15)]
         public string AspectRatio { get; set; }
 
         /// <summary>
         /// Gets or sets the index.
         /// </summary>
         /// <value>The index.</value>
-        [ProtoMember(16)]
         public int Index { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is external.
         /// </summary>
         /// <value><c>true</c> if this instance is external; otherwise, <c>false</c>.</value>
-        [ProtoMember(17)]
         public bool IsExternal { get; set; }
 
         /// <summary>
         /// Gets or sets the filename.
         /// </summary>
         /// <value>The filename.</value>
-        [ProtoMember(18)]
         public string Path { get; set; }
 
         /// <summary>
         /// Gets or sets the level.
         /// </summary>
         /// <value>The level.</value>
-        [ProtoMember(19)]
         public double? Level { get; set; }
 
         /// <summary>
         /// Gets or sets the pixel format.
         /// </summary>
         /// <value>The pixel format.</value>
-        [ProtoMember(20)]
         public string PixelFormat { get; set; }
     }
 

MediaBrowser.Model/Entities/ParentalRating.cs

@@ -1,25 +1,21 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
     /// Class ParentalRating
     /// </summary>
-    [ProtoContract]
     public class ParentalRating
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the value.
         /// </summary>
         /// <value>The value.</value>
-        [ProtoMember(2)]
         public int Value { get; set; }
     }
 }

MediaBrowser.Model/Entities/PluginSecurityInfo.cs

@@ -1,32 +1,27 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
     /// Class PluginSecurityInfo
     /// </summary>
-    [ProtoContract]
     public class PluginSecurityInfo
     {
         /// <summary>
         /// Gets or sets the supporter key.
         /// </summary>
         /// <value>The supporter key.</value>
-        [ProtoMember(1)]
         public string SupporterKey { get; set; }
 
         /// <summary>
         /// Gets or sets the legacy supporter key.
         /// </summary>
         /// <value><c>The legacy supporter key</value>
-        [ProtoMember(2)]
         public string LegacyKey { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is MB supporter.
         /// </summary>
         /// <value><c>true</c> if this instance is MB supporter; otherwise, <c>false</c>.</value>
-        [ProtoMember(3)]
         public bool IsMBSupporter { get; set; }
     }
 }

MediaBrowser.Model/Entities/RequestResult.cs

@@ -1,8 +1,6 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.Entities
 {
-    [ProtoContract]
     public class EmptyRequestResult
     {
     }

MediaBrowser.Model/Entities/VirtualFolderInfo.cs

@@ -1,26 +1,22 @@
-using ProtoBuf;
-using System.Collections.Generic;
+using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Entities
 {
     /// <summary>
     /// Used to hold information about a user's list of configured virtual folders
     /// </summary>
-    [ProtoContract]
     public class VirtualFolderInfo
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the locations.
         /// </summary>
         /// <value>The locations.</value>
-        [ProtoMember(2)]
         public List<string> Locations { get; set; }
     }
 }

MediaBrowser.Model/Globalization/CountryInfo.cs

@@ -1,39 +1,33 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.Globalization
 {
     /// <summary>
     /// Class CountryInfo
     /// </summary>
-    [ProtoContract]
     public class CountryInfo
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the display name.
         /// </summary>
         /// <value>The display name.</value>
-        [ProtoMember(2)]
         public string DisplayName { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the two letter ISO region.
         /// </summary>
         /// <value>The name of the two letter ISO region.</value>
-        [ProtoMember(3)]
         public string TwoLetterISORegionName { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the three letter ISO region.
         /// </summary>
         /// <value>The name of the three letter ISO region.</value>
-        [ProtoMember(4)]
         public string ThreeLetterISORegionName { get; set; }
     }
 }

MediaBrowser.Model/Globalization/CultureDto.cs

@@ -1,39 +1,33 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.Globalization
 {
     /// <summary>
     /// Class CultureDto
     /// </summary>
-    [ProtoContract]
     public class CultureDto
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the display name.
         /// </summary>
         /// <value>The display name.</value>
-        [ProtoMember(2)]
         public string DisplayName { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the two letter ISO language.
         /// </summary>
         /// <value>The name of the two letter ISO language.</value>
-        [ProtoMember(3)]
         public string TwoLetterISOLanguageName { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the three letter ISO language.
         /// </summary>
         /// <value>The name of the three letter ISO language.</value>
-        [ProtoMember(4)]
         public string ThreeLetterISOLanguageName { get; set; }
     }
 }

MediaBrowser.Model/IO/FileSystemEntryInfo.cs

@@ -1,32 +1,27 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.IO
 {
     /// <summary>
     /// Class FileSystemEntryInfo
     /// </summary>
-    [ProtoContract]
     public class FileSystemEntryInfo
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the path.
         /// </summary>
         /// <value>The path.</value>
-        [ProtoMember(2)]
         public string Path { get; set; }
 
         /// <summary>
         /// Gets or sets the type.
         /// </summary>
         /// <value>The type.</value>
-        [ProtoMember(3)]
         public FileSystemEntryType Type { get; set; }
     }
 

MediaBrowser.Model/MediaBrowser.Model.csproj

@@ -83,7 +83,6 @@
     <Compile Include="Net\NetworkShare.cs" />
     <Compile Include="Net\NetworkShareType.cs" />
     <Compile Include="Serialization\IJsonSerializer.cs" />
-    <Compile Include="Serialization\IProtobufSerializer.cs" />
     <Compile Include="Serialization\IXmlSerializer.cs" />
     <Compile Include="Updates\CheckForUpdateResult.cs" />
     <Compile Include="Updates\PackageTargetSystem.cs" />
@@ -129,9 +128,6 @@
     <Reference Include="PropertyChanged">
       <HintPath>..\packages\PropertyChanged.Fody.1.32.2.0\lib\portable-net4+sl4+wp7+win8\PropertyChanged.dll</HintPath>
     </Reference>
-    <Reference Include="protobuf-net">
-      <HintPath>..\packages\protobuf-net.2.0.0.621\lib\portable-sl4+net40+wp7+windows8\protobuf-net.dll</HintPath>
-    </Reference>
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />

MediaBrowser.Model/MediaInfo/BlurayDiscInfo.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Entities;
-using ProtoBuf;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Model.MediaInfo
@@ -7,35 +6,30 @@ namespace MediaBrowser.Model.MediaInfo
     /// <summary>
     /// Represents the result of BDInfo output
     /// </summary>
-    [ProtoContract]
     public class BlurayDiscInfo
     {
         /// <summary>
         /// Gets or sets the media streams.
         /// </summary>
         /// <value>The media streams.</value>
-        [ProtoMember(1)]
         public List<MediaStream> MediaStreams { get; set; }
 
         /// <summary>
         /// Gets or sets the run time ticks.
         /// </summary>
         /// <value>The run time ticks.</value>
-        [ProtoMember(2)]
         public long? RunTimeTicks { get; set; }
 
         /// <summary>
         /// Gets or sets the files.
         /// </summary>
         /// <value>The files.</value>
-        [ProtoMember(3)]
         public List<string> Files { get; set; }
 
         /// <summary>
         /// Gets or sets the chapters.
         /// </summary>
         /// <value>The chapters.</value>
-        [ProtoMember(4)]
         public List<double> Chapters { get; set; }
     }
 }

MediaBrowser.Model/Plugins/PluginInfo.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Updates;
-using ProtoBuf;
 using System;
 
 namespace MediaBrowser.Model.Plugins
@@ -7,56 +6,48 @@ namespace MediaBrowser.Model.Plugins
     /// <summary>
     /// This is a serializable stub class that is used by the api to provide information about installed plugins.
     /// </summary>
-    [ProtoContract]
     public class PluginInfo
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the configuration date last modified.
         /// </summary>
         /// <value>The configuration date last modified.</value>
-        [ProtoMember(3)]
         public DateTime ConfigurationDateLastModified { get; set; }
 
         /// <summary>
         /// Gets or sets the version.
         /// </summary>
         /// <value>The version.</value>
-        [ProtoMember(4)]
         public string Version { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the assembly file.
         /// </summary>
         /// <value>The name of the assembly file.</value>
-        [ProtoMember(5)]
         public string AssemblyFileName { get; set; }
 
         /// <summary>
         /// Gets or sets the name of the configuration file.
         /// </summary>
         /// <value>The name of the configuration file.</value>
-        [ProtoMember(6)]
         public string ConfigurationFileName { get; set; }
 
         /// <summary>
         /// Gets or sets the description.
         /// </summary>
         /// <value>The description.</value>
-        [ProtoMember(7)]
         public string Description { get; set; }
 
         /// <summary>
         /// Gets or sets the unique id.
         /// </summary>
         /// <value>The unique id.</value>
-        [ProtoMember(9)]
         public string Id { get; set; }
 
         /// <summary>
@@ -64,7 +55,6 @@ namespace MediaBrowser.Model.Plugins
         /// compatible new version is released
         /// </summary>
         /// <value><c>true</c> if [enable auto update]; otherwise, <c>false</c>.</value>
-        [ProtoMember(10)]
         public bool EnableAutoUpdate { get; set; }
 
         /// <summary>
@@ -72,14 +62,12 @@ namespace MediaBrowser.Model.Plugins
         /// Options are: Dev, Beta or Release
         /// </summary>
         /// <value>The update class.</value>
-        [ProtoMember(11)]
         public PackageVersionClass UpdateClass { get; set; }
 
         /// <summary>
         /// Gets or sets the minimum required UI version.
         /// </summary>
         /// <value>The minimum required UI version.</value>
-        [ProtoMember(12)]
         public string MinimumRequiredUIVersion { get; set; }
     }
 }

MediaBrowser.Model/Querying/ItemsResult.cs

@@ -1,26 +1,22 @@
 using MediaBrowser.Model.Dto;
-using ProtoBuf;
 
 namespace MediaBrowser.Model.Querying
 {
     /// <summary>
     /// Represents the result of a query for items
     /// </summary>
-    [ProtoContract]
     public class ItemsResult
     {
         /// <summary>
         /// The set of items returned based on sorting, paging, etc
         /// </summary>
         /// <value>The items.</value>
-        [ProtoMember(1)]
         public BaseItemDto[] Items { get; set; }
 
         /// <summary>
         /// The total number of records available
         /// </summary>
         /// <value>The total record count.</value>
-        [ProtoMember(2)]
         public int TotalRecordCount { get; set; }
     }
 }

MediaBrowser.Model/Serialization/IProtobufSerializer.cs

@@ -1,63 +0,0 @@
-using System;
-using System.IO;
-
-namespace MediaBrowser.Model.Serialization
-{
-    public interface IProtobufSerializer
-    {
-        /// <summary>
-        /// Serializes to stream.
-        /// </summary>
-        /// <param name="obj">The obj.</param>
-        /// <param name="stream">The stream.</param>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
-        void SerializeToStream(object obj, Stream stream);
-
-        /// <summary>
-        /// Deserializes from stream.
-        /// </summary>
-        /// <param name="stream">The stream.</param>
-        /// <param name="type">The type.</param>
-        /// <returns>System.Object.</returns>
-        /// <exception cref="System.ArgumentNullException">stream</exception>
-        object DeserializeFromStream(Stream stream, Type type);
-
-        /// <summary>
-        /// Deserializes from stream.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="stream">The stream.</param>
-        /// <returns>``0.</returns>
-        T DeserializeFromStream<T>(Stream stream)
-            where T : class;
-
-        /// <summary>
-        /// Serializes to file.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="obj">The obj.</param>
-        /// <param name="file">The file.</param>
-        /// <exception cref="System.ArgumentNullException">file</exception>
-        void SerializeToFile<T>(T obj, string file);
-
-        /// <summary>
-        /// Deserializes from file.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="file">The file.</param>
-        /// <returns>``0.</returns>
-        /// <exception cref="System.ArgumentNullException">file</exception>
-        T DeserializeFromFile<T>(string file)
-            where T : class;
-
-        /// <summary>
-        /// Serializes to bytes.
-        /// </summary>
-        /// <typeparam name="T"></typeparam>
-        /// <param name="obj">The obj.</param>
-        /// <returns>System.Byte[][].</returns>
-        /// <exception cref="System.ArgumentNullException">obj</exception>
-        byte[] SerializeToBytes<T>(T obj)
-            where T : class;
-    }
-}

MediaBrowser.Model/System/SystemInfo.cs

@@ -1,76 +1,64 @@
 using MediaBrowser.Model.Updates;
-using ProtoBuf;
-using System;
 
 namespace MediaBrowser.Model.System
 {
     /// <summary>
     /// Class SystemInfo
     /// </summary>
-    [ProtoContract]
     public class SystemInfo
     {
         /// <summary>
         /// Gets or sets the version.
         /// </summary>
         /// <value>The version.</value>
-        [ProtoMember(1)]
         public string Version { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance has pending restart.
         /// </summary>
         /// <value><c>true</c> if this instance has pending restart; otherwise, <c>false</c>.</value>
-        [ProtoMember(2)]
         public bool HasPendingRestart { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is network deployed.
         /// </summary>
         /// <value><c>true</c> if this instance is network deployed; otherwise, <c>false</c>.</value>
-        [ProtoMember(3)]
         public bool IsNetworkDeployed { get; set; }
 
         /// <summary>
         /// Gets or sets the in progress installations.
         /// </summary>
         /// <value>The in progress installations.</value>
-        [ProtoMember(4)]
         public InstallationInfo[] InProgressInstallations { get; set; }
 
         /// <summary>
         /// Gets or sets the web socket port number.
         /// </summary>
         /// <value>The web socket port number.</value>
-        [ProtoMember(5)]
         public int WebSocketPortNumber { get; set; }
 
         /// <summary>
         /// Gets or sets the completed installations.
         /// </summary>
         /// <value>The completed installations.</value>
-        [ProtoMember(6)]
         public InstallationInfo[] CompletedInstallations { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether [supports native web socket].
         /// </summary>
         /// <value><c>true</c> if [supports native web socket]; otherwise, <c>false</c>.</value>
-        [ProtoMember(7)]
         public bool SupportsNativeWebSocket { get; set; }
 
         /// <summary>
         /// Gets or sets plugin assemblies that failed to load.
         /// </summary>
         /// <value>The failed assembly loads.</value>
-        [ProtoMember(8)]
         public string[] FailedPluginAssemblies { get; set; }
 
         /// <summary>
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
-        [ProtoMember(9)]
         public string Id { get; set; }
     }
 }

MediaBrowser.Model/Tasks/TaskInfo.cs

@@ -1,68 +1,58 @@
-using ProtoBuf;
-using System;
+using System;
 
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
     /// Class TaskInfo
     /// </summary>
-    [ProtoContract]
     public class TaskInfo
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the state of the task.
         /// </summary>
         /// <value>The state of the task.</value>
-        [ProtoMember(2)]
         public TaskState State { get; set; }
 
         /// <summary>
         /// Gets or sets the progress.
         /// </summary>
         /// <value>The progress.</value>
-        [ProtoMember(3)]
         public double? CurrentProgressPercentage { get; set; }
 
         /// <summary>
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
-        [ProtoMember(4)]
         public Guid Id { get; set; }
 
         /// <summary>
         /// Gets or sets the last execution result.
         /// </summary>
         /// <value>The last execution result.</value>
-        [ProtoMember(5)]
         public TaskResult LastExecutionResult { get; set; }
 
         /// <summary>
         /// Gets or sets the triggers.
         /// </summary>
         /// <value>The triggers.</value>
-        [ProtoMember(6)]
         public TaskTriggerInfo[] Triggers { get; set; }
 
         /// <summary>
         /// Gets or sets the description.
         /// </summary>
         /// <value>The description.</value>
-        [ProtoMember(7)]
         public string Description { get; set; }
 
         /// <summary>
         /// Gets or sets the category.
         /// </summary>
         /// <value>The category.</value>
-        [ProtoMember(8)]
         public string Category { get; set; }
     }
 }

MediaBrowser.Model/Tasks/TaskResult.cs

@@ -1,47 +1,40 @@
-using ProtoBuf;
-using System;
+using System;
 
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
     /// Class TaskExecutionInfo
     /// </summary>
-    [ProtoContract]
     public class TaskResult
     {
         /// <summary>
         /// Gets or sets the start time UTC.
         /// </summary>
         /// <value>The start time UTC.</value>
-        [ProtoMember(1)]
         public DateTime StartTimeUtc { get; set; }
 
         /// <summary>
         /// Gets or sets the end time UTC.
         /// </summary>
         /// <value>The end time UTC.</value>
-        [ProtoMember(2)]
         public DateTime EndTimeUtc { get; set; }
 
         /// <summary>
         /// Gets or sets the status.
         /// </summary>
         /// <value>The status.</value>
-        [ProtoMember(3)]
         public TaskCompletionStatus Status { get; set; }
 
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(4)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
-        [ProtoMember(5)]
         public Guid Id { get; set; }
     }
 }

MediaBrowser.Model/Tasks/TaskTriggerInfo.cs

@@ -1,47 +1,40 @@
-using ProtoBuf;
-using System;
+using System;
 
 namespace MediaBrowser.Model.Tasks
 {
     /// <summary>
     /// Class TaskTriggerInfo
     /// </summary>
-    [ProtoContract]
     public class TaskTriggerInfo
     {
         /// <summary>
         /// Gets or sets the type.
         /// </summary>
         /// <value>The type.</value>
-        [ProtoMember(1)]
         public string Type { get; set; }
 
         /// <summary>
         /// Gets or sets the time of day.
         /// </summary>
         /// <value>The time of day.</value>
-        [ProtoMember(2)]
         public long? TimeOfDayTicks { get; set; }
 
         /// <summary>
         /// Gets or sets the interval.
         /// </summary>
         /// <value>The interval.</value>
-        [ProtoMember(3)]
         public long? IntervalTicks { get; set; }
 
         /// <summary>
         /// Gets or sets the system event.
         /// </summary>
         /// <value>The system event.</value>
-        [ProtoMember(4)]
         public SystemEvent? SystemEvent { get; set; }
 
         /// <summary>
         /// Gets or sets the day of week.
         /// </summary>
         /// <value>The day of week.</value>
-        [ProtoMember(5)]
         public DayOfWeek? DayOfWeek { get; set; }
     }
 }

MediaBrowser.Model/Updates/InstallationInfo.cs

@@ -1,47 +1,40 @@
-using ProtoBuf;
-using System;
+using System;
 
 namespace MediaBrowser.Model.Updates
 {
     /// <summary>
     /// Class InstallationInfo
     /// </summary>
-    [ProtoContract]
     public class InstallationInfo
     {
         /// <summary>
         /// Gets or sets the id.
         /// </summary>
         /// <value>The id.</value>
-        [ProtoMember(1)]
         public Guid Id { get; set; }
 
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(2)]
         public string Name { get; set; }
 
         /// <summary>
         /// Gets or sets the version.
         /// </summary>
         /// <value>The version.</value>
-        [ProtoMember(3)]
         public string Version { get; set; }
 
         /// <summary>
         /// Gets or sets the update class.
         /// </summary>
         /// <value>The update class.</value>
-        [ProtoMember(4)]
         public PackageVersionClass UpdateClass { get; set; }
 
         /// <summary>
         /// Gets or sets the percent complete.
         /// </summary>
         /// <value>The percent complete.</value>
-        [ProtoMember(5)]
         public double? PercentComplete { get; set; }
     }
 }

MediaBrowser.Model/Updates/PackageInfo.cs

@@ -1,5 +1,4 @@
 using System;
-using ProtoBuf;
 using System.Collections.Generic;
 
 namespace MediaBrowser.Model.Updates
@@ -7,140 +6,120 @@ namespace MediaBrowser.Model.Updates
     /// <summary>
     /// Class PackageInfo
     /// </summary>
-    [ProtoContract]
     public class PackageInfo
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string name { get; set; }
 
         /// <summary>
         /// Gets or sets the short description.
         /// </summary>
         /// <value>The short description.</value>
-        [ProtoMember(2)]
         public string shortDescription { get; set; }
 
         /// <summary>
         /// Gets or sets the overview.
         /// </summary>
         /// <value>The overview.</value>
-        [ProtoMember(3)]
         public string overview { get; set; }
 
         /// <summary>
         /// Gets or sets a value indicating whether this instance is premium.
         /// </summary>
         /// <value><c>true</c> if this instance is premium; otherwise, <c>false</c>.</value>
-        [ProtoMember(4)]
         public bool isPremium { get; set; }
 
         /// <summary>
         /// Gets or sets the rich desc URL.
         /// </summary>
         /// <value>The rich desc URL.</value>
-        [ProtoMember(5)]
         public string richDescUrl { get; set; }
 
         /// <summary>
         /// Gets or sets the thumb image.
         /// </summary>
         /// <value>The thumb image.</value>
-        [ProtoMember(6)]
         public string thumbImage { get; set; }
 
         /// <summary>
         /// Gets or sets the preview image.
         /// </summary>
         /// <value>The preview image.</value>
-        [ProtoMember(7)]
         public string previewImage { get; set; }
 
         /// <summary>
         /// Gets or sets the type.
         /// </summary>
         /// <value>The type.</value>
-        [ProtoMember(8)]
         public PackageType type { get; set; }
 
         /// <summary>
         /// Gets or sets the target filename.
         /// </summary>
         /// <value>The target filename.</value>
-        [ProtoMember(9)]
         public string targetFilename { get; set; }
 
         /// <summary>
         /// Gets or sets the owner.
         /// </summary>
         /// <value>The owner.</value>
-        [ProtoMember(10)]
         public string owner { get; set; }
 
         /// <summary>
         /// Gets or sets the category.
         /// </summary>
         /// <value>The category.</value>
-        [ProtoMember(11)]
         public string category { get; set; }
 
         /// <summary>
         /// Gets or sets the catalog tile color.
         /// </summary>
         /// <value>The owner.</value>
-        [ProtoMember(12)]
         public string tileColor { get; set; }
 
         /// <summary>
         /// Gets or sets the feature id of this package (if premium).
         /// </summary>
         /// <value>The feature id.</value>
-        [ProtoMember(13)]
         public string featureId { get; set; }
 
         /// <summary>
         /// Gets or sets the registration info for this package (if premium).
         /// </summary>
         /// <value>The registration info.</value>
-        [ProtoMember(14)]
         public string regInfo { get; set; }
 
         /// <summary>
         /// Gets or sets the price for this package (if premium).
         /// </summary>
         /// <value>The price.</value>
-        [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(17)]
         public bool isRegistered { get; set; }
 
         /// <summary>
         /// Gets or sets the expiration date for this package.
         /// </summary>
         /// <value>Expiration Date.</value>
-        [ProtoMember(18)]
         public DateTime expDate { get; set; }
 
         /// <summary>
         /// Gets or sets the versions.
         /// </summary>
         /// <value>The versions.</value>
-        [ProtoMember(19)]
         public List<PackageVersionInfo> versions { get; set; }
     }
 }

MediaBrowser.Model/Updates/PackageVersionInfo.cs

@@ -1,5 +1,4 @@
 using MediaBrowser.Model.Extensions;
-using ProtoBuf;
 using System;
 using System.Runtime.Serialization;
 
@@ -8,21 +7,18 @@ namespace MediaBrowser.Model.Updates
     /// <summary>
     /// Class PackageVersionInfo
     /// </summary>
-    [ProtoContract]
     public class PackageVersionInfo
     {
         /// <summary>
         /// Gets or sets the name.
         /// </summary>
         /// <value>The name.</value>
-        [ProtoMember(1)]
         public string name { get; set; }
 
         /// <summary>
         /// Gets or sets the version STR.
         /// </summary>
         /// <value>The version STR.</value>
-        [ProtoMember(2)]
         public string versionStr { get; set; }
 
         /// <summary>
@@ -44,42 +40,36 @@ namespace MediaBrowser.Model.Updates
         /// Gets or sets the classification.
         /// </summary>
         /// <value>The classification.</value>
-        [ProtoMember(4)]
         public PackageVersionClass classification { get; set; }
 
         /// <summary>
         /// Gets or sets the description.
         /// </summary>
         /// <value>The description.</value>
-        [ProtoMember(5)]
         public string description { get; set; }
 
         /// <summary>
         /// Gets or sets the required version STR.
         /// </summary>
         /// <value>The required version STR.</value>
-        [ProtoMember(6)]
         public string requiredVersionStr { get; set; }
 
         /// <summary>
         /// Gets or sets the source URL.
         /// </summary>
         /// <value>The source URL.</value>
-        [ProtoMember(8)]
         public string sourceUrl { get; set; }
 
         /// <summary>
         /// Gets or sets the source URL.
         /// </summary>
         /// <value>The source URL.</value>
-        [ProtoMember(9)]
         public Guid checksum { get; set; }
 
         /// <summary>
         /// Gets or sets the target filename.
         /// </summary>
         /// <value>The target filename.</value>
-        [ProtoMember(10)]
         public string targetFilename { get; set; }
     }
 }

MediaBrowser.Model/Weather/WeatherForecast.cs

@@ -1,54 +1,46 @@
 using System;
-using ProtoBuf;
 
 namespace MediaBrowser.Model.Weather
 {
     /// <summary>
     /// Represents a weather forecast for a specific date
     /// </summary>
-    [ProtoContract]
     public class WeatherForecast
     {
         /// <summary>
         /// Gets or sets the date.
         /// </summary>
         /// <value>The date.</value>
-        [ProtoMember(1)]
         public DateTime Date { get; set; }
 
         /// <summary>
         /// Gets or sets the high temperature fahrenheit.
         /// </summary>
         /// <value>The high temperature fahrenheit.</value>
-        [ProtoMember(2)]
         public int HighTemperatureFahrenheit { get; set; }
 
         /// <summary>
         /// Gets or sets the low temperature fahrenheit.
         /// </summary>
         /// <value>The low temperature fahrenheit.</value>
-        [ProtoMember(3)]
         public int LowTemperatureFahrenheit { get; set; }
 
         /// <summary>
         /// Gets or sets the high temperature celsius.
         /// </summary>
         /// <value>The high temperature celsius.</value>
-        [ProtoMember(4)]
         public int HighTemperatureCelsius { get; set; }
 
         /// <summary>
         /// Gets or sets the low temperature celsius.
         /// </summary>
         /// <value>The low temperature celsius.</value>
-        [ProtoMember(5)]
         public int LowTemperatureCelsius { get; set; }
 
         /// <summary>
         /// Gets or sets the condition.
         /// </summary>
         /// <value>The condition.</value>
-        [ProtoMember(6)]
         public WeatherConditions Condition { get; set; }
     }
 }

MediaBrowser.Model/Weather/WeatherInfo.cs

@@ -1,25 +1,21 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.Weather
 {
     /// <summary>
     /// Class WeatherInfo
     /// </summary>
-    [ProtoContract]
     public class WeatherInfo
     {
         /// <summary>
         /// Gets or sets the current weather.
         /// </summary>
         /// <value>The current weather.</value>
-        [ProtoMember(1)]
         public WeatherStatus CurrentWeather { get; set; }
 
         /// <summary>
         /// Gets or sets the forecasts.
         /// </summary>
         /// <value>The forecasts.</value>
-        [ProtoMember(2)]
         public WeatherForecast[] Forecasts { get; set; }
 
         /// <summary>

MediaBrowser.Model/Weather/WeatherStatus.cs

@@ -1,39 +1,33 @@
-using ProtoBuf;
-
+
 namespace MediaBrowser.Model.Weather
 {
     /// <summary>
     /// Represents the current weather status
     /// </summary>
-    [ProtoContract]
     public class WeatherStatus
     {
         /// <summary>
         /// Gets or sets the temperature fahrenheit.
         /// </summary>
         /// <value>The temperature fahrenheit.</value>
-        [ProtoMember(1)]
         public int TemperatureFahrenheit { get; set; }
 
         /// <summary>
         /// Gets or sets the temperature celsius.
         /// </summary>
         /// <value>The temperature celsius.</value>
-        [ProtoMember(2)]
         public int TemperatureCelsius { get; set; }
 
         /// <summary>
         /// Gets or sets the humidity.
         /// </summary>
         /// <value>The humidity.</value>
-        [ProtoMember(3)]
         public int Humidity { get; set; }
 
         /// <summary>
         /// Gets or sets the condition.
         /// </summary>
         /// <value>The condition.</value>
-        [ProtoMember(4)]
         public WeatherConditions Condition { get; set; }
     }
 

MediaBrowser.Server.Implementations/Sqlite/SQLiteDisplayPreferencesRepository.cs

@@ -46,7 +46,7 @@ namespace MediaBrowser.Server.Implementations.Sqlite
         }
 
         /// <summary>
-        /// The _protobuf serializer
+        /// The _json serializer
         /// </summary>
         private readonly IJsonSerializer _jsonSerializer;
 
@@ -61,7 +61,11 @@ namespace MediaBrowser.Server.Implementations.Sqlite
         /// <param name="appPaths">The app paths.</param>
         /// <param name="jsonSerializer">The json serializer.</param>
         /// <param name="logManager">The log manager.</param>
-        /// <exception cref="System.ArgumentNullException">protobufSerializer</exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// jsonSerializer
+        /// or
+        /// appPaths
+        /// </exception>
         public SQLiteDisplayPreferencesRepository(IApplicationPaths appPaths, IJsonSerializer jsonSerializer, ILogManager logManager)
             : base(logManager)
         {

MediaBrowser.Server.Implementations/Sqlite/SQLiteUserDataRepository.cs

@@ -61,7 +61,11 @@ namespace MediaBrowser.Server.Implementations.Sqlite
         /// <param name="appPaths">The app paths.</param>
         /// <param name="jsonSerializer">The json serializer.</param>
         /// <param name="logManager">The log manager.</param>
-        /// <exception cref="System.ArgumentNullException">protobufSerializer</exception>
+        /// <exception cref="System.ArgumentNullException">
+        /// jsonSerializer
+        /// or
+        /// appPaths
+        /// </exception>
         public SQLiteUserDataRepository(IApplicationPaths appPaths, IJsonSerializer jsonSerializer, ILogManager logManager)
             : base(logManager)
         {