diff options
| -rw-r--r-- | MediaBrowser.Api/BaseApiService.cs | 6 | ||||
| -rw-r--r-- | MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj | 353 | ||||
| -rw-r--r-- | MediaBrowser.Model.net35/MediaBrowser.Model.snk | bin | 0 -> 596 bytes | |||
| -rw-r--r-- | MediaBrowser.Model.net35/Properties/AssemblyInfo.cs | 31 | ||||
| -rw-r--r-- | MediaBrowser.Model/Extensions/ModelExtensions.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.Server.Implementations/Sqlite/SQLiteItemRepository.cs | 2 | ||||
| -rw-r--r-- | MediaBrowser.sln | 16 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Common.Internal.nuspec | 6 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Common.nuspec | 9 | ||||
| -rw-r--r-- | Nuget/MediaBrowser.Server.Core.nuspec | 4 |
10 files changed, 415 insertions, 14 deletions
diff --git a/MediaBrowser.Api/BaseApiService.cs b/MediaBrowser.Api/BaseApiService.cs index e8af6ab13..36f8257b3 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 000000000..b3b490ac4 --- /dev/null +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.net35.csproj @@ -0,0 +1,353 @@ +<?xml version="1.0" encoding="utf-8"?> +<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> + <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" /> + <PropertyGroup> + <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration> + <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform> + <ProjectGuid>{657B5410-7C3B-4806-9753-D254102CE537}</ProjectGuid> + <OutputType>Library</OutputType> + <AppDesignerFolder>Properties</AppDesignerFolder> + <RootNamespace>MediaBrowser.Model.net35</RootNamespace> + <AssemblyName>MediaBrowser.Model.net35</AssemblyName> + <TargetFrameworkVersion>v3.5</TargetFrameworkVersion> + <FileAlignment>512</FileAlignment> + <TargetFrameworkProfile /> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' "> + <DebugSymbols>true</DebugSymbols> + <DebugType>full</DebugType> + <Optimize>false</Optimize> + <OutputPath>bin\Debug\</OutputPath> + <DefineConstants>DEBUG;TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' "> + <DebugType>pdbonly</DebugType> + <Optimize>true</Optimize> + <OutputPath>bin\Release\</OutputPath> + <DefineConstants>TRACE</DefineConstants> + <ErrorReport>prompt</ErrorReport> + <WarningLevel>4</WarningLevel> + </PropertyGroup> + <PropertyGroup> + <SignAssembly>true</SignAssembly> + </PropertyGroup> + <PropertyGroup> + <AssemblyOriginatorKeyFile>MediaBrowser.Model.snk</AssemblyOriginatorKeyFile> + </PropertyGroup> + <PropertyGroup> + <RunPostBuildEvent>Always</RunPostBuildEvent> + </PropertyGroup> + <ItemGroup> + <Reference Include="System" /> + <Reference Include="System.Core" /> + <Reference Include="System.Runtime.Serialization" /> + <Reference Include="System.Xml.Linq" /> + <Reference Include="System.Data.DataSetExtensions" /> + <Reference Include="Microsoft.CSharp" /> + <Reference Include="System.Data" /> + <Reference Include="System.Xml" /> + </ItemGroup> + <ItemGroup> + <Compile Include="..\MediaBrowser.Model\Configuration\BaseApplicationConfiguration.cs"> + <Link>Configuration\BaseApplicationConfiguration.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\ServerConfiguration.cs"> + <Link>Configuration\ServerConfiguration.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Configuration\UserConfiguration.cs"> + <Link>Configuration\UserConfiguration.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Drawing\DrawingUtils.cs"> + <Link>Drawing\DrawingUtils.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\BaseItemDto.cs"> + <Link>Dto\BaseItemDto.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\BaseItemPerson.cs"> + <Link>Dto\BaseItemPerson.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\ChapterInfoDto.cs"> + <Link>Dto\ChapterInfoDto.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\IItemDto.cs"> + <Link>Dto\IItemDto.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\ImageInfo.cs"> + <Link>Dto\ImageInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\ImageOptions.cs"> + <Link>Dto\ImageOptions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\ItemByNameCounts.cs"> + <Link>Dto\ItemByNameCounts.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\StreamOptions.cs"> + <Link>Dto\StreamOptions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\StudioDto.cs"> + <Link>Dto\StudioDto.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\UserDto.cs"> + <Link>Dto\UserDto.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Dto\UserItemDataDto.cs"> + <Link>Dto\UserItemDataDto.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\BaseItemInfo.cs"> + <Link>Entities\BaseItemInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\ChapterInfo.cs"> + <Link>Entities\ChapterInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\DisplayPreferences.cs"> + <Link>Entities\DisplayPreferences.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\IByReferenceItem.cs"> + <Link>Entities\IByReferenceItem.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\IHasMediaStreams.cs"> + <Link>Entities\IHasMediaStreams.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\IHasProviderIds.cs"> + <Link>Entities\IHasProviderIds.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\ImageDownloadOptions.cs"> + <Link>Entities\ImageDownloadOptions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\ImageType.cs"> + <Link>Entities\ImageType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\ItemReview.cs"> + <Link>Entities\ItemReview.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\LibraryUpdateInfo.cs"> + <Link>Entities\LibraryUpdateInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\LocationType.cs"> + <Link>Entities\LocationType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\MBRegistrationRecord.cs"> + <Link>Entities\MBRegistrationRecord.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\MediaStream.cs"> + <Link>Entities\MediaStream.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\MediaType.cs"> + <Link>Entities\MediaType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\MetadataProviders.cs"> + <Link>Entities\MetadataProviders.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\ParentalRating.cs"> + <Link>Entities\ParentalRating.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\PersonType.cs"> + <Link>Entities\PersonType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\PluginSecurityInfo.cs"> + <Link>Entities\PluginSecurityInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\RequestResult.cs"> + <Link>Entities\RequestResult.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\SeriesStatus.cs"> + <Link>Entities\SeriesStatus.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\VideoFormat.cs"> + <Link>Entities\VideoFormat.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\VideoType.cs"> + <Link>Entities\VideoType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Entities\VirtualFolderInfo.cs"> + <Link>Entities\VirtualFolderInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Extensions\ModelExtensions.cs"> + <Link>Extensions\ModelExtensions.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Globalization\CountryInfo.cs"> + <Link>Globalization\CountryInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Globalization\CultureDto.cs"> + <Link>Globalization\CultureDto.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\IO\FileSystemEntryInfo.cs"> + <Link>IO\FileSystemEntryInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\IO\IZipClient.cs"> + <Link>IO\IZipClient.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Logging\ILogger.cs"> + <Link>Logging\ILogger.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Logging\ILogManager.cs"> + <Link>Logging\ILogManager.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Logging\LogSeverity.cs"> + <Link>Logging\LogSeverity.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\MediaInfo\BlurayDiscInfo.cs"> + <Link>MediaInfo\BlurayDiscInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\MediaInfo\IBlurayExaminer.cs"> + <Link>MediaInfo\IBlurayExaminer.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Net\HttpException.cs"> + <Link>Net\HttpException.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Net\NetworkShare.cs"> + <Link>Net\NetworkShare.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Net\NetworkShareType.cs"> + <Link>Net\NetworkShareType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Net\WebSocketMessage.cs"> + <Link>Net\WebSocketMessage.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Net\WebSocketMessageType.cs"> + <Link>Net\WebSocketMessageType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Net\WebSocketState.cs"> + <Link>Net\WebSocketState.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Plugins\BasePluginConfiguration.cs"> + <Link>Plugins\BasePluginConfiguration.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Plugins\PluginInfo.cs"> + <Link>Plugins\PluginInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\ArtistsQuery.cs"> + <Link>Querying\ArtistsQuery.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\ItemFields.cs"> + <Link>Querying\ItemFields.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\ItemFilter.cs"> + <Link>Querying\ItemFilter.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\ItemQuery.cs"> + <Link>Querying\ItemQuery.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\ItemReviewsResult.cs"> + <Link>Querying\ItemReviewsResult.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\ItemsByNameQuery.cs"> + <Link>Querying\ItemsByNameQuery.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\ItemSortBy.cs"> + <Link>Querying\ItemSortBy.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\ItemsResult.cs"> + <Link>Querying\ItemsResult.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\PersonsQuery.cs"> + <Link>Querying\PersonsQuery.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Querying\ThemeSongsResult.cs"> + <Link>Querying\ThemeSongsResult.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Search\SearchHint.cs"> + <Link>Search\SearchHint.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Search\SearchHintResult.cs"> + <Link>Search\SearchHintResult.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Serialization\IJsonSerializer.cs"> + <Link>Serialization\IJsonSerializer.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Serialization\IXmlSerializer.cs"> + <Link>Serialization\IXmlSerializer.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\BrowseRequest.cs"> + <Link>Session\BrowseRequest.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlayRequest.cs"> + <Link>Session\PlayRequest.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\PlaystateRequest.cs"> + <Link>Session\PlaystateRequest.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Session\SessionInfoDto.cs"> + <Link>Session\SessionInfoDto.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\System\SystemInfo.cs"> + <Link>System\SystemInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Tasks\SystemEvent.cs"> + <Link>Tasks\SystemEvent.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Tasks\TaskCompletionStatus.cs"> + <Link>Tasks\TaskCompletionStatus.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Tasks\TaskInfo.cs"> + <Link>Tasks\TaskInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Tasks\TaskResult.cs"> + <Link>Tasks\TaskResult.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Tasks\TaskState.cs"> + <Link>Tasks\TaskState.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Tasks\TaskTriggerInfo.cs"> + <Link>Tasks\TaskTriggerInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Updates\CheckForUpdateResult.cs"> + <Link>Updates\CheckForUpdateResult.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Updates\InstallationInfo.cs"> + <Link>Updates\InstallationInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Updates\PackageInfo.cs"> + <Link>Updates\PackageInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Updates\PackageTargetSystem.cs"> + <Link>Updates\PackageTargetSystem.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Updates\PackageType.cs"> + <Link>Updates\PackageType.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Updates\PackageVersionClass.cs"> + <Link>Updates\PackageVersionClass.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Updates\PackageVersionInfo.cs"> + <Link>Updates\PackageVersionInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Weather\WeatherForecast.cs"> + <Link>Weather\WeatherForecast.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Weather\WeatherInfo.cs"> + <Link>Weather\WeatherInfo.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Weather\WeatherStatus.cs"> + <Link>Weather\WeatherStatus.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Weather\WeatherUnits.cs"> + <Link>Weather\WeatherUnits.cs</Link> + </Compile> + <Compile Include="..\MediaBrowser.Model\Web\QueryStringDictionary.cs"> + <Link>Web\QueryStringDictionary.cs</Link> + </Compile> + <Compile Include="..\SharedVersion.cs"> + <Link>Properties\SharedVersion.cs</Link> + </Compile> + <Compile Include="Properties\AssemblyInfo.cs" /> + </ItemGroup> + <ItemGroup> + <None Include="MediaBrowser.Model.snk" /> + </ItemGroup> + <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" /> + <PropertyGroup> + <PostBuildEvent>if $(ConfigurationName) == Release ( +xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i +)</PostBuildEvent> + </PropertyGroup> + <!-- To modify your build process, add your task inside one of the targets below and uncomment it. + Other similar extension points exist, see Microsoft.Common.targets. + <Target Name="BeforeBuild"> + </Target> + <Target Name="AfterBuild"> + </Target> + --> +</Project>
\ No newline at end of file diff --git a/MediaBrowser.Model.net35/MediaBrowser.Model.snk b/MediaBrowser.Model.net35/MediaBrowser.Model.snk Binary files differnew file mode 100644 index 000000000..f8188c78e --- /dev/null +++ b/MediaBrowser.Model.net35/MediaBrowser.Model.snk diff --git a/MediaBrowser.Model.net35/Properties/AssemblyInfo.cs b/MediaBrowser.Model.net35/Properties/AssemblyInfo.cs new file mode 100644 index 000000000..0e8af504b --- /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 098ed21b4..6717be8d9 100644 --- a/MediaBrowser.Model/Extensions/ModelExtensions.cs +++ b/MediaBrowser.Model/Extensions/ModelExtensions.cs @@ -12,7 +12,7 @@ namespace MediaBrowser.Model.Extensions /// <param name="str">The STR.</param> /// <param name="def">The def.</param> /// <returns>System.String.</returns> - 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 a8108f56e..62268c0c3 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 eb3251f74..ce16b4d2e 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 5d9e18bc4..1b1eca976 100644 --- a/Nuget/MediaBrowser.Common.Internal.nuspec +++ b/Nuget/MediaBrowser.Common.Internal.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Common.Internal</id> - <version>3.0.101</version> + <version>3.0.102</version> <title>MediaBrowser.Common.Internal</title> <authors>Luke</authors> <owners>ebr,Luke,scottisafool</owners> @@ -12,9 +12,9 @@ <description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description> <copyright>Copyright © Media Browser 2013</copyright> <dependencies> - <dependency id="MediaBrowser.Common" version="3.0.101" /> + <dependency id="MediaBrowser.Common" version="3.0.102" /> <dependency id="NLog" version="2.0.1.2" /> - <dependency id="ServiceStack.Text" version="3.9.101" /> + <dependency id="ServiceStack.Text" version="3.9.102" /> <dependency id="SimpleInjector" version="2.2.1" /> </dependencies> </metadata> diff --git a/Nuget/MediaBrowser.Common.nuspec b/Nuget/MediaBrowser.Common.nuspec index 2a8f7f06a..7e8905911 100644 --- a/Nuget/MediaBrowser.Common.nuspec +++ b/Nuget/MediaBrowser.Common.nuspec @@ -1,18 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> +<package xmlns="http://schemas.microsoft.com/packaging/2011/08/nuspec.xsd"> <metadata> <id>MediaBrowser.Common</id> - <version>3.0.101</version> + <version>3.0.102</version> <title>MediaBrowser.Common</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> <projectUrl>https://github.com/MediaBrowser/MediaBrowser</projectUrl> - <iconUrl>http://www.mb3admin.com/images/mb3icons1-1.png</iconUrl> + <iconUrl>http://www.mb3admin.com/images/mb3icons1-1.png</iconUrl> <requireLicenseAcceptance>false</requireLicenseAcceptance> - <copyright>Copyright © Media Browser 2013</copyright> <description>Contains common model objects and interfaces used by all Media Browser solutions.</description> + <copyright>Copyright © Media Browser 2013</copyright> </metadata> <files> + <file src="dlls\MediaBrowser.Model.net35.dll" target="lib\net35\MediaBrowser.Model.net35.dll" /> <file src="dlls\MediaBrowser.Common.dll" target="lib\net45\MediaBrowser.Common.dll" /> <file src="dlls\MediaBrowser.Model.dll" target="lib\net45\MediaBrowser.Model.dll" /> <file src="dlls\MediaBrowser.Model.dll" target="lib\portable-net4+sl4+wp7+win8\MediaBrowser.Model.dll" /> diff --git a/Nuget/MediaBrowser.Server.Core.nuspec b/Nuget/MediaBrowser.Server.Core.nuspec index ad05e4fd3..f0b7cc36a 100644 --- a/Nuget/MediaBrowser.Server.Core.nuspec +++ b/Nuget/MediaBrowser.Server.Core.nuspec @@ -2,7 +2,7 @@ <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <metadata> <id>MediaBrowser.Server.Core</id> - <version>3.0.101</version> + <version>3.0.102</version> <title>Media Browser.Server.Core</title> <authors>Media Browser Team</authors> <owners>ebr,Luke,scottisafool</owners> @@ -12,7 +12,7 @@ <description>Contains core components required to build plugins for Media Browser Server.</description> <copyright>Copyright © Media Browser 2013</copyright> <dependencies> - <dependency id="MediaBrowser.Common" version="3.0.101" /> + <dependency id="MediaBrowser.Common" version="3.0.102" /> </dependencies> </metadata> <files> |