diff options
| author | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-18 16:52:08 -0500 |
|---|---|---|
| committer | Luke Pulverenti <luke.pulverenti@gmail.com> | 2014-01-18 16:52:08 -0500 |
| commit | f4f0602c54cfb7704b74390bc9ddf4c260e0bcfa (patch) | |
| tree | 10de90a9223b388bf47284a027b47ba9b635d8e7 | |
| parent | 7f51148130a95b73c1d2cfac10aa04b3817944b5 (diff) | |
| parent | 5c4da22c82d00bd7759257e7eedafe62ae1d8816 (diff) | |
Merge branch 'master' of https://github.com/MediaBrowser/MediaBrowser
| -rw-r--r-- | MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj | 3 | ||||
| -rw-r--r-- | MediaBrowser.Server.Mono/Native/Assemblies.cs | 5 |
2 files changed, 7 insertions, 1 deletions
diff --git a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj b/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj index 0bd2a775b..6b000435a 100644 --- a/MediaBrowser.Server.Mono/MediaBrowser.Server.Mono.csproj +++ b/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"> diff --git a/MediaBrowser.Server.Mono/Native/Assemblies.cs b/MediaBrowser.Server.Mono/Native/Assemblies.cs index eae6366e1..1e442bc65 100644 --- a/MediaBrowser.Server.Mono/Native/Assemblies.cs +++ b/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; } } |