diff options
Diffstat (limited to 'MediaBrowser.Tests')
4 files changed, 10 insertions, 24 deletions
diff --git a/MediaBrowser.Tests/MediaBrowser.Tests.csproj b/MediaBrowser.Tests/MediaBrowser.Tests.csproj index a031d47ea..57a645ce0 100644 --- a/MediaBrowser.Tests/MediaBrowser.Tests.csproj +++ b/MediaBrowser.Tests/MediaBrowser.Tests.csproj @@ -37,6 +37,9 @@ <WarningLevel>4</WarningLevel> </PropertyGroup> <ItemGroup> + <Reference Include="Emby.Server.MediaEncoding"> + <HintPath>..\ThirdParty\emby\Emby.Server.MediaEncoding.dll</HintPath> + </Reference> <Reference Include="System" /> <Reference Include="System.XML" /> </ItemGroup> @@ -69,10 +72,6 @@ <Project>{1e37a338-9f57-4b70-bd6d-bb9c591e319b}</Project> <Name>Emby.Common.Implementations</Name> </ProjectReference> - <ProjectReference Include="..\Emby.Server.Core\Emby.Server.Core.csproj"> - <Project>{776b9f0c-5195-45e3-9a36-1cc1f0d8e0b0}</Project> - <Name>Emby.Server.Core</Name> - </ProjectReference> <ProjectReference Include="..\Emby.Server.Implementations\Emby.Server.Implementations.csproj"> <Project>{e383961b-9356-4d5d-8233-9a1079d03055}</Project> <Name>Emby.Server.Implementations</Name> @@ -85,10 +84,6 @@ <Project>{17e1f4e6-8abd-4fe5-9ecf-43d4b6087ba2}</Project> <Name>MediaBrowser.Controller</Name> </ProjectReference> - <ProjectReference Include="..\MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj"> - <Project>{0BD82FA6-EB8A-4452-8AF5-74F9C3849451}</Project> - <Name>MediaBrowser.MediaEncoding</Name> - </ProjectReference> <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj"> <Project>{7eeeb4bb-f3e8-48fc-b4c5-70f0fff8329b}</Project> <Name>MediaBrowser.Model</Name> @@ -108,20 +103,10 @@ </ItemGroup> <ItemGroup> <None Include="app.config" /> - </ItemGroup> - <ItemGroup> - <None Include="MediaEncoding\Subtitles\TestSubtitles\expected.vtt"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="MediaEncoding\Subtitles\TestSubtitles\data.ass"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="MediaEncoding\Subtitles\TestSubtitles\data2.ass"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> - <None Include="MediaEncoding\Subtitles\TestSubtitles\unit.srt"> - <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> - </None> + <None Include="MediaEncoding\Subtitles\TestSubtitles\data.ass" /> + <None Include="MediaEncoding\Subtitles\TestSubtitles\data2.ass" /> + <None Include="MediaEncoding\Subtitles\TestSubtitles\expected.vtt" /> + <None Include="MediaEncoding\Subtitles\TestSubtitles\unit.srt" /> </ItemGroup> <ItemGroup> <ContentWithTargetPath Include="ConsistencyTests\Resources\StringCheck.xslt"> diff --git a/MediaBrowser.Tests/MediaEncoding/Subtitles/AssParserTests.cs b/MediaBrowser.Tests/MediaEncoding/Subtitles/AssParserTests.cs index d5a62802d..47f5891c6 100644 --- a/MediaBrowser.Tests/MediaEncoding/Subtitles/AssParserTests.cs +++ b/MediaBrowser.Tests/MediaEncoding/Subtitles/AssParserTests.cs @@ -5,6 +5,7 @@ using Microsoft.VisualStudio.TestTools.UnitTesting; using System.Collections.Generic; using System.IO; using System.Threading; +using Emby.Server.MediaEncoding.Subtitles; namespace MediaBrowser.Tests.MediaEncoding.Subtitles { diff --git a/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs b/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs index af34e13e7..280dc5d78 100644 --- a/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs +++ b/MediaBrowser.Tests/MediaEncoding/Subtitles/SrtParserTests.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Threading; -using MediaBrowser.MediaEncoding.Subtitles; +using Emby.Server.MediaEncoding.Subtitles; using MediaBrowser.Model.Logging; using MediaBrowser.Model.MediaInfo; using Microsoft.VisualStudio.TestTools.UnitTesting; diff --git a/MediaBrowser.Tests/MediaEncoding/Subtitles/VttWriterTest.cs b/MediaBrowser.Tests/MediaEncoding/Subtitles/VttWriterTest.cs index 924a1736f..f6e2c5298 100644 --- a/MediaBrowser.Tests/MediaEncoding/Subtitles/VttWriterTest.cs +++ b/MediaBrowser.Tests/MediaEncoding/Subtitles/VttWriterTest.cs @@ -1,7 +1,7 @@ using System.Collections.Generic; using System.IO; using System.Threading; -using MediaBrowser.MediaEncoding.Subtitles; +using Emby.Server.MediaEncoding.Subtitles; using MediaBrowser.Model.MediaInfo; using Microsoft.VisualStudio.TestTools.UnitTesting; |