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

6 files changed, 37 insertions, 20 deletions

diff --git a/MediaBrowser.ClickOnce/MediaBrowser.ClickOnce.csproj b/MediaBrowser.ClickOnce/MediaBrowser.ClickOnce.csproj
index 6043df0eb..9d8c207dc 100644
--- a/MediaBrowser.ClickOnce/MediaBrowser.ClickOnce.csproj
+++ b/MediaBrowser.ClickOnce/MediaBrowser.ClickOnce.csproj
@@ -51,6 +51,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/MediaBrowser.IsoMounter/MediaBrowser.IsoMounter.csproj b/MediaBrowser.IsoMounter/MediaBrowser.IsoMounter.csproj
index 1af10a30e..36d929267 100644
--- a/MediaBrowser.IsoMounter/MediaBrowser.IsoMounter.csproj
+++ b/MediaBrowser.IsoMounter/MediaBrowser.IsoMounter.csproj
@@ -81,6 +81,10 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i
+xcopy "$(TargetDir)pfmclrapi.dll" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/MediaBrowser.Logging.NLog/MediaBrowser.Logging.NLog.csproj b/MediaBrowser.Logging.NLog/MediaBrowser.Logging.NLog.csproj
index 592e09a83..1bc608679 100644
--- a/MediaBrowser.Logging.NLog/MediaBrowser.Logging.NLog.csproj
+++ b/MediaBrowser.Logging.NLog/MediaBrowser.Logging.NLog.csproj
@@ -63,6 +63,9 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)\.nuget\nuget.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/MediaBrowser.Networking/MediaBrowser.Networking.csproj b/MediaBrowser.Networking/MediaBrowser.Networking.csproj
index cd66fd184..194f9e400 100644
--- a/MediaBrowser.Networking/MediaBrowser.Networking.csproj
+++ b/MediaBrowser.Networking/MediaBrowser.Networking.csproj
@@ -59,6 +59,9 @@
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <PropertyGroup>
+    <PostBuildEvent>xcopy "$(TargetPath)" "$(SolutionDir)\Nuget\dlls\" /y /d /r /i</PostBuildEvent>
+  </PropertyGroup>
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
   <Target Name="BeforeBuild">
diff --git a/Nuget/MediaBrowser.Common.Internal.nuspec b/Nuget/MediaBrowser.Common.Internal.nuspec
new file mode 100644
index 000000000..9e431b767
--- /dev/null
+++ b/Nuget/MediaBrowser.Common.Internal.nuspec
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
+    <metadata>
+        <id>MediaBrowser.Common.Internal</id>
+        <version>3.0.1</version>
+        <title />
+        <authors>Luke</authors>
+        <owners>Media Browser Team</owners>
+        <projectUrl>https://github.com/MediaBrowser/MediaBrowser</projectUrl>
+        <requireLicenseAcceptance>false</requireLicenseAcceptance>
+        <description>Contains common components shared by Media Browser Theatre and Media Browser Server. Not intended for plugin developer consumption.</description>
+        <dependencies>
+            <dependency id="MediaBrowser.Common" version="3.0.0" />
+            <dependency id="NLog" version="2.0.0.2000" />
+        </dependencies>
+    </metadata>
+    <files>
+        <file src="lib\net45\MediaBrowser.ClickOnce.dll" target="lib\net45\MediaBrowser.ClickOnce.dll" />
+        <file src="lib\net45\MediaBrowser.IsoMounter.dll" target="lib\net45\MediaBrowser.IsoMounter.dll" />
+        <file src="lib\net45\MediaBrowser.Logging.NLog.dll" target="lib\net45\MediaBrowser.Logging.NLog.dll" />
+        <file src="lib\net45\MediaBrowser.Networking.dll" target="lib\net45\MediaBrowser.Networking.dll" />
+        <file src="lib\net45\pfmclrapi.dll" target="lib\net45\pfmclrapi.dll" />
+    </files>
+</package>
\ No newline at end of file
diff --git a/Nuget/MediaBrowser.Theater.Core.nuspec b/Nuget/MediaBrowser.Theater.Core.nuspec
deleted file mode 100644
index 1456ced03..000000000
--- a/Nuget/MediaBrowser.Theater.Core.nuspec
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <metadata>
-        <id>MediaBrowser.Theater.Core</id>
-        <version>1.0.0</version>
-        <title>MediaBrowser.Theater.Core</title>
-        <authors>Media Browser Team</authors>
-        <owners />
-        <projectUrl>https://github.com/MediaBrowser/MediaBrowser.Theater</projectUrl>
-        <requireLicenseAcceptance>false</requireLicenseAcceptance>
-        <description>Contains components required to build plugins for Media Browser Theater.</description>
-        <dependencies>
-            <dependency id="MediaBrowser.Common" version="1.0.1" />
-        </dependencies>
-    </metadata>
-    <files>
-        <file src="dlls\MediaBrowser.UI.Controls.dll" target="lib\net45\MediaBrowser.UI.Controls.dll" />
-        <file src="dlls\MediaBrowser.UI.dll" target="lib\net45\MediaBrowser.UI.dll" />
-    </files>
-</package>
\ No newline at end of file