Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser

MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj

@@ -48,6 +48,9 @@
       <HintPath>..\ThirdParty\ServiceStack\ServiceStack.Interfaces.dll</HintPath>
     </Reference>
     <Reference Include="Mono.Posix" Condition=" '$(ConfigurationName)' == 'Release Mono' " />
+    <Reference Include="MediaBrowser.IsoMounting.Linux">
+      <HintPath>..\ThirdParty\MediaBrowser.IsoMounting.Linux\MediaBrowser.IsoMounting.Linux.dll</HintPath>
+    </Reference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\SharedVersion.cs">

MediaBrowser.Server.Mono/Native/Assemblies.cs

@@ -1,4 +1,5 @@
-using System.Collections.Generic;
+using MediaBrowser.IsoMounter;
+using System.Collections.Generic;
 using System.Reflection;
 
 namespace MediaBrowser.ServerApplication.Native
@@ -16,6 +17,8 @@ namespace MediaBrowser.ServerApplication.Native
         {
             var list = new List<Assembly>();
 
+            list.Add(typeof(LinuxIsoManager).Assembly);
+
             return list;
         }
     }