diff --git a/.gitignore b/.gitignore index a599a267d4..a8ef638bda 100644 --- a/.gitignore +++ b/.gitignore @@ -16,7 +16,6 @@ [Dd]ebug/ [Rr]elease/ x64/ -build/ [Bb]in/ [Oo]bj/ diff --git a/nuget/.gitignore b/nuget/.gitignore index 4251aa8028..93a9893778 100644 --- a/nuget/.gitignore +++ b/nuget/.gitignore @@ -1,2 +1,7 @@ -lib/ +- build/ + +**/lib/**/*.dll +**/lib/**/*.xml +**/build/**/*.dll +**/build/**/*.xml *.nupkg \ No newline at end of file diff --git a/nuget/Perspex/Perspex.nuspec b/nuget/Perspex/Perspex.nuspec index 6addb91316..432f210f05 100644 --- a/nuget/Perspex/Perspex.nuspec +++ b/nuget/Perspex/Perspex.nuspec @@ -15,8 +15,6 @@ - - diff --git a/nuget/Perspex/build/net45/perspex.targets b/nuget/Perspex/build/net45/perspex.targets new file mode 100644 index 0000000000..70d36cf835 --- /dev/null +++ b/nuget/Perspex/build/net45/perspex.targets @@ -0,0 +1,11 @@ + + + + + + + %(RecursiveDir)%(FileName)%(Extension) + PreserveNewest + + + \ No newline at end of file diff --git a/nuget/build.bat b/nuget/build.bat index 73a7c62860..8ef89045de 100644 --- 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%