Merge pull request #2281 from MediaBrowser/dev

Dev

2 files changed, 42 insertions, 3 deletions

diff --git a/src/Emby.Server/Emby.Server.xproj b/src/Emby.Server/Emby.Server.xproj
index 81fffc639..6a23809ce 100644
--- a/src/Emby.Server/Emby.Server.xproj
+++ b/src/Emby.Server/Emby.Server.xproj
@@ -18,14 +18,24 @@
   <ItemGroup>
     <ProjectReference Include="..\..\BDInfo\BDInfo.csproj" />
     <ProjectReference Include="..\..\DvdLib\DvdLib.csproj" />
+    <ProjectReference Include="..\..\Emby.Dlna\Emby.Dlna.csproj" />
+    <ProjectReference Include="..\..\Emby.Drawing\Emby.Drawing.csproj" />
+    <ProjectReference Include="..\..\Emby.Photos\Emby.Photos.csproj" />
+    <ProjectReference Include="..\..\Emby.Server.Implementations\Emby.Server.Implementations.csproj" />
+    <ProjectReference Include="..\..\MediaBrowser.Api\MediaBrowser.Api.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.Common\MediaBrowser.Common.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.Controller\MediaBrowser.Controller.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.LocalMetadata\MediaBrowser.LocalMetadata.csproj" />
+    <ProjectReference Include="..\..\MediaBrowser.MediaEncoding\MediaBrowser.MediaEncoding.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.Model\MediaBrowser.Model.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.Providers\MediaBrowser.Providers.csproj" />
+    <ProjectReference Include="..\..\MediaBrowser.Server.Implementations\MediaBrowser.Server.Implementations.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.WebDashboard\MediaBrowser.WebDashboard.csproj" />
     <ProjectReference Include="..\..\MediaBrowser.XbmcMetadata\MediaBrowser.XbmcMetadata.csproj" />
     <ProjectReference Include="..\..\OpenSubtitlesHandler\OpenSubtitlesHandler.csproj" />
+    <ProjectReference Include="..\..\RSSDP\RSSDP.csproj" />
+    <ProjectReference Include="..\..\ServiceStack\ServiceStack.csproj" />
+    <ProjectReference Include="..\..\SocketHttpListener.Portable\SocketHttpListener.Portable.csproj" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\DotNet\Microsoft.DotNet.targets" Condition="'$(VSToolsPath)' != ''" />
 </Project>
\ No newline at end of file
diff --git a/src/Emby.Server/project.json b/src/Emby.Server/project.json
index 66ebeec3c..2693435a4 100644
--- a/src/Emby.Server/project.json
+++ b/src/Emby.Server/project.json
@@ -6,13 +6,12 @@
 
   "dependencies": {
     "Emby.Common.Implementations": "1.0.0-*",
-    "Emby.Dlna": "1.0.0-*",
+    "Emby.Server.Core": "1.0.0-*",
     "Microsoft.NETCore.App": {
       "type": "platform",
       "version": "1.0.1"
     },
-    "Mono.Nat": "1.0.0-*",
-    "RSSDP": "1.0.0-*"
+    "Mono.Nat": "1.0.0-*"
   },
 
   "frameworks": {
@@ -25,6 +24,21 @@
         "DvdLib": {
           "target": "project"
         },
+        "Emby.Dlna": {
+          "target": "project"
+        },
+        "Emby.Drawing": {
+          "target": "project"
+        },
+        "Emby.Photos": {
+          "target": "project"
+        },
+        "Emby.Server.Implementations": {
+          "target": "project"
+        },
+        "MediaBrowser.Api": {
+          "target": "project"
+        },
         "MediaBrowser.Common": {
           "target": "project"
         },
@@ -34,12 +48,18 @@
         "MediaBrowser.LocalMetadata": {
           "target": "project"
         },
+        "MediaBrowser.MediaEncoding": {
+          "target": "project"
+        },
         "MediaBrowser.Model": {
           "target": "project"
         },
         "MediaBrowser.Providers": {
           "target": "project"
         },
+        "MediaBrowser.Server.Implementations": {
+          "target": "project"
+        },
         "MediaBrowser.WebDashboard": {
           "target": "project"
         },
@@ -48,6 +68,15 @@
         },
         "OpenSubtitlesHandler": {
           "target": "project"
+        },
+        "RSSDP": {
+          "target": "project"
+        },
+        "ServiceStack": {
+          "target": "project"
+        },
+        "SocketHttpListener.Portable": {
+          "target": "project"
         }
       }
     }