jsuarezruiz
/
SkiaSharp
зеркало из
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Don't have multiple of the same libraries in the nuget

This commit is contained in:
Matthew Leibowitz 2017-01-25 15:10:54 +02:00
Родитель cdef3ca54f
Коммит 3d52b76f38
9 изменённых файлов: 17 добавлений и 34 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

8
binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj
Просмотреть файл

@ -51,22 +51,22 @@
</ItemGroup>
<ItemGroup Condition=" '$(OS)' != 'Unix' ">
<None Include="..\..\native-builds\lib\windows\x64\libSkiaSharp.dll">
<Link>x64\libSkiaSharp.dll</Link>
<Link>nuget\runtimes\win7-x64\native\libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\windows\x86\libSkiaSharp.dll">
<Link>x86\libSkiaSharp.dll</Link>
<Link>nuget\runtimes\win7-x86\native\libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup Condition=" '$(OS)' == 'Unix' ">
<None Include="..\..\native-builds\lib\osx\libSkiaSharp.dylib">
<Link>mac\libSkiaSharp.dylib</Link>
<Link>nuget\runtimes\osx\native\libSkiaSharp.dylib</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
</ItemGroup>
<ItemGroup>
<None Include="SkiaSharp.Desktop.targets">
<None Include="nuget\build\net45\SkiaSharp.Desktop.targets">
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
<SubType>Designer</SubType>
</None>

6
binding/SkiaSharp.Desktop/SkiaSharp.Desktop.targets → binding/SkiaSharp.Desktop/nuget/build/net45/SkiaSharp.Desktop.targets
Просмотреть файл

@ -15,7 +15,7 @@
<!-- add the native x86 Windows library -->
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(Platform)' == 'x86' and '$(OS)' != 'Unix' ">
<None Include="$(MSBuildThisFileDirectory)x86\libSkiaSharp.dll">
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win7-x86\native\libSkiaSharp.dll">
<Link>libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@ -23,7 +23,7 @@
<!-- add the native x64 Windows library -->
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(Platform)' == 'x64' and '$(OS)' != 'Unix' ">
<None Include="$(MSBuildThisFileDirectory)x64\libSkiaSharp.dll">
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win7-x64\native\libSkiaSharp.dll">
<Link>libSkiaSharp.dll</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>
@ -38,7 +38,7 @@
<!-- add the native OSX library -->
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(OS)' == 'Unix' ">
<None Include="$(MSBuildThisFileDirectory)mac\libSkiaSharp.dylib">
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libSkiaSharp.dylib">
<Link>libSkiaSharp.dylib</Link>
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
</None>

4
binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj
Просмотреть файл

@ -63,11 +63,11 @@
<Compile Include="Properties\AssemblyInfo.cs" />
</ItemGroup>
<ItemGroup>
<None Include="SkiaSharp.OSX.targets">
<None Include="nuget\build\XamarinMac\SkiaSharp.OSX.targets">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Include="..\..\native-builds\lib\osx\libSkiaSharp.dylib">
<Link>libSkiaSharp.dylib</Link>
<Link>nuget\runtimes\osx\native\libSkiaSharp.dylib</Link>
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
</ItemGroup>

2
binding/SkiaSharp.OSX/SkiaSharp.OSX.targets → binding/SkiaSharp.OSX/nuget/build/XamarinMac/SkiaSharp.OSX.targets
Просмотреть файл

@ -2,7 +2,7 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<NativeReference Include="$(MSBuildThisFileDirectory)libSkiaSharp.dylib">
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libSkiaSharp.dylib">
<IsCxx>False</IsCxx>
<Kind>Dynamic</Kind>
</NativeReference>

6
build.cake
Просмотреть файл

@ -88,7 +88,7 @@ Task ("libs")
CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.dll", "./output/windows/");
CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.pdb", "./output/windows/");
CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.dll.config", "./output/windows/");
CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.Desktop.targets", "./output/windows/");
CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/nuget/build/net45/SkiaSharp.Desktop.targets", "./output/windows/");
CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.dll", "./output/uwp/");
CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.pdb", "./output/uwp/");
CopyFileToDirectory ("./binding/SkiaSharp.UWP/bin/Release/SkiaSharp.pri", "./output/uwp/");
@ -124,10 +124,10 @@ Task ("libs")
CopyFileToDirectory ("./binding/SkiaSharp.iOS/bin/Release/SkiaSharp.dll", "./output/ios/");
CopyFileToDirectory ("./binding/SkiaSharp.tvOS/bin/Release/SkiaSharp.dll", "./output/tvos/");
CopyFileToDirectory ("./binding/SkiaSharp.OSX/bin/Release/SkiaSharp.dll", "./output/osx/");
CopyFileToDirectory ("./binding/SkiaSharp.OSX/bin/Release/SkiaSharp.OSX.targets", "./output/osx/");
CopyFileToDirectory ("./binding/SkiaSharp.OSX/bin/Release/nuget/build/XamarinMac/SkiaSharp.OSX.targets", "./output/osx/");
CopyFileToDirectory ("./binding/SkiaSharp.Portable/bin/Release/SkiaSharp.dll", "./output/portable/");
CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.dll", "./output/mac/");
CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.Desktop.targets", "./output/mac/");
CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/nuget/build/net45/SkiaSharp.Desktop.targets", "./output/mac/");
CopyFileToDirectory ("./binding/SkiaSharp.Desktop/bin/Release/SkiaSharp.dll.config", "./output/mac/");
CopyFileToDirectory ("./binding/SkiaSharp.NetStandard/bin/Release/SkiaSharp.dll", "./output/netstandard/");

6
nuget/SkiaSharp.Mac.nuspec
Просмотреть файл

