diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index e8af6ab136..36f8257b33 100644 --- a/MediaBrowser.Api/BaseApiService.cs +++ b/MediaBrowser.Api/BaseApiService.cs @@ -1,6 +1,4 @@ -using System.Linq; -using System.Threading.Tasks; -using MediaBrowser.Common.Net; +using MediaBrowser.Common.Net; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Entities.Audio; using MediaBrowser.Controller.Library; @@ -10,6 +8,8 @@ using ServiceStack.Common.Web; using ServiceStack.ServiceHost; using System; using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; namespace MediaBrowser.Api { diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj new file mode 100644 index 0000000000..b3b490ac48 --- /dev/null +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -0,0 +1,353 @@ + + + + + Debug + AnyCPU + {657B5410-7C3B-4806-9753-D254102CE537} + Library + Properties + MediaBrowser.Model.net35 + MediaBrowser.Model.net35 + v3.5 + 512 + + + + true + full + false + bin\Debug\ + DEBUG;TRACE + prompt + 4 + + + pdbonly + true + bin\Release\ + TRACE + prompt + 4 + + + true + + + MediaBrowser.Model.snk + + + Always + + + + + + + + + + + + + + Configuration\BaseApplicationConfiguration.cs + + + Configuration\ServerConfiguration.cs + + + Configuration\UserConfiguration.cs + + + Drawing\DrawingUtils.cs + + + Dto\BaseItemDto.cs + + + Dto\BaseItemPerson.cs + + + Dto\ChapterInfoDto.cs + + + Dto\IItemDto.cs + + + Dto\ImageInfo.cs + + + Dto\ImageOptions.cs + + + Dto\ItemByNameCounts.cs + + + Dto\StreamOptions.cs + + + Dto\StudioDto.cs + + + Dto\UserDto.cs + + + Dto\UserItemDataDto.cs + + + Entities\BaseItemInfo.cs + + + Entities\ChapterInfo.cs + + + Entities\DisplayPreferences.cs + + + Entities\IByReferenceItem.cs + + + Entities\IHasMediaStreams.cs + + + Entities\IHasProviderIds.cs + + + Entities\ImageDownloadOptions.cs + + + Entities\ImageType.cs + + + Entities\ItemReview.cs + + + Entities\LibraryUpdateInfo.cs + + + Entities\LocationType.cs + + + Entities\MBRegistrationRecord.cs + + + Entities\MediaStream.cs + + + Entities\MediaType.cs + + + Entities\MetadataProviders.cs + + + Entities\ParentalRating.cs + + + Entities\PersonType.cs + + + Entities\PluginSecurityInfo.cs + + + Entities\RequestResult.cs + + + Entities\SeriesStatus.cs + + + Entities\VideoFormat.cs + + + Entities\VideoType.cs + + + Entities\VirtualFolderInfo.cs + + + Extensions\ModelExtensions.cs + + + Globalization\CountryInfo.cs + + + Globalization\CultureDto.cs + + + IO\FileSystemEntryInfo.cs + + + IO\IZipClient.cs + + + Logging\ILogger.cs + + + Logging\ILogManager.cs + + + Logging\LogSeverity.cs + + + MediaInfo\BlurayDiscInfo.cs + + + MediaInfo\IBlurayExaminer.cs + + + Net\HttpException.cs + + + Net\NetworkShare.cs + + + Net\NetworkShareType.cs + + + Net\WebSocketMessage.cs + + + Net\WebSocketMessageType.cs + + + Net\WebSocketState.cs + + + Plugins\BasePluginConfiguration.cs + + + Plugins\PluginInfo.cs + + + Querying\ArtistsQuery.cs + + + Querying\ItemFields.cs + + + Querying\ItemFilter.cs + + + Querying\ItemQuery.cs + + + Querying\ItemReviewsResult.cs + + + Querying\ItemsByNameQuery.cs + + + Querying\ItemSortBy.cs + + + Querying\ItemsResult.cs + + + Querying\PersonsQuery.cs + + + Querying\ThemeSongsResult.cs + + + Search\SearchHint.cs + + + Search\SearchHintResult.cs + + + Serialization\IJsonSerializer.cs + + + Serialization\IXmlSerializer.cs + + + Session\BrowseRequest.cs + + + Session\PlayRequest.cs + + + Session\PlaystateRequest.cs + + + Session\SessionInfoDto.cs + + + System\SystemInfo.cs + + + Tasks\SystemEvent.cs + + + Tasks\TaskCompletionStatus.cs + + + Tasks\TaskInfo.cs + + + Tasks\TaskResult.cs + + + Tasks\TaskState.cs + + + Tasks\TaskTriggerInfo.cs + + + Updates\CheckForUpdateResult.cs + + + Updates\InstallationInfo.cs + + + Updates\PackageInfo.cs + + + Updates\PackageTargetSystem.cs + + + Updates\PackageType.cs + + + Updates\PackageVersionClass.cs + + + Updates\PackageVersionInfo.cs + + + Weather\WeatherForecast.cs + + + Weather\WeatherInfo.cs + + + Weather\WeatherStatus.cs + + + Weather\WeatherUnits.cs + + + Web\QueryStringDictionary.cs + + + Properties\SharedVersion.cs + + + + + + + + + if $(ConfigurationName) == Release ( +xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i +) + + + \ No newline at end of file diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.snk b/MediaBrowser.Model.net35/MediaBrowser.Model.snk new file mode 100644 index 0000000000..f8188c78e3 Binary files /dev/null and b/MediaBrowser.Model.net35/MediaBrowser.Model.snk differ diff --git a/MediaBrowser.Model.net35/Properties/AssemblyInfo.cs b/MediaBrowser.Model.net35/Properties/AssemblyInfo.cs new file mode 100644 index 0000000000..0e8af504b3 --- /dev/null +++ b/MediaBrowser.Model.net35/Properties/AssemblyInfo.cs @@ -0,0 +1,31 @@ +using System.Reflection; +using System.Runtime.CompilerServices; +using System.Runtime.InteropServices; + +// General Information about an assembly is controlled through the following +// set of attributes. Change these attribute values to modify the information +// associated with an assembly. +[assembly: AssemblyTitle("MediaBrowser.Model.net35")] +[assembly: AssemblyDescription("")] +[assembly: AssemblyConfiguration("")] +[assembly: AssemblyCompany("")] +[assembly: AssemblyProduct("MediaBrowser.Model.net35")] +[assembly: AssemblyCopyright("Copyright © 2013")] +[assembly: AssemblyTrademark("")] +[assembly: AssemblyCulture("")] + +// Setting ComVisible to false makes the types in this assembly not visible +// to COM components. If you need to access a type in this assembly from +// COM, set the ComVisible attribute to true on that type. +[assembly: ComVisible(false)] + +// The following GUID is for the ID of the typelib if this project is exposed to COM +[assembly: Guid("801b3f80-cddc-4a3a-986b-3e7f0293da4b")] + +// Version information for an assembly consists of the following four values: +// +// Major Version +// Minor Version +// Build Number +// Revision +// \ No newline at end of file diff --git a/MediaBrowser.Model/Extensions/ModelExtensions.cs b/MediaBrowser.Model/Extensions/ModelExtensions.cs index 098ed21b48..6717be8d9c 100644 --- a/MediaBrowser.Model/Extensions/ModelExtensions.cs +++ b/MediaBrowser.Model/Extensions/ModelExtensions.cs @@ -12,7 +12,7 @@ namespace MediaBrowser.Model.Extensions /// The STR. /// The def. /// System.String. - public static string ValueOrDefault(this string str, string def = "") + internal static string ValueOrDefault(this string str, string def = "") { return string.IsNullOrEmpty(str) ? def : str; } diff --git a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs index a8108f56e5..62268c0c37 100644 --- a/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs +++ b/MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs @@ -1,4 +1,3 @@ -using System.Linq; using MediaBrowser.Common.Configuration; using MediaBrowser.Controller.Entities; using MediaBrowser.Controller.Persistence; @@ -10,6 +9,7 @@ using System; using System.Collections.Generic; using System.Data; using System.IO; +using System.Linq; using System.Threading; using System.Threading.Tasks; diff --git a/MediaBrowser.sln b/MediaBrowser.sln index eb3251f741..ce16b4d2e7 100644 --- a/MediaBrowser.sln +++ b/MediaBrowser.sln @@ -31,6 +31,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Common.Impleme EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Server.Implementations", "MediaBrowser.Server.Implementations\MediaBrowser.Server.Implementations.csproj", "{2E781478-814D-4A48-9D80-BFF206441A65}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MediaBrowser.Model.net35", "MediaBrowser.Model.net35\MediaBrowser.Model.net35.csproj", "{657B5410-7C3B-4806-9753-D254102CE537}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -169,6 +171,20 @@ Global {2E781478-814D-4A48-9D80-BFF206441A65}.Release|Win32.ActiveCfg = Release|Any CPU {2E781478-814D-4A48-9D80-BFF206441A65}.Release|x64.ActiveCfg = Release|Any CPU {2E781478-814D-4A48-9D80-BFF206441A65}.Release|x86.ActiveCfg = Release|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Debug|Any CPU.Build.0 = Debug|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Debug|Mixed Platforms.ActiveCfg = Debug|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Debug|Mixed Platforms.Build.0 = Debug|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Debug|Win32.ActiveCfg = Debug|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Debug|x64.ActiveCfg = Debug|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Debug|x86.ActiveCfg = Debug|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Release|Any CPU.ActiveCfg = Release|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Release|Any CPU.Build.0 = Release|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Release|Mixed Platforms.ActiveCfg = Release|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Release|Mixed Platforms.Build.0 = Release|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Release|Win32.ActiveCfg = Release|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Release|x64.ActiveCfg = Release|Any CPU + {657B5410-7C3B-4806-9753-D254102CE537}.Release|x86.ActiveCfg = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec index 5d9e18bc4e..1b1eca976c 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Common.Internal - 3.0.101 + 3.0.102 MediaBrowser.Common.Internal Luke ebr,Luke,scottisafool @@ -12,9 +12,9 @@ Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption. Copyright © Media Browser 2013 - + - + diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 2a8f7f06ab..7e89059119 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -1,18 +1,19 @@  - + MediaBrowser.Common - 3.0.101 + 3.0.102 MediaBrowser.Common Media Browser Team ebr,Luke,scottisafool https://github.com/MediaBrowser/MediaBrowser - http://www.mb3admin.com/images/mb3icons1-1.png + http://www.mb3admin.com/images/mb3icons1-1.png false - Copyright © Media Browser 2013 Contains common model objects and interfaces used by all Media Browser solutions. + Copyright © Media Browser 2013 + diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index ad05e4fd3a..f0b7cc36a2 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ MediaBrowser.Server.Core - 3.0.101 + 3.0.102 Media Browser.Server.Core Media Browser Team ebr,Luke,scottisafool @@ -12,7 +12,7 @@ Contains core components required to build plugins for Media Browser Server. Copyright © Media Browser 2013 - +