michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

* Fixed ImageMagick and XmlTv references

Browse Source 
* Repplaced IsoMounter binary blob with source (not yet compiling)
This commit is contained in:
Vasily 2018-11-06 19:24:06 +03:00
parent fdeefd0775
commit 149f75f3f4
6 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

@ -4,3 +4,6 @@
[submodule "ImageMagickSharp"] [submodule "ImageMagickSharp"]
path = ImageMagickSharp path = ImageMagickSharp
url = https://github.com/JustAMan/ImageMagickSharp.git url = https://github.com/JustAMan/ImageMagickSharp.git
[submodule "Emby.IsoMounting"]
path = Emby.IsoMounting
url = https://github.com/JustAMan/Emby.IsoMounting.git

6
Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj
View File

@ -6,11 +6,7 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="ImageMagickSharp" Version="1.0.0.20" /> <ProjectReference Include="..\ImageMagickSharp\ImageMagickSharp\ImageMagickSharp.csproj" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\ImageMagickSharp/ImageMagickSharp/ImageMagickSharp.csproj" />
<ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" /> <ProjectReference Include="..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
<ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" /> <ProjectReference Include="..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
<ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" /> <ProjectReference Include="..\MediaBrowser.Model\MediaBrowser.Model.csproj" />

1
Emby.IsoMounting Submodule

@ -0,0 +1 @@
Subproject commit b43ef42ae2690167f0b8a56f6d64f1bf2fcb6cf6

2
Emby.Server.Implementations/Emby.Server.Implementations.csproj
View File

@ -17,7 +17,7 @@
<ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" /> <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
<ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj" /> <ProjectReference Include="..\Emby.Photos\Emby.Photos.csproj" />
<ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" /> <ProjectReference Include="..\Emby.Drawing\Emby.Drawing.csproj" />
<ProjectReference Include="..\Emby.XmlTv/Emby.XmlTv/Emby.XmlTv.csproj" /> <ProjectReference Include="..\Emby.XmlTv\Emby.XmlTv\Emby.XmlTv.csproj" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

4
MediaBrowser.Server.Mono/EmbyServer.csproj
View File

@ -34,12 +34,10 @@
<Reference Include="Emby.Server.MediaEncoding"> <Reference Include="Emby.Server.MediaEncoding">
<HintPath>..\ThirdParty\emby\Emby.Server.MediaEncoding.dll</HintPath> <HintPath>..\ThirdParty\emby\Emby.Server.MediaEncoding.dll</HintPath>
</Reference> </Reference>
<Reference Include="MediaBrowser.IsoMounting.Linux">
<HintPath>..\ThirdParty\MediaBrowser.IsoMounting.Linux\MediaBrowser.IsoMounting.Linux.dll</HintPath>
</Reference>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\Emby.IsoMounting\IsoMounter\IsoMounter.csproj" />
<ProjectReference Include="..\BDInfo\BDInfo.csproj" /> <ProjectReference Include="..\BDInfo\BDInfo.csproj" />
<ProjectReference Include="..\DvdLib\DvdLib.csproj" /> <ProjectReference Include="..\DvdLib\DvdLib.csproj" />
<ProjectReference Include="..\Emby.Dlna\Emby.Dlna.csproj" /> <ProjectReference Include="..\Emby.Dlna\Emby.Dlna.csproj" />

2
MediaBrowser.Server.Mono/MonoAppHost.cs
View File

@ -12,7 +12,7 @@ using Emby.Server.Sync;
using MediaBrowser.Controller.Connect; using MediaBrowser.Controller.Connect;
using MediaBrowser.Controller.Net; using MediaBrowser.Controller.Net;
using MediaBrowser.Controller.Sync; using MediaBrowser.Controller.Sync;
using MediaBrowser.IsoMounter; using IsoMounter;
using MediaBrowser.Model.IO; using MediaBrowser.Model.IO;
using MediaBrowser.Model.Logging; using MediaBrowser.Model.Logging;
using MediaBrowser.Model.Services; using MediaBrowser.Model.Services;