зеркало из https://github.com/mono/SkiaSharp.git
improve the copying
This commit is contained in:
Matthew Leibowitz
Родитель
b4a190f269
Коммит
80b631d404
|
|
@ -80,7 +80,7 @@ namespace SkiaSharp
|
|||
if (symbol == IntPtr.Zero)
|
||||
throw new EntryPointNotFoundException ($"Unable to load symbol '{name}'.");
|
||||
|
||||
#if __NET_45__
|
||||
#if NET45
|
||||
return (T)Marshal.GetDelegateForFunctionPointer (symbol, typeof (T));
|
||||
#else
|
||||
return Marshal.GetDelegateForFunctionPointer<T> (symbol);
|
||||
|
|
|
|||
|
|
@ -24,7 +24,7 @@ namespace SkiaSharp
|
|||
IsLinux = false;
|
||||
IsUnix = false;
|
||||
IsWindows = true;
|
||||
#elif __NET_45__
|
||||
#elif NET45
|
||||
IsUnix = Environment.OSVersion.Platform == PlatformID.MacOSX || Environment.OSVersion.Platform == PlatformID.Unix;
|
||||
IsWindows = !IsUnix;
|
||||
IsMac = IsUnix && MacPlatformDetector.IsMac.Value;
|
||||
|
|
@ -37,7 +37,7 @@ namespace SkiaSharp
|
|||
#endif
|
||||
}
|
||||
|
||||
#if __NET_45__
|
||||
#if NET45
|
||||
#pragma warning disable IDE1006 // Naming Styles
|
||||
private static class MacPlatformDetector
|
||||
{
|
||||
|
|
|
|||
|
|
@ -162,7 +162,7 @@ namespace SkiaSharp
|
|||
if (data.Length == 0)
|
||||
return string.Empty;
|
||||
|
||||
#if __NET_45__
|
||||
#if NET45
|
||||
// TODO: improve this copy for old .NET 4.5
|
||||
var array = data.ToArray ();
|
||||
return encoding switch
|
||||
|
|
|
|||
|
|
@ -12,12 +12,6 @@
|
|||
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<DefineConstants>$(DefineConstants);__DESKTOP__</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="$(TargetFramework.StartsWith('net45'))">
|
||||
<DefineConstants>$(DefineConstants);__NET_45__</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="$(TargetFramework.StartsWith('net46'))">
|
||||
<DefineConstants>$(DefineConstants);__NET_46__</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
|
||||
<PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
|
||||
</ItemGroup>
|
||||
|
|
@ -25,20 +19,33 @@
|
|||
<PackageReference Include="System.Memory" Version="4.5.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\output\native\windows\x64\libHarfBuzzSharp.dll" Link="nuget\runtimes\win-x64\native\libHarfBuzzSharp.dll"
|
||||
Condition=" Exists('..\..\output\native\windows\x64\libHarfBuzzSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<None Include="..\..\output\native\windows\x86\libHarfBuzzSharp.dll" Link="nuget\runtimes\win-x86\native\libHarfBuzzSharp.dll"
|
||||
Condition=" Exists('..\..\output\native\windows\x86\libHarfBuzzSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<None Include="..\..\output\native\osx\libHarfBuzzSharp.dylib" Link="nuget\runtimes\osx\native\libHarfBuzzSharp.dylib"
|
||||
Condition=" Exists('..\..\output\native\osx\libHarfBuzzSharp.dylib') or '$(IsMacOS)' == 'true' " />
|
||||
<None Include="..\..\output\native\linux\x64\libHarfBuzzSharp.so" Link="nuget\runtimes\linux-x64\native\libHarfBuzzSharp.so"
|
||||
Condition=" Exists('..\..\output\native\linux\x64\libHarfBuzzSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
<None Include="..\..\output\native\nanoserver\x64\libHarfBuzzSharp.dll" Link="nuget\runtimes\nanoserver-x64\native\libHarfBuzzSharp.dll"
|
||||
Condition=" Exists('..\..\output\native\nanoserver\x64\libHarfBuzzSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<None Include="..\..\output\native\linuxnodeps\x64\libHarfBuzzSharp.so" Link="nuget\runtimes\linuxnodeps-x64\native\libHarfBuzzSharp.so"
|
||||
Condition=" Exists('..\..\output\native\linuxnodeps\x64\libHarfBuzzSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
<None Include="..\..\output\native\alpine\x64\libHarfBuzzSharp.so" Link="nuget\runtimes\linux-musl-x64\native\libHarfBuzzSharp.so"
|
||||
Condition=" Exists('..\..\output\native\alpine\x64\libHarfBuzzSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
<!-- macOS -->
|
||||
<None Include="..\..\output\native\osx\libHarfBuzzSharp*" Link="nuget\runtimes\osx\native\%(Filename)%(Extension)" />
|
||||
<!-- Windows -->
|
||||
<None Include="..\..\output\native\windows\x64\libHarfBuzzSharp*" Link="nuget\runtimes\win-x64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\windows\x86\libHarfBuzzSharp*" Link="nuget\runtimes\win-x86\native\%(Filename)%(Extension)" />
|
||||
<!-- Windows: Nano Server -->
|
||||
<None Include="..\..\output\nanoserver\windows\x64\libHarfBuzzSharp*" Link="nuget\runtimes\nanoserver-x64\native\%(Filename)%(Extension)" />
|
||||
<!-- Linux -->
|
||||
<None Include="..\..\output\native\linux\x64\libHarfBuzzSharp*" Link="nuget\runtimes\linux-x64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linux\x86\libHarfBuzzSharp*" Link="nuget\runtimes\linux-x86\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linux\arm64\libHarfBuzzSharp*" Link="nuget\runtimes\linux-arm64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linux\arm\libHarfBuzzSharp*" Link="nuget\runtimes\linux-arm\native\%(Filename)%(Extension)" />
|
||||
<!-- Linux: Musl -->
|
||||
<None Include="..\..\output\native\alpine\x64\libHarfBuzzSharp*" Link="nuget\runtimes\linux-musl-x64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpine\x86\libHarfBuzzSharp*" Link="nuget\runtimes\linux-musl-x86\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpine\arm64\libHarfBuzzSharp*" Link="nuget\runtimes\linux-musl-arm64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpine\arm\libHarfBuzzSharp*" Link="nuget\runtimes\linux-musl-arm\native\%(Filename)%(Extension)" />
|
||||
<!-- Linux: No Dependencies -->
|
||||
<None Include="..\..\output\native\linuxnodeps\x64\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-x64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linuxnodeps\x86\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-x86\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linuxnodeps\arm64\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-arm64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linuxnodeps\arm\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-arm\native\%(Filename)%(Extension)" />
|
||||
<!-- Linux: Musl, No Dependencies -->
|
||||
<None Include="..\..\output\native\alpinenodeps\x64\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-musl-x64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpinenodeps\x86\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-musl-x86\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpinenodeps\arm64\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpinenodeps\arm\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm\native\%(Filename)%(Extension)" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<None Include="nuget\build\net45\HarfBuzzSharp.targets" Link="nuget\build\$(TargetFramework)\HarfBuzzSharp.targets" />
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration>
|
||||
<!-- <dllmap dll="libHarfBuzzSharp.dll" target="libHarfBuzzSharp.dylib" os="osx" /> -->
|
||||
<!-- <dllmap dll="libHarfBuzzSharp.dll" target="libHarfBuzzSharp.so" os="!windows,osx" /> -->
|
||||
</configuration>
|
||||
|
|
@ -11,12 +11,6 @@
|
|||
<PropertyGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<DefineConstants>$(DefineConstants);USE_DELEGATES;__DESKTOP__</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="$(TargetFramework.StartsWith('net45'))">
|
||||
<DefineConstants>$(DefineConstants);__NET_45__</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<PropertyGroup Condition="$(TargetFramework.StartsWith('net46'))">
|
||||
<DefineConstants>$(DefineConstants);__NET_46__</DefineConstants>
|
||||
</PropertyGroup>
|
||||
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard1.3'">
|
||||
<PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
|
||||
</ItemGroup>
|
||||
|
|
@ -24,22 +18,33 @@
|
|||
<PackageReference Include="System.Memory" Version="4.5.3" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<None Include="..\..\output\native\windows\x64\libSkiaSharp.dll" Link="nuget\runtimes\win-x64\native\libSkiaSharp.dll"
|
||||
Condition=" Exists('..\..\output\native\windows\x64\libSkiaSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<None Include="..\..\output\native\windows\x86\libSkiaSharp.dll" Link="nuget\runtimes\win-x86\native\libSkiaSharp.dll"
|
||||
Condition=" Exists('..\..\output\native\windows\x86\libSkiaSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<None Include="..\..\output\native\osx\libSkiaSharp.dylib" Link="nuget\runtimes\osx\native\libSkiaSharp.dylib"
|
||||
Condition=" Exists('..\..\output\native\osx\libSkiaSharp.dylib') or '$(IsMacOS)' == 'true' " />
|
||||
<None Include="..\..\output\native\linux\x64\libSkiaSharp.so" Link="nuget\runtimes\linux-x64\native\libSkiaSharp.so"
|
||||
Condition=" Exists('..\..\output\native\linux\x64\libSkiaSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
<None Include="..\..\output\native\nanoserver\x64\libSkiaSharp.dll" Link="nuget\runtimes\nanoserver-x64\native\libSkiaSharp.dll"
|
||||
Condition=" Exists('..\..\output\native\nanoserver\x64\libSkiaSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<None Include="..\..\output\native\linuxnodeps\x64\libSkiaSharp.so" Link="nuget\runtimes\linuxnodeps-x64\native\libSkiaSharp.so"
|
||||
Condition=" Exists('..\..\output\native\linuxnodeps\x64\libSkiaSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
<None Include="..\..\output\native\alpine\x64\libSkiaSharp.so" Link="nuget\runtimes\linux-musl-x64\native\libSkiaSharp.so"
|
||||
Condition=" Exists('..\..\output\native\alpine\x64\libSkiaSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
<None Include="..\..\output\native\alpinenodeps\x64\libSkiaSharp.so" Link="nuget\runtimes\linuxnodeps-musl-x64\native\libSkiaSharp.so"
|
||||
Condition=" Exists('..\..\output\native\alpinenodeps\x64\libSkiaSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
<!-- macOS -->
|
||||
<None Include="..\..\output\native\osx\libSkiaSharp*" Link="nuget\runtimes\osx\native\%(Filename)%(Extension)" />
|
||||
<!-- Windows -->
|
||||
<None Include="..\..\output\native\windows\x64\libSkiaSharp*" Link="nuget\runtimes\win-x64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\windows\x86\libSkiaSharp*" Link="nuget\runtimes\win-x86\native\%(Filename)%(Extension)" />
|
||||
<!-- Windows: Nano Server -->
|
||||
<None Include="..\..\output\nanoserver\windows\x64\libSkiaSharp*" Link="nuget\runtimes\nanoserver-x64\native\%(Filename)%(Extension)" />
|
||||
<!-- Linux -->
|
||||
<None Include="..\..\output\native\linux\x64\libSkiaSharp*" Link="nuget\runtimes\linux-x64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linux\x86\libSkiaSharp*" Link="nuget\runtimes\linux-x86\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linux\arm64\libSkiaSharp*" Link="nuget\runtimes\linux-arm64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linux\arm\libSkiaSharp*" Link="nuget\runtimes\linux-arm\native\%(Filename)%(Extension)" />
|
||||
<!-- Linux: Musl -->
|
||||
<None Include="..\..\output\native\alpine\x64\libSkiaSharp*" Link="nuget\runtimes\linux-musl-x64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpine\x86\libSkiaSharp*" Link="nuget\runtimes\linux-musl-x86\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpine\arm64\libSkiaSharp*" Link="nuget\runtimes\linux-musl-arm64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpine\arm\libSkiaSharp*" Link="nuget\runtimes\linux-musl-arm\native\%(Filename)%(Extension)" />
|
||||
<!-- Linux: No Dependencies -->
|
||||
<None Include="..\..\output\native\linuxnodeps\x64\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-x64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linuxnodeps\x86\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-x86\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linuxnodeps\arm64\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-arm64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\linuxnodeps\arm\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-arm\native\%(Filename)%(Extension)" />
|
||||
<!-- Linux: Musl, No Dependencies -->
|
||||
<None Include="..\..\output\native\alpinenodeps\x64\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-musl-x64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpinenodeps\x86\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-musl-x86\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpinenodeps\arm64\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm64\native\%(Filename)%(Extension)" />
|
||||
<None Include="..\..\output\native\alpinenodeps\arm\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm\native\%(Filename)%(Extension)" />
|
||||
</ItemGroup>
|
||||
<ItemGroup Condition="$(TargetFramework.StartsWith('net4'))">
|
||||
<None Include="nuget\build\net45\SkiaSharp.targets" Link="nuget\build\$(TargetFramework)\SkiaSharp.targets" />
|
||||
|
|
|
|||
|
|
@ -1,5 +0,0 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<configuration>
|
||||
<!-- <dllmap dll="libSkiaSharp.dll" target="libSkiaSharp.dylib" os="osx" /> -->
|
||||
<!-- <dllmap dll="libSkiaSharp.dll" target="libSkiaSharp.so" os="!windows,osx" /> -->
|
||||
</configuration>
|
||||
|
|
@ -4,93 +4,38 @@
|
|||
<!-- if ShouldIncludeNativeSkiaSharp == False then don't include the native libSkiaSharp -->
|
||||
<PropertyGroup>
|
||||
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
|
||||
<_AppIsFullMac Condition=" '$(XamarinMacFrameworkRoot)' != '' and '$(TargetFrameworkIdentifier)' != 'Xamarin.Mac' and '$(UseXamMacFullFramework)' == 'True' and ('$(OutputType)' == 'Exe' or '$(IsAppExtension)' == 'True') ">True</_AppIsFullMac>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- get the preferred architecture -->
|
||||
<PropertyGroup>
|
||||
<!-- handle VS 2017 live unit testing -->
|
||||
<PreferredNativeSkiaSharp Condition=" '$(PreferredNativeSkiaSharp)' == '' and '$(BuildingForLiveUnitTesting)' == 'true' and '$(PlatformTarget)' == '' ">x86</PreferredNativeSkiaSharp>
|
||||
|
||||
<!-- handle x86/x64 specifically -->
|
||||
<PreferredNativeSkiaSharp Condition=" '$(PreferredNativeSkiaSharp)' == '' and ( '$(PlatformTarget)' == 'x64' or '$(PlatformTarget)' == 'x86' ) ">$(PlatformTarget)</PreferredNativeSkiaSharp>
|
||||
<!-- handle Any CPU, considering Prefer32Bit - but only on Windows as macOS and Linux ignore this flag -->
|
||||
<PreferredNativeSkiaSharp Condition=" '$(PreferredNativeSkiaSharp)' == '' and '$(OS)' != 'Unix' and '$(Prefer32Bit)' == 'False' ">x64</PreferredNativeSkiaSharp>
|
||||
<PreferredNativeSkiaSharp Condition=" '$(PreferredNativeSkiaSharp)' == '' and '$(OS)' != 'Unix' and '$(Prefer32Bit)' == 'True' ">x86</PreferredNativeSkiaSharp>
|
||||
<!-- fall back to x64 on 64-bit machines -->
|
||||
<PreferredNativeSkiaSharp Condition=" '$(PreferredNativeSkiaSharp)' == '' and '$(MSBuildRuntimeType)' != 'Core' and '$([System.Environment]::Is64BitOperatingSystem)' == 'True' ">x64</PreferredNativeSkiaSharp>
|
||||
<PreferredNativeSkiaSharp Condition=" '$(PreferredNativeSkiaSharp)' == '' and '$(MSBuildRuntimeType)' == 'Core' and '$([System.Runtime.InteropServices.RuntimeInformation]::OSArchitecture)' == 'X64' ">x64</PreferredNativeSkiaSharp>
|
||||
<!-- fall back to x86 -->
|
||||
<PreferredNativeSkiaSharp Condition=" '$(PreferredNativeSkiaSharp)' == '' ">x86</PreferredNativeSkiaSharp>
|
||||
</PropertyGroup>
|
||||
|
||||
<!-- get the preferred paths -->
|
||||
<PropertyGroup>
|
||||
<PreferredWindowsNativeSkiaSharpPath>$(MSBuildThisFileDirectory)..\..\runtimes\win-$(PreferredNativeSkiaSharp)\native\libSkiaSharp.dll</PreferredWindowsNativeSkiaSharpPath>
|
||||
<PreferredOSXNativeSkiaSharpPath>$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libSkiaSharp.dylib</PreferredOSXNativeSkiaSharpPath>
|
||||
<PreferredLinuxNativeSkiaSharpPath>$(MSBuildThisFileDirectory)..\..\runtimes\linux-$(PreferredNativeSkiaSharp)\native\libSkiaSharp.so</PreferredLinuxNativeSkiaSharpPath>
|
||||
</PropertyGroup>
|
||||
|
||||
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
|
||||
<None Include="$(PreferredWindowsNativeSkiaSharpPath)" Condition=" Exists('$(PreferredWindowsNativeSkiaSharpPath)') ">
|
||||
<Visible>false</Visible>
|
||||
<Link>$([System.IO.Path]::GetFilename('$(PreferredWindowsNativeSkiaSharpPath)'))</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="$(PreferredOSXNativeSkiaSharpPath)" Condition=" Exists('$(PreferredOSXNativeSkiaSharpPath)') ">
|
||||
<Visible>false</Visible>
|
||||
<Link>$([System.IO.Path]::GetFilename('$(PreferredOSXNativeSkiaSharpPath)'))</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="$(PreferredLinuxNativeSkiaSharpPath)" Condition=" Exists('$(PreferredLinuxNativeSkiaSharpPath)') ">
|
||||
<Visible>false</Visible>
|
||||
<Link>$([System.IO.Path]::GetFilename('$(PreferredLinuxNativeSkiaSharpPath)'))</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
</ItemGroup>
|
||||
|
||||
<!-- handle the case where this is a Xamarin.Mac Full app/extension -->
|
||||
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(XamarinMacFrameworkRoot)' != '' and '$(TargetFrameworkIdentifier)' != 'Xamarin.Mac' and '$(UseXamMacFullFramework)' == 'true' and ('$(OutputType)' == 'Exe' or '$(IsAppExtension)' == 'true') ">
|
||||
<NativeReference Include="$(PreferredOSXNativeSkiaSharpPath)" Condition=" Exists('$(PreferredOSXNativeSkiaSharpPath)') ">
|
||||
<Visible>false</Visible>
|
||||
<Link>$([System.IO.Path]::GetFilename('$(PreferredOSXNativeSkiaSharpPath)'))</Link>
|
||||
<Kind>Dynamic</Kind>
|
||||
</NativeReference>
|
||||
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and '$(_AppIsFullMac)' == 'True' ">
|
||||
<NativeReference Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libSkiaSharp.dylib" Kind="Dynamic" Visible="false" />
|
||||
</ItemGroup>
|
||||
|
||||
<!-- a special case for Any CPU -->
|
||||
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' and ( '$(PlatformTarget)' != 'x64' and '$(PlatformTarget)' != 'x86' ) ">
|
||||
<!-- copy the native files to the output directory -->
|
||||
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
|
||||
|
||||
<!-- Windows -->
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libSkiaSharp.dll"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libSkiaSharp.dll')">
|
||||
<Visible>false</Visible>
|
||||
<Link>x86\libSkiaSharp.dll</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libSkiaSharp.dll"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libSkiaSharp.dll')">
|
||||
<Visible>false</Visible>
|
||||
<Link>x64\libSkiaSharp.dll</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x86\native\libSkiaSharp.dll" Dir="x86\" />
|
||||
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\win-x64\native\libSkiaSharp.dll" Dir="x64\" />
|
||||
|
||||
<!-- Linux -->
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x86\native\libSkiaSharp.so"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\linux-x86\native\libSkiaSharp.so')">
|
||||
<Visible>false</Visible>
|
||||
<Link>x86\libSkiaSharp.so</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x64\native\libSkiaSharp.so"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\linux-x64\native\libSkiaSharp.so')">
|
||||
<Visible>false</Visible>
|
||||
<Link>x64\libSkiaSharp.so</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<None Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm\native\libSkiaSharp.so"
|
||||
Condition="Exists('$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm\native\libSkiaSharp.so')">
|
||||
<Visible>false</Visible>
|
||||
<Link>arm\libSkiaSharp.so</Link>
|
||||
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
|
||||
</None>
|
||||
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x86\native\libSkiaSharp*.so" Dir="x86\" />
|
||||
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-x64\native\libSkiaSharp*.so" Dir="x64\" />
|
||||
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm\native\libSkiaSharp*.so" Dir="arm\" />
|
||||
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-arm64\native\libSkiaSharp*.so" Dir="arm64\" />
|
||||
|
||||
<!-- Linux: Musl -->
|
||||
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-x86\native\libSkiaSharp*.so" Dir="x86\" />
|
||||
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-x64\native\libSkiaSharp*.so" Dir="x64\" />
|
||||
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-arm\native\libSkiaSharp*.so" Dir="arm\" />
|
||||
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\linux-musl-arm64\native\libSkiaSharp*.so" Dir="arm64\" />
|
||||
|
||||
<!-- macOS -->
|
||||
<_NativeSkiaSharpFile Include="$(MSBuildThisFileDirectory)..\..\runtimes\osx\native\libSkiaSharp*.dylib" />
|
||||
|
||||
<!-- include everything -->
|
||||
<Content Include="@(_NativeSkiaSharpFile)" Link="%(Dir)%(Filename)%(Extension)" Visible="False" CopyToOutputDirectory="PreserveNewest" />
|
||||
</ItemGroup>
|
||||
|
||||
</Project>
|
||||
|
|
@ -14,21 +14,21 @@ parameters:
|
|||
condition: succeeded() # whether or not to run this template
|
||||
shouldPublish: true # whether or not to publish the artifacts
|
||||
configuration: $(CONFIGURATION) # the build configuration
|
||||
buildExternals: '' # the build number to download externals from
|
||||
buildExternals: '3830496' # the build number to download externals from
|
||||
verbosity: $(VERBOSITY) # the level of verbosity to use when building
|
||||
docker: '' # the Docker image to build and use
|
||||
|
||||
jobs:
|
||||
# - ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}:
|
||||
# - template: azure-templates-download.yml
|
||||
# parameters:
|
||||
# name: ${{ parameters.name }}
|
||||
# displayName: ${{ parameters.displayName }}
|
||||
# vmImage: ${{ parameters.vmImage }}
|
||||
# condition: ${{ parameters.condition }}
|
||||
# buildExternals: ${{ parameters.buildExternals }}
|
||||
- ${{ if and(ne(parameters.buildExternals, ''), startsWith(parameters.name, 'native_')) }}:
|
||||
- template: azure-templates-download.yml
|
||||
parameters:
|
||||
name: ${{ parameters.name }}
|
||||
displayName: ${{ parameters.displayName }}
|
||||
vmImage: ${{ parameters.vmImage }}
|
||||
condition: ${{ parameters.condition }}
|
||||
buildExternals: ${{ parameters.buildExternals }}
|
||||
|
||||
# - ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}:
|
||||
- ${{ if or(eq(parameters.buildExternals, ''), not(startsWith(parameters.name, 'native_'))) }}:
|
||||
- job: ${{ parameters.name }}
|
||||
displayName: ${{ parameters.displayName }}
|
||||
timeoutInMinutes: 120
|
||||
|
|
|
|||
|
|
@ -100,27 +100,6 @@
|
|||
<ItemGroup>
|
||||
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\..\output\native\windows\x64\libSkiaSharp.dll" Link="x64\libSkiaSharp.dll" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\x64\libSkiaSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\windows\x64\libSkiaSharp.pdb" Link="x64\libSkiaSharp.pdb" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\x64\libSkiaSharp.pdb') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\windows\x86\libSkiaSharp.dll" Link="x86\libSkiaSharp.dll" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\x86\libSkiaSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\windows\x86\libSkiaSharp.pdb" Link="x86\libSkiaSharp.pdb" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\x64\libSkiaSharp.pdb') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\windows\$(Platform)\libHarfBuzzSharp.dll" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\$(Platform)\libHarfBuzzSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\windows\$(Platform)\libHarfBuzzSharp.pdb" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\$(Platform)\libHarfBuzzSharp.pdb') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\osx\libSkiaSharp.dylib" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\osx\libSkiaSharp.dylib') or '$(IsMacOS)' == 'true' " />
|
||||
<Content Include="..\..\output\native\osx\libHarfBuzzSharp.dylib" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\osx\libHarfBuzzSharp.dylib') or '$(IsMacOS)' == 'true' " />
|
||||
<Content Include="..\..\output\native\linux\$(Platform)\libSkiaSharp.so" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\linux\$(Platform)\libSkiaSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
<Content Include="..\..\output\native\linux\$(Platform)\libHarfBuzzSharp.so" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\linux\$(Platform)\libHarfBuzzSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
</ItemGroup>
|
||||
<Import Project="..\..\output\SkiaSharp\nuget\build\net45\SkiaSharp.targets" Condition="Exists('..\..\output\SkiaSharp\nuget\build\net45\SkiaSharp.targets')" />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
|
|
@ -121,24 +121,6 @@
|
|||
<ItemGroup>
|
||||
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\..\output\native\windows\$(Platform)\libSkiaSharp.dll" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\$(Platform)\libSkiaSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\windows\$(Platform)\libSkiaSharp.pdb" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\$(Platform)\libSkiaSharp.pdb') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\windows\$(Platform)\libHarfBuzzSharp.dll" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\$(Platform)\libHarfBuzzSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\windows\$(Platform)\libHarfBuzzSharp.pdb" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\$(Platform)\libHarfBuzzSharp.pdb') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\osx\libSkiaSharp.dylib" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\osx\libSkiaSharp.dylib') or '$(IsMacOS)' == 'true' " />
|
||||
<Content Include="..\..\output\native\osx\libHarfBuzzSharp.dylib" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\osx\libHarfBuzzSharp.dylib') or '$(IsMacOS)' == 'true' " />
|
||||
<Content Include="..\..\output\native\linux\$(Platform)\libSkiaSharp.so" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\linux\$(Platform)\libSkiaSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
<Content Include="..\..\output\native\linux\$(Platform)\libHarfBuzzSharp.so" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\linux\$(Platform)\libHarfBuzzSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
</ItemGroup>
|
||||
<Import Project="..\..\source\SkiaSharp.Build.targets" />
|
||||
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
|
||||
</Project>
|
||||
|
|
@ -30,22 +30,4 @@
|
|||
<ItemGroup>
|
||||
<Content Include="..\Content\**\*" Link="%(RecursiveDir)%(FileName)%(Extension)" CopyToOutputDirectory="Always" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<Content Include="..\..\output\native\windows\x64\libSkiaSharp.dll" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\x64\libSkiaSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\windows\x64\libSkiaSharp.pdb" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\x64\libSkiaSharp.pdb') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\windows\x64\libHarfBuzzSharp.dll" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\x64\libHarfBuzzSharp.dll') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\windows\x64\libHarfBuzzSharp.pdb" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\windows\x64\libHarfBuzzSharp.pdb') or '$(IsWindows)' == 'true' " />
|
||||
<Content Include="..\..\output\native\osx\libSkiaSharp.dylib" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\osx\libSkiaSharp.dylib') or '$(IsMacOS)' == 'true' " />
|
||||
<Content Include="..\..\output\native\osx\libHarfBuzzSharp.dylib" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\osx\libHarfBuzzSharp.dylib') or '$(IsMacOS)' == 'true' " />
|
||||
<Content Include="..\..\output\native\linux\x64\libSkiaSharp.so" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\linux\x64\libSkiaSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
<Content Include="..\..\output\native\linux\x64\libHarfBuzzSharp.so" CopyToOutputDirectory="Always" Visible="false"
|
||||
Condition=" Exists('..\..\output\native\linux\x64\libHarfBuzzSharp.so') or '$(IsLinux)' == 'true' " />
|
||||
</ItemGroup>
|
||||
</Project>
|
||||
Загрузка…
Ссылка в новой задаче