Updated NuGet build.

11 years ago · a6079c23f6
5 changed files with 19 additions and 8 deletions
--- a/.gitignore
+++ b/.gitignore
@ -16,7 +16,6 @@
 [Dd]ebug/
 [Rr]elease/
 x64/
-build/
 [Bb]in/
 [Oo]bj/

--- a/nuget/.gitignore
+++ b/nuget/.gitignore
@ -1,2 +1,7 @@
-lib/
+- build/
+
+**/lib/**/*.dll
+**/lib/**/*.xml
+**/build/**/*.dll
+**/build/**/*.xml
 *.nupkg
--- a/nuget/Perspex/Perspex.nuspec
+++ b/nuget/Perspex/Perspex.nuspec
@ -15,8 +15,6 @@
    <dependencies>
      <dependency id="Glass" version="1.4.4.0" />
      <dependency id="OmniXaml" version="1.4.4.0" />
-      <dependency id="OmniXaml.AppServices" version="1.4.4.0" />
-      <dependency id="OmniXaml.AppServices.NetCore" version="1.4.4.0" />
      <dependency id="reactiveui" version="6.5.0" />
      <dependency id="reactiveui-core" version="6.5.0" />
      <dependency id="Serilog" version="1.5.9" />
--- a/nuget/Perspex/build/net45/perspex.targets
+++ b/nuget/Perspex/build/net45/perspex.targets
@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <ItemGroup Condition="'$(MSBuildThisFileDirectory)' != '' And HasTrailingSlash('$(MSBuildThisFileDirectory)')">
+    <PlatformLibs Include="$(MSBuildThisFileDirectory)**\*.dll" />
+    <Content Include="@(PlatformLibs)">
+      <Link>%(RecursiveDir)%(FileName)%(Extension)</Link>
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+</Project>
--- a/nuget/build.bat
+++ b/nuget/build.bat
@ -26,10 +26,8 @@ copy ..\src\Perspex.Styling\bin\Release\Perspex.Styling.dll %lib%
 copy ..\src\Perspex.Styling\bin\Release\Perspex.Styling.xml %lib%
 copy ..\src\Perspex.Themes.Default\bin\Release\Perspex.Themes.Default.dll %lib%
 copy ..\src\Perspex.Themes.Default\bin\Release\Perspex.Themes.Default.xml %lib%
-copy ..\src\Markup\Perspex.Xaml\bin\Release\Perspex.Xaml.dll %lib%
-copy ..\src\Markup\Perspex.Xaml\bin\Release\Perspex.Xaml.xml %lib%
-copy ..\src\Markup\Perspex.Xaml.Desktop\bin\Release\Perspex.Xaml.Desktop.dll %lib%
-copy ..\src\Markup\Perspex.Xaml.Desktop\bin\Release\Perspex.Xaml.Desktop.xml %lib%
+copy ..\src\Markup\Perspex.Markup.Xaml\bin\Release\Perspex.Markup.Xaml.dll %lib%
+copy ..\src\Markup\Perspex.Markup.Xaml\bin\Release\Perspex.Markup.Xaml.xml %lib%
 copy ..\src\NGenerics\bin\Release\NGenerics.dll %lib%

 copy ..\src\Windows\Perspex.Direct2D1\bin\Release\Perspex.Direct2D1.dll %build%