@ -32,15 +32,11 @@
<file src="output/portable/SkiaSharp.dll" target="lib/portable-net45+win8+wpa81+wp8" />
<file src="output/docs/msxml/SkiaSharp.xml" target="lib/portable-net45+win8+wpa81+wp8" />
<!-- the build bits -->
<!-- .NET 4.5 -->
<file src="output/osx/SkiaSharp.OSX.targets" target="build/XamarinMac/SkiaSharp.targets" />
<file src="output/mac/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.targets" />
<!-- .NET 4.5 (OS X) -->
<file src="output/mac/libSkiaSharp.dylib" target="build/net45/mac/libSkiaSharp.dylib" />
<file src="output/mac/SkiaSharp.dll.config" target="build/net45/SkiaSharp.dll.config" />
<!-- .NET Core -->
<file src="output/osx/libSkiaSharp.dylib" target="runtimes/osx/native/libSkiaSharp.dylib" />
<!-- OS X -->
<file src="output/osx/SkiaSharp.OSX.targets" target="build/XamarinMac/SkiaSharp.targets" />
<file src="output/osx/libSkiaSharp.dylib" target="build/XamarinMac/libSkiaSharp.dylib" />
</files>
</package>

6
nuget/SkiaSharp.Windows.nuspec
Просмотреть файл

@ -26,15 +26,11 @@
<file src="output/portable/SkiaSharp.dll" target="lib/portable-net45+win8+wpa81+wp8" />
<file src="output/docs/msxml/SkiaSharp.xml" target="lib/portable-net45+win8+wpa81+wp8" />
<!-- the build bits -->
<!-- .NET 4.5 -->
<file src="output/windows/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.targets" />
<!-- .NET 4.5 (Windows) -->
<file src="output/windows/x64/libSkiaSharp.dll" target="build/net45/x64/libSkiaSharp.dll" />
<file src="output/windows/x86/libSkiaSharp.dll" target="build/net45/x86/libSkiaSharp.dll" />
<file src="output/windows/SkiaSharp.dll.config" target="build/net45/SkiaSharp.dll.config" />
<!-- .NET Core -->
<file src="output/windows/x64/libSkiaSharp.dll" target="runtimes/win7-x64/native/libSkiaSharp.dll" />
<file src="output/windows/x86/libSkiaSharp.dll" target="runtimes/win7-x86/native/libSkiaSharp.dll" />
<!-- UWP -->
<file src="output/uwp/x64/libSkiaSharp.dll" target="runtimes/win10-x64/native/libSkiaSharp.dll" />
<file src="output/uwp/x86/libSkiaSharp.dll" target="runtimes/win10-x86/native/libSkiaSharp.dll" />
<file src="output/uwp/arm/libSkiaSharp.dll" target="runtimes/win10-arm/native/libSkiaSharp.dll" />

11
nuget/SkiaSharp.nuspec
Просмотреть файл

@ -34,22 +34,13 @@
<file src="output/portable/SkiaSharp.dll" target="lib/portable-net45+win8+wpa81+wp8" />
<file src="output/docs/msxml/SkiaSharp.xml" target="lib/portable-net45+win8+wpa81+wp8" />
<!-- the build bits -->
<!-- .NET 4.5 -->
<file src="output/osx/SkiaSharp.OSX.targets" target="build/XamarinMac/SkiaSharp.targets" />
<file src="output/mac/SkiaSharp.Desktop.targets" target="build/net45/SkiaSharp.targets" />
<!-- .NET 4.5 (Windows) -->
<file src="output/windows/x64/libSkiaSharp.dll" target="build/net45/x64/libSkiaSharp.dll" />
<file src="output/windows/x86/libSkiaSharp.dll" target="build/net45/x86/libSkiaSharp.dll" />
<!-- .NET 4.5 (OS X) -->
<file src="output/mac/libSkiaSharp.dylib" target="build/net45/mac/libSkiaSharp.dylib" />
<file src="output/mac/SkiaSharp.dll.config" target="build/net45/SkiaSharp.dll.config" />
<!-- .NET Core -->
<file src="output/windows/x64/libSkiaSharp.dll" target="runtimes/win7-x64/native/libSkiaSharp.dll" />
<file src="output/windows/x86/libSkiaSharp.dll" target="runtimes/win7-x86/native/libSkiaSharp.dll" />
<file src="output/osx/libSkiaSharp.dylib" target="runtimes/osx/native/libSkiaSharp.dylib" />
<!-- OS X -->
<file src="output/osx/SkiaSharp.OSX.targets" target="build/XamarinMac/SkiaSharp.targets" />
<file src="output/osx/libSkiaSharp.dylib" target="build/XamarinMac/libSkiaSharp.dylib" />
<!-- UWP -->
<file src="output/uwp/x64/libSkiaSharp.dll" target="runtimes/win10-x64/native/libSkiaSharp.dll" />
<file src="output/uwp/x86/libSkiaSharp.dll" target="runtimes/win10-x86/native/libSkiaSharp.dll" />
<file src="output/uwp/arm/libSkiaSharp.dll" target="runtimes/win10-arm/native/libSkiaSharp.dll" />

2
tests/SkiaSharp.Desktop.Tests/SkiaSharp.Desktop.Tests.csproj
Просмотреть файл

@ -213,7 +213,7 @@
<Name>SkiaSharp.Svg</Name>
</ProjectReference>
</ItemGroup>
<Import Project="..\..\binding\SkiaSharp.Desktop\bin\$(Configuration)\SkiaSharp.Desktop.targets" />
<Import Project="..\..\binding\SkiaSharp.Desktop\bin\$(Configuration)\nuget\build\net45\SkiaSharp.Desktop.targets" />
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>