Bladeren bron

* Fixed ImageMagick and XmlTv references
* Repplaced IsoMounter binary blob with source (not yet compiling)

Vasily 6 jaren geleden
bovenliggende
commit
149f75f3f4

+ 3 - 0
.gitmodules

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

+ 1 - 5
Emby.Drawing.ImageMagick/Emby.Drawing.ImageMagick.csproj

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

+ 1 - 0
Emby.IsoMounting

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

+ 1 - 1
Emby.Server.Implementations/Emby.Server.Implementations.csproj

@@ -17,7 +17,7 @@
     <ProjectReference Include="..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
     <ProjectReference Include="..\Emby.Photos\Emby.Photos.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>

+ 1 - 3
MediaBrowser.Server.Mono/EmbyServer.csproj

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

+ 1 - 1
MediaBrowser.Server.Mono/MonoAppHost.cs

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