Use buildTransitive as well as build (#1440)

This commit is contained in:
Matthew Leibowitz 2020-08-02 09:38:07 +02:00 коммит произвёл GitHub
Родитель abfb84ca11
Коммит b5c12d6081
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
15 изменённых файлов: 99 добавлений и 19 удалений

Просмотреть файл

@ -6,11 +6,17 @@
<ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp>
</PropertyGroup>
<PropertyGroup>
<_HarfBuzzSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_HarfBuzzSharpNativeLibraryCurrPath>
<_HarfBuzzSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_HarfBuzzSharpNativeLibraryCurrPath)'))</_HarfBuzzSharpNativeLibraryDirName>
<_HarfBuzzSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_HarfBuzzSharpNativeLibraryDirName)\</_HarfBuzzSharpNativeLibraryRootDir>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)x86\libHarfBuzzSharp.so" Abi="x86" />
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)x64\libHarfBuzzSharp.so" Abi="x86_64" />
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)arm\libHarfBuzzSharp.so" Abi="armeabi-v7a" />
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)arm64\libHarfBuzzSharp.so" Abi="arm64-v8a" />
<AndroidNativeLibrary Include="$(_HarfBuzzSharpNativeLibraryRootDir)x86\libHarfBuzzSharp.so" Abi="x86" />
<AndroidNativeLibrary Include="$(_HarfBuzzSharpNativeLibraryRootDir)x64\libHarfBuzzSharp.so" Abi="x86_64" />
<AndroidNativeLibrary Include="$(_HarfBuzzSharpNativeLibraryRootDir)arm\libHarfBuzzSharp.so" Abi="armeabi-v7a" />
<AndroidNativeLibrary Include="$(_HarfBuzzSharpNativeLibraryRootDir)arm64\libHarfBuzzSharp.so" Abi="arm64-v8a" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,13 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_HarfBuzzSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_HarfBuzzSharpNativeLibraryCurrPath>
<_HarfBuzzSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_HarfBuzzSharpNativeLibraryCurrPath)'))</_HarfBuzzSharpNativeLibraryDirName>
<_HarfBuzzSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_HarfBuzzSharpNativeLibraryDirName)\</_HarfBuzzSharpNativeLibraryRootDir>
</PropertyGroup>
<ItemGroup>
<TizenTpkFiles Include="$(MSBuildThisFileDirectory)x86\libHarfBuzzSharp.so">
<TizenTpkFiles Include="$(_HarfBuzzSharpNativeLibraryRootDir)x86\libHarfBuzzSharp.so">
<Visible>false</Visible>
<TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
<TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName>
</TizenTpkFiles>
<TizenTpkFiles Include="$(MSBuildThisFileDirectory)arm\libHarfBuzzSharp.so">
<TizenTpkFiles Include="$(_HarfBuzzSharpNativeLibraryRootDir)arm\libHarfBuzzSharp.so">
<Visible>false</Visible>
<TizenTpkSubDir>bin\runtimes\tizen-armel\native\</TizenTpkSubDir>
<TizenTpkFileName>libHarfBuzzSharp.so</TizenTpkFileName>

Просмотреть файл

@ -6,8 +6,14 @@
<ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp>
</PropertyGroup>
<PropertyGroup>
<_HarfBuzzSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_HarfBuzzSharpNativeLibraryCurrPath>
<_HarfBuzzSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_HarfBuzzSharpNativeLibraryCurrPath)'))</_HarfBuzzSharpNativeLibraryDirName>
<_HarfBuzzSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_HarfBuzzSharpNativeLibraryDirName)\</_HarfBuzzSharpNativeLibraryRootDir>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
<NativeReference Include="$(MSBuildThisFileDirectory)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
<NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
</ItemGroup>
</Project>

Просмотреть файл

@ -6,8 +6,14 @@
<ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp>
</PropertyGroup>
<PropertyGroup>
<_HarfBuzzSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_HarfBuzzSharpNativeLibraryCurrPath>
<_HarfBuzzSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_HarfBuzzSharpNativeLibraryCurrPath)'))</_HarfBuzzSharpNativeLibraryDirName>
<_HarfBuzzSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_HarfBuzzSharpNativeLibraryDirName)\</_HarfBuzzSharpNativeLibraryRootDir>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
<NativeReference Include="$(MSBuildThisFileDirectory)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
<NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
</ItemGroup>
</Project>

Просмотреть файл

@ -6,8 +6,14 @@
<ShouldIncludeNativeHarfBuzzSharp Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' == '' ">True</ShouldIncludeNativeHarfBuzzSharp>
</PropertyGroup>
<PropertyGroup>
<_HarfBuzzSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_HarfBuzzSharpNativeLibraryCurrPath>
<_HarfBuzzSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_HarfBuzzSharpNativeLibraryCurrPath)'))</_HarfBuzzSharpNativeLibraryDirName>
<_HarfBuzzSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_HarfBuzzSharpNativeLibraryDirName)\</_HarfBuzzSharpNativeLibraryRootDir>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeHarfBuzzSharp)' != 'False' ">
<NativeReference Include="$(MSBuildThisFileDirectory)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
<NativeReference Include="$(_HarfBuzzSharpNativeLibraryRootDir)libHarfBuzzSharp.a" Kind="Static" IsCxx="true" ForceLoad="True" SmartLink="true" />
</ItemGroup>
</Project>

Просмотреть файл

@ -6,11 +6,17 @@
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
</PropertyGroup>
<PropertyGroup>
<_SkiaSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_SkiaSharpNativeLibraryCurrPath>
<_SkiaSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_SkiaSharpNativeLibraryCurrPath)'))</_SkiaSharpNativeLibraryDirName>
<_SkiaSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_SkiaSharpNativeLibraryDirName)\</_SkiaSharpNativeLibraryRootDir>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)x86\libSkiaSharp.so" Abi="x86" />
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)x64\libSkiaSharp.so" Abi="x86_64" />
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)arm\libSkiaSharp.so" Abi="armeabi-v7a" />
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)arm64\libSkiaSharp.so" Abi="arm64-v8a" />
<AndroidNativeLibrary Include="$(_SkiaSharpNativeLibraryRootDir)x86\libSkiaSharp.so" Abi="x86" />
<AndroidNativeLibrary Include="$(_SkiaSharpNativeLibraryRootDir)x64\libSkiaSharp.so" Abi="x86_64" />
<AndroidNativeLibrary Include="$(_SkiaSharpNativeLibraryRootDir)arm\libSkiaSharp.so" Abi="armeabi-v7a" />
<AndroidNativeLibrary Include="$(_SkiaSharpNativeLibraryRootDir)arm64\libSkiaSharp.so" Abi="arm64-v8a" />
</ItemGroup>
</Project>

Просмотреть файл

@ -1,13 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<_SkiaSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_SkiaSharpNativeLibraryCurrPath>
<_SkiaSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_SkiaSharpNativeLibraryCurrPath)'))</_SkiaSharpNativeLibraryDirName>
<_SkiaSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_SkiaSharpNativeLibraryDirName)\</_SkiaSharpNativeLibraryRootDir>
</PropertyGroup>
<ItemGroup>
<TizenTpkFiles Include="$(MSBuildThisFileDirectory)x86\libSkiaSharp.so">
<TizenTpkFiles Include="$(_SkiaSharpNativeLibraryRootDir)x86\libSkiaSharp.so">
<Visible>false</Visible>
<TizenTpkSubDir>bin\runtimes\linux-x86\native\</TizenTpkSubDir>
<TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName>
</TizenTpkFiles>
<TizenTpkFiles Include="$(MSBuildThisFileDirectory)arm\libSkiaSharp.so">
<TizenTpkFiles Include="$(_SkiaSharpNativeLibraryRootDir)arm\libSkiaSharp.so">
<Visible>false</Visible>
<TizenTpkSubDir>bin\runtimes\tizen-armel\native\</TizenTpkSubDir>
<TizenTpkFileName>libSkiaSharp.so</TizenTpkFileName>

Просмотреть файл

@ -6,8 +6,14 @@
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
</PropertyGroup>
<PropertyGroup>
<_SkiaSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_SkiaSharpNativeLibraryCurrPath>
<_SkiaSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_SkiaSharpNativeLibraryCurrPath)'))</_SkiaSharpNativeLibraryDirName>
<_SkiaSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_SkiaSharpNativeLibraryDirName)\</_SkiaSharpNativeLibraryRootDir>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
<NativeReference Include="$(MSBuildThisFileDirectory)libSkiaSharp.framework" Kind="Framework" />
<NativeReference Include="$(_SkiaSharpNativeLibraryRootDir)libSkiaSharp.framework" Kind="Framework" />
</ItemGroup>
</Project>

Просмотреть файл

@ -6,8 +6,14 @@
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
</PropertyGroup>
<PropertyGroup>
<_SkiaSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_SkiaSharpNativeLibraryCurrPath>
<_SkiaSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_SkiaSharpNativeLibraryCurrPath)'))</_SkiaSharpNativeLibraryDirName>
<_SkiaSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_SkiaSharpNativeLibraryDirName)\</_SkiaSharpNativeLibraryRootDir>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
<NativeReference Include="$(MSBuildThisFileDirectory)libSkiaSharp.framework" Kind="Framework" />
<NativeReference Include="$(_SkiaSharpNativeLibraryRootDir)libSkiaSharp.framework" Kind="Framework" />
</ItemGroup>
</Project>

Просмотреть файл

@ -6,8 +6,14 @@
<ShouldIncludeNativeSkiaSharp Condition=" '$(ShouldIncludeNativeSkiaSharp)' == '' ">True</ShouldIncludeNativeSkiaSharp>
</PropertyGroup>
<PropertyGroup>
<_SkiaSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_SkiaSharpNativeLibraryCurrPath>
<_SkiaSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_SkiaSharpNativeLibraryCurrPath)'))</_SkiaSharpNativeLibraryDirName>
<_SkiaSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_SkiaSharpNativeLibraryDirName)\</_SkiaSharpNativeLibraryRootDir>
</PropertyGroup>
<ItemGroup Condition=" '$(ShouldIncludeNativeSkiaSharp)' != 'False' ">
<NativeReference Include="$(MSBuildThisFileDirectory)libSkiaSharp.framework" Kind="Framework" />
<NativeReference Include="$(_SkiaSharpNativeLibraryRootDir)libSkiaSharp.framework" Kind="Framework" />
</ItemGroup>
</Project>

Просмотреть файл

@ -2,7 +2,13 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<SkiaSharpStaticLibraryPath>$(MSBuildThisFileDirectory)libSkiaSharp.a</SkiaSharpStaticLibraryPath>
<_SkiaSharpNativeLibraryCurrPath>$([System.IO.Path]::GetDirectoryName('$(MSBuildThisFileDirectory)'))</_SkiaSharpNativeLibraryCurrPath>
<_SkiaSharpNativeLibraryDirName>$([System.IO.Path]::GetFileName('$(_SkiaSharpNativeLibraryCurrPath)'))</_SkiaSharpNativeLibraryDirName>
<_SkiaSharpNativeLibraryRootDir>$(MSBuildThisFileDirectory)..\..\build\$(_SkiaSharpNativeLibraryDirName)\</_SkiaSharpNativeLibraryRootDir>
</PropertyGroup>
<PropertyGroup>
<SkiaSharpStaticLibraryPath>$(_SkiaSharpNativeLibraryRootDir)libSkiaSharp.a</SkiaSharpStaticLibraryPath>
</PropertyGroup>
<ItemGroup>

Просмотреть файл

@ -91,11 +91,17 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="build/net462/HarfBuzzSharp.targets" target="buildTransitive/net462/HarfBuzzSharp.targets" />
<!-- others -->
<file src="build/monoandroid1.0/HarfBuzzSharp.targets" />
<file src="build/monoandroid1.0/HarfBuzzSharp.targets" target="buildTransitive/monoandroid1.0/HarfBuzzSharp.targets" />
<file src="build/xamarinios1.0/HarfBuzzSharp.targets" />
<file src="build/xamarinios1.0/HarfBuzzSharp.targets" target="buildTransitive/xamarinios1.0/HarfBuzzSharp.targets" />
<file src="build/xamarintvos1.0/HarfBuzzSharp.targets" />
<file src="build/xamarintvos1.0/HarfBuzzSharp.targets" target="buildTransitive/xamarintvos1.0/HarfBuzzSharp.targets" />
<file src="build/xamarinwatchos1.0/HarfBuzzSharp.targets" />
<file src="build/xamarinwatchos1.0/HarfBuzzSharp.targets" target="buildTransitive/xamarinwatchos1.0/HarfBuzzSharp.targets" />
<file src="build/xamarinmac2.0/HarfBuzzSharp.targets" />
<file src="build/xamarinmac2.0/HarfBuzzSharp.targets" target="buildTransitive/xamarinmac2.0/HarfBuzzSharp.targets" />
<file src="build/tizen40/HarfBuzzSharp.targets" />
<file src="build/tizen40/HarfBuzzSharp.targets" target="buildTransitive/tizen40/HarfBuzzSharp.targets" />
<!-- libHarfBuzzSharp.dll and other native files -->
<!-- win -->

Просмотреть файл

@ -32,6 +32,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<!-- the build bits -->
<file src="build/wasm/SkiaSharp.props" target="build/netstandard1.0/SkiaSharp.NativeAssets.WebAssembly.props" />
<file src="build/wasm/SkiaSharp.props" target="buildTransitive/netstandard1.0/SkiaSharp.NativeAssets.WebAssembly.props" />
<!-- libSkiaSharp.a and other native files -->
<file src="build/wasm/libSkiaSharp.a" target="build/netstandard1.0/libSkiaSharp.a" />

Просмотреть файл

@ -67,6 +67,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<!-- the build bits -->
<file src="build/netstandard2.0/SkiaSharp.Views.Uno.targets" />
<file src="build/netstandard2.0/SkiaSharp.Views.Uno.targets" target="buildTransitive/netstandard2.0/SkiaSharp.Views.Uno.targets" />
<!-- legal -->
<file src="LICENSE.txt" />

Просмотреть файл

@ -92,11 +92,17 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="build/net462/SkiaSharp.targets" target="buildTransitive/net462/SkiaSharp.targets" />
<!-- others -->
<file src="build/monoandroid1.0/SkiaSharp.targets" />
<file src="build/monoandroid1.0/SkiaSharp.targets" target="buildTransitive/monoandroid1.0/SkiaSharp.targets" />
<file src="build/xamarinios1.0/SkiaSharp.targets" />
<file src="build/xamarinios1.0/SkiaSharp.targets" target="buildTransitive/xamarinios1.0/SkiaSharp.targets" />
<file src="build/xamarintvos1.0/SkiaSharp.targets" />
<file src="build/xamarintvos1.0/SkiaSharp.targets" target="buildTransitive/xamarintvos1.0/SkiaSharp.targets" />
<file src="build/xamarinwatchos1.0/SkiaSharp.targets" />
<file src="build/xamarinwatchos1.0/SkiaSharp.targets" target="buildTransitive/xamarinwatchos1.0/SkiaSharp.targets" />
<file src="build/xamarinmac2.0/SkiaSharp.targets" />
<file src="build/xamarinmac2.0/SkiaSharp.targets" target="buildTransitive/xamarinmac2.0/SkiaSharp.targets" />
<file src="build/tizen40/SkiaSharp.targets" />
<file src="build/tizen40/SkiaSharp.targets" target="buildTransitive/tizen40/SkiaSharp.targets" />
<!-- libSkiaSharp.dll and other native files -->
<!-- win -->