Skip to content

Commit 6c25780

Browse files
mattleibowmattleibow
committed
Moving more work into MSBuild
1 parent 7bdd5f3 commit 6c25780

File tree

70 files changed

+1099
-1288
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

70 files changed

+1099
-1288
lines changed

‎LICENSE.txt

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
Copyright (c) 2015-2016 Xamarin, Inc.
2+
Copyright (c) 2017-2018 Microsoft Corporation.
3+
4+
Permission is hereby granted, free of charge, to any person obtaining a copy of
5+
this software and associated documentation files (the "Software"), to deal in
6+
the Software without restriction, including without limitation the rights to
7+
use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
8+
the Software, and to permit persons to whom the Software is furnished to do so,
9+
subject to the following conditions:
10+
11+
The above copyright notice and this permission notice shall be included in all
12+
copies or substantial portions of the Software.
13+
14+
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
15+
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
16+
FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
17+
COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
18+
IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
19+
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

‎binding/.gitignore

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1 @@
1-
SkiaSharp.Portable/SkiaPortable.cs
2-
HarfBuzzSharp.Portable/HarfBuzzPortable.cs
1+
!*/nuget/build/

‎binding/Binding/Properties/SkiaSharpAssemblyInfo.cs

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,16 @@
1-
//------------------------------------------------------------------------------
2-
// <auto-generated>
3-
// This code was generated by Cake.
4-
// </auto-generated>
5-
//------------------------------------------------------------------------------
1+
using System;
62
using System.Reflection;
3+
using System.Resources;
74

85
[assembly: AssemblyTitle("SkiaSharp")]
9-
[assembly: AssemblyDescription("")]
10-
[assembly: AssemblyCompany("")]
6+
[assembly: AssemblyDescription("SkiaSharp is a cross-platform 2D graphics API for .NET platforms that can be used across mobile, server and desktop models to render images.")]
7+
[assembly: AssemblyCompany("Xamarin Inc.")]
118
[assembly: AssemblyProduct("SkiaSharp")]
12-
[assembly: AssemblyVersion("1.60.0.0")]
13-
[assembly: AssemblyFileVersion("1.60.0.0")]
14-
[assembly: AssemblyInformationalVersion("1.60.0.0-{GIT_SHA}")]
15-
[assembly: AssemblyCopyright("Xamarin Inc.")]
16-
[assembly: AssemblyTrademark("")]
9+
[assembly: AssemblyCopyright("© Microsoft Corporation. All rights reserved.")]
10+
[assembly: NeutralResourcesLanguage("en")]
1711

12+
#if DEBUG
13+
[assembly: AssemblyConfiguration("Debug")]
14+
#else
15+
[assembly: AssemblyConfiguration("Release")]
16+
#endif

‎binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\source\SkiaSharp.Build.props" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -14,8 +15,8 @@
1415
<AndroidResgenFile>Resources\Resource.designer.cs</AndroidResgenFile>
1516
<AndroidUseLatestPlatformSdk>False</AndroidUseLatestPlatformSdk>
1617
<TargetFrameworkVersion>v2.3</TargetFrameworkVersion>
17-
<SignAssembly>true</SignAssembly>
18-
<AssemblyOriginatorKeyFile>..\..\mono.snk</AssemblyOriginatorKeyFile>
18+
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
19+
<PackagingPlatform>MonoAndroid</PackagingPlatform>
1920
</PropertyGroup>
2021
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
2122
<DebugSymbols>true</DebugSymbols>
@@ -30,7 +31,8 @@
3031
<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
3132
</PropertyGroup>
3233
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
33-
<DebugType>full</DebugType>
34+
<DebugSymbols>true</DebugSymbols>
35+
<DebugType>pdbonly</DebugType>
3436
<Optimize>true</Optimize>
3537
<OutputPath>bin\Release</OutputPath>
3638
<DefineConstants>HARFBUZZ</DefineConstants>
@@ -46,24 +48,28 @@
4648
<Reference Include="System.Core" />
4749
<Reference Include="Mono.Android" />
4850
</ItemGroup>
51+
<ItemGroup>
52+
<PackageReference Include="mdoc" Version="5.5.0" PrivateAssets="All" />
53+
</ItemGroup>
4954
<ItemGroup>
5055
<Compile Include="Properties\AssemblyInfo.cs" />
5156
</ItemGroup>
5257
<ItemGroup>
53-
<EmbeddedNativeLibrary Include="..\..\output\native\android\arm64-v8a\libHarfBuzzSharp.so">
58+
<EmbeddedNativeLibrary Include="..\..\output\native\android\arm64\libHarfBuzzSharp.so">
5459
<Link>libs\arm64-v8a\libHarfBuzzSharp.so</Link>
5560
</EmbeddedNativeLibrary>
56-
<EmbeddedNativeLibrary Include="..\..\output\native\android\armeabi-v7a\libHarfBuzzSharp.so">
61+
<EmbeddedNativeLibrary Include="..\..\output\native\android\arm\libHarfBuzzSharp.so">
5762
<Link>libs\armeabi-v7a\libHarfBuzzSharp.so</Link>
5863
</EmbeddedNativeLibrary>
5964
<EmbeddedNativeLibrary Include="..\..\output\native\android\x86\libHarfBuzzSharp.so">
6065
<Link>libs\x86\libHarfBuzzSharp.so</Link>
6166
</EmbeddedNativeLibrary>
62-
<EmbeddedNativeLibrary Include="..\..\output\native\android\x86_64\libHarfBuzzSharp.so">
67+
<EmbeddedNativeLibrary Include="..\..\output\native\android\x64\libHarfBuzzSharp.so">
6368
<Link>libs\x86_64\libHarfBuzzSharp.so</Link>
6469
</EmbeddedNativeLibrary>
6570
</ItemGroup>
6671
<Import Project="..\HarfBuzzSharp.Shared\HarfBuzzSharp.Shared.projitems" Label="Shared" />
6772
<Import Project="..\Binding.Shared\Binding.Shared.projitems" Label="Shared" />
73+
<Import Project="..\..\source\SkiaSharp.Build.targets" />
6874
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Android\Xamarin.Android.CSharp.targets" />
6975
</Project>

‎binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj

Lines changed: 13 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
4+
<Import Project="..\..\source\SkiaSharp.Build.props" />
45
<PropertyGroup>
56
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
67
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -12,8 +13,8 @@
1213
<TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
1314
<FileAlignment>512</FileAlignment>
1415
<TargetFrameworkProfile />
15-
<SignAssembly>true</SignAssembly>
16-
<AssemblyOriginatorKeyFile>..\..\mono.snk</AssemblyOriginatorKeyFile>
16+
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
17+
<PackagingPlatform>net45</PackagingPlatform>
1718
</PropertyGroup>
1819
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1920
<DebugSymbols>true</DebugSymbols>
@@ -25,6 +26,7 @@
2526
<WarningLevel>4</WarningLevel>
2627
</PropertyGroup>
2728
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
29+
<DebugSymbols>true</DebugSymbols>
2830
<DebugType>pdbonly</DebugType>
2931
<Optimize>true</Optimize>
3032
<OutputPath>bin\Release\</OutputPath>
@@ -42,42 +44,31 @@
4244
<Reference Include="System.Net.Http" />
4345
<Reference Include="System.Xml" />
4446
</ItemGroup>
47+
<ItemGroup>
48+
<PackageReference Include="mdoc" Version="5.5.0" PrivateAssets="All" />
49+
</ItemGroup>
4550
<ItemGroup>
4651
<Compile Include="Properties\AssemblyInfo.cs" />
4752
</ItemGroup>
4853
<ItemGroup>
49-
<None Include="..\..\output\native\windows\x64\libHarfBuzzSharp.dll" Condition="Exists('..\..\output\native\windows\x64\libHarfBuzzSharp.dll')">
54+
<None Include="..\..\output\native\windows\x64\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' ">
5055
<Link>nuget\runtimes\win7-x64\native\libHarfBuzzSharp.dll</Link>
51-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5256
</None>
53-
<None Include="..\..\output\native\windows\x86\libHarfBuzzSharp.dll" Condition="Exists('..\..\output\native\windows\x86\libHarfBuzzSharp.dll')">
57+
<None Include="..\..\output\native\windows\x86\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' ">
5458
<Link>nuget\runtimes\win7-x86\native\libHarfBuzzSharp.dll</Link>
55-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
5659
</None>
57-
<None Include="..\..\output\native\osx\libHarfBuzzSharp.dylib" Condition="Exists('..\..\output\native\osx\libHarfBuzzSharp.dylib')">
60+
<None Include="..\..\output\native\osx\libHarfBuzzSharp.dylib" Condition=" '$(IsMacOS)' == 'true' ">
5861
<Link>nuget\runtimes\osx\native\libHarfBuzzSharp.dylib</Link>
59-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6062
</None>
61-
<None Include="..\..\output\native\linux\x64\libHarfBuzzSharp.so" Condition="Exists('..\..\output\native\linux\x64\libHarfBuzzSharp.so')">
63+
<None Include="..\..\output\native\linux\x64\libHarfBuzzSharp.so" Condition=" '$(IsLinux)' == 'true' ">
6264
<Link>nuget\runtimes\linux-x64\native\libHarfBuzzSharp.so</Link>
63-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
64-
</None>
65-
<None Include="..\..\output\native\linux\x86\libHarfBuzzSharp.so" Condition="Exists('..\..\output\native\linux\x86\libHarfBuzzSharp.so')">
66-
<Link>nuget\runtimes\linux-x86\native\libHarfBuzzSharp.so</Link>
67-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
6865
</None>
6966
</ItemGroup>
7067
<ItemGroup>
71-
<None Include="nuget\build\net45\HarfBuzzSharp.Desktop.targets">
72-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
73-
<SubType>Designer</SubType>
74-
</None>
75-
<None Include="nuget\build\net45\HarfBuzzSharp.dll.config">
76-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
77-
<SubType>Designer</SubType>
78-
</None>
68+
<None Include="nuget\build\net45\HarfBuzzSharp.targets" />
7969
</ItemGroup>
8070
<Import Project="..\Binding.Shared\Binding.Shared.projitems" Label="Shared" />
8171
<Import Project="..\HarfBuzzSharp.Shared\HarfBuzzSharp.Shared.projitems" Label="Shared" />
72+
<Import Project="..\..\source\SkiaSharp.Build.targets" />
8273
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8374
</Project>

‎binding/HarfBuzzSharp.Desktop/nuget/build/net45/HarfBuzzSharp.Desktop.targets renamed to ‎binding/HarfBuzzSharp.Desktop/nuget/build/net45/HarfBuzzSharp.targets

File renamed without changes.

‎binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
2+
<Import Project="..\..\source\SkiaSharp.Build.props" />
23
<PropertyGroup>
34
<TargetFramework>netstandard1.3</TargetFramework>
45
<OutputTypeEx>library</OutputTypeEx>
56
<AssemblyName>HarfBuzzSharp</AssemblyName>
67
<RootNamespace>HarfBuzzSharp</RootNamespace>
78
<GenerateAssemblyInfo>False</GenerateAssemblyInfo>
8-
<AppendTargetFrameworkToOutputPath>False</AppendTargetFrameworkToOutputPath>
9-
<!-- TODO: remove this when CoreCLR supports signing on non-Windows -->
10-
<!--<SignAssembly Condition=" '$(OS)' == 'Windows_NT' ">true</SignAssembly>-->
11-
<SignAssembly>true</SignAssembly>
12-
<PublicSign Condition="'$(OS)' != 'Windows_NT'">true</PublicSign>
13-
<AssemblyOriginatorKeyFile>..\..\mono.snk</AssemblyOriginatorKeyFile>
9+
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
10+
<PackagingPlatform>netstandard1.3</PackagingPlatform>
1411
</PropertyGroup>
12+
<ItemGroup>
13+
<PackageReference Include="mdoc" Version="5.5.0" PrivateAssets="All" />
14+
</ItemGroup>
1515
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
1616
<DefineConstants>TRACE;DEBUG;HARFBUZZ;NET_STANDARD</DefineConstants>
1717
<OutputPath>bin\Debug\</OutputPath>
@@ -22,4 +22,5 @@
2222
</PropertyGroup>
2323
<Import Project="..\Binding.Shared\Binding.Shared.projitems" Label="Shared" />
2424
<Import Project="..\HarfBuzzSharp.Shared\HarfBuzzSharp.Shared.projitems" Label="Shared" />
25+
<Import Project="..\..\source\SkiaSharp.Build.targets" />
2526
</Project>

‎binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project DefaultTargets="Build" ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<Import Project="..\..\source\SkiaSharp.Build.props" />
34
<PropertyGroup>
45
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
56
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
@@ -11,9 +12,8 @@
1112
<TargetFrameworkVersion>v2.0</TargetFrameworkVersion>
1213
<TargetFrameworkIdentifier>Xamarin.Mac</TargetFrameworkIdentifier>
1314
<MonoMacResourcePrefix>Resources</MonoMacResourcePrefix>
14-
<SignAssembly>true</SignAssembly>
15-
<AssemblyOriginatorKeyFile>..\..\mono.snk</AssemblyOriginatorKeyFile>
16-
<MSBuildWarningsAsMessages>MSB9004</MSBuildWarningsAsMessages>
15+
<PackagingGroup>HarfBuzzSharp</PackagingGroup>
16+
<PackagingPlatform>Xamarin.Mac20</PackagingPlatform>
1717
</PropertyGroup>
1818
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1919
<DebugSymbols>true</DebugSymbols>
@@ -33,6 +33,8 @@
3333
<XamMacArch></XamMacArch>
3434
</PropertyGroup>
3535
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
36+
<DebugSymbols>true</DebugSymbols>
37+
<DebugType>pdbonly</DebugType>
3638
<Optimize>true</Optimize>
3739
<OutputPath>bin\Release</OutputPath>
3840
<DefineConstants>__MACOS__;HARFBUZZ</DefineConstants>
@@ -53,13 +55,10 @@
5355
<Reference Include="Xamarin.Mac" />
5456
</ItemGroup>
5557
<ItemGroup>
56-
<Compile Include="Properties\AssemblyInfo.cs" />
58+
<PackageReference Include="mdoc" Version="5.5.0" PrivateAssets="All" />
5759
</ItemGroup>
5860
<ItemGroup>
59-
<None Include="..\..\output\native\osx\libHarfBuzzSharp.dylib">
60-
<Link>nuget\runtimes\osx\native\libHarfBuzzSharp.dylib</Link>
61-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
62-
</None>
61+
<Compile Include="Properties\AssemblyInfo.cs" />
6362
</ItemGroup>
6463
<ItemGroup>
6564
<ObjcBindingNativeLibrary Include="..\..\output\native\osx\libHarfBuzzSharp.dylib">
@@ -74,5 +73,6 @@
7473
</ItemGroup>
7574
<Import Project="..\HarfBuzzSharp.Shared\HarfBuzzSharp.Shared.projitems" Label="Shared" />
7675
<Import Project="..\Binding.Shared\Binding.Shared.projitems" Label="Shared" />
76+
<Import Project="..\..\source\SkiaSharp.Build.targets" />
7777
<Import Project="$(MSBuildExtensionsPath)\Xamarin\Mac\Xamarin.Mac.ObjcBinding.CSharp.targets" />
7878
</Project>

‎binding/HarfBuzzSharp.Portable/HarfBuzzSharp.Portable.csproj

Lines changed: 0 additions & 46 deletions
This file was deleted.

‎binding/HarfBuzzSharp.Portable/Properties/AssemblyInfo.cs

Lines changed: 0 additions & 4 deletions
This file was deleted.

0 commit comments

Comments
 (0)