Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improve the Linux CI #635

Merged
merged 36 commits into from
Sep 17, 2018
Merged

Improve the Linux CI #635

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
fbdb9c1
Prepare the bits to build the linux platforms
mattleibow Sep 13, 2018
8fe29b5
Adding the required native packages
mattleibow Sep 13, 2018
1614ef6
More stuff
mattleibow Sep 13, 2018
3ee5cce
More stuff
mattleibow Sep 13, 2018
3f50801
More stuff
mattleibow Sep 13, 2018
a34a87b
More stuff
mattleibow Sep 13, 2018
093b84d
More stuff
mattleibow Sep 13, 2018
a0663c6
More stuff
mattleibow Sep 13, 2018
6e76383
More stuff
mattleibow Sep 13, 2018
b11db17
More stuff
mattleibow Sep 13, 2018
46a98c4
More stuff
mattleibow Sep 13, 2018
52e9168
Update mdoc and add the --quiet flag to reduce output noise
mattleibow Sep 13, 2018
c6c38e5
More stuff
mattleibow Sep 13, 2018
1c208be
More stuff
mattleibow Sep 13, 2018
69df8f6
More stuff
mattleibow Sep 13, 2018
9b2379f
More stuff
mattleibow Sep 13, 2018
fa23545
More stuff
mattleibow Sep 13, 2018
411a4aa
More stuff
mattleibow Sep 13, 2018
2fe2889
More stuff
mattleibow Sep 13, 2018
d866103
Moved the linux native assets into a separate nuget
mattleibow Sep 14, 2018
68ef4ab
Added more logging to see what is happening in the package stage
mattleibow Sep 14, 2018
04552b4
increase verbosity
mattleibow Sep 14, 2018
928a9f4
normal verbosity
mattleibow Sep 14, 2018
9e52909
Merge pull request #637 from mono/development
mattleibow Sep 14, 2018
3c312a8
Fixed up the merge
mattleibow Sep 14, 2018
2bb5da9
fix the casing
mattleibow Sep 14, 2018
ab81c04
Make sure to process the native asset nugets
mattleibow Sep 14, 2018
d64b588
Add the new nugets to versions.txt
mattleibow Sep 14, 2018
c8c38d1
Workaround for https://github.com/mono/api-doc-tools/pull/351
mattleibow Sep 14, 2018
364fe7e
Adding the emoji fonts for linux tests
mattleibow Sep 14, 2018
10395c4
Added the native nugets to the netcore tests
mattleibow Sep 14, 2018
1448985
trying to fix the build
mattleibow Sep 15, 2018
30ca031
Enable all the builds again
mattleibow Sep 15, 2018
586d35f
Update the UWP signing key
mattleibow Sep 15, 2018
9b7fa12
Remove the old index8 member
mattleibow Sep 15, 2018
122e089
Make sure the propertyset extensions can be used
mattleibow Sep 15, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions VERSIONS.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
# dependencies
ANGLE.WindowsStore release 2.1.13
7Zip4Powershell release 1.8.0
mdoc release 5.7.2.3
mdoc release 5.7.3.1
harfbuzz release 1.4.6
skia release m68
xunit.runner.console release 2.4.0
Xamarin.Forms release 3.0.0.561731
Tizen.NET release 4.0.0
OpenTK.GLControl release 1.1.2349.61993
MSBuild.Sdk.Extras release 1.6.41
MSBuild.Sdk.Extras release 1.6.55

# native sonames
libSkiaSharp soname 68.0.0
Expand All @@ -23,8 +23,10 @@ HarfBuzzSharp assembly 1.0.0.0
HarfBuzzSharp file 1.4.6.2

# nuget versions
SkiaSharp nuget 1.68.0
SkiaSharp.Views nuget 1.68.0
SkiaSharp.Views.Forms nuget 1.68.0
SkiaSharp.HarfBuzz nuget 1.68.0
HarfBuzzSharp nuget 1.4.6.2
SkiaSharp nuget 1.68.0
SkiaSharp.NativeAssets.Linux nuget 1.68.0
SkiaSharp.Views nuget 1.68.0
SkiaSharp.Views.Forms nuget 1.68.0
SkiaSharp.HarfBuzz nuget 1.68.0
HarfBuzzSharp nuget 1.4.6.2
HarfBuzzSharp.NativeAssets.Linux nuget 1.4.6.2
3 changes: 2 additions & 1 deletion binding/Binding/SKBitmap.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,9 +169,10 @@ public void Erase (SKColor color, SKRectI rect)
public UInt32 GetAddr32(int x, int y) => SkiaApi.sk_bitmap_get_addr_32 (Handle, x, y);
public IntPtr GetAddr(int x, int y) => SkiaApi.sk_bitmap_get_addr (Handle, x, y);

[Obsolete ("The Index8 color type and color table is no longer supported. Use GetPixel(int, int) instead.")]
public SKPMColor GetIndex8Color (int x, int y)
{
return SkiaApi.sk_bitmap_get_index8_color (Handle, x, y);
return (SKPMColor) GetPixel (x, y);
}

public SKColor GetPixel (int x, int y)
Expand Down
2 changes: 0 additions & 2 deletions binding/Binding/SkiaApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1342,8 +1342,6 @@ internal static class SkiaApi
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_color_t sk_bitmap_get_pixel_color(sk_bitmap_t cbitmap, int x, int y);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static sk_pmcolor_t sk_bitmap_get_index8_color(sk_bitmap_t cbitmap, int x, int y);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
public extern static void sk_bitmap_set_pixel_color(sk_bitmap_t cbitmap, int x, int y, SKColor color);
[DllImport(SKIA, CallingConvention = CallingConvention.Cdecl)]
[return: MarshalAs(UnmanagedType.I1)]
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<EmbeddedNativeLibrary Include="..\..\output\native\android\arm64-v8a\libHarfBuzzSharp.so" Link="libs\arm64-v8a\libHarfBuzzSharp.so" />
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\output\native\windows\x64\libHarfBuzzSharp.dll" Link="nuget\runtimes\win-x64\native\libHarfBuzzSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\Binding.Shared\**\*.cs" Link="%(RecursiveDir)%(Filename)%(Extension)" />
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,10 +18,10 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="Tizen.NET" Version="4.0.0" ExcludeAssets="Runtime" />
<PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\output\native\tizen\armel\libHarfBuzzSharp.so" Link="nuget\runtimes\tizen-armel\native\libHarfBuzzSharp.so" />
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down
4 changes: 2 additions & 2 deletions binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.Android/SkiaSharp.Android.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<EmbeddedNativeLibrary Include="..\..\output\native\android\arm64-v8a\libSkiaSharp.so" Link="libs\arm64-v8a\libSkiaSharp.so" />
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\output\native\windows\x64\libSkiaSharp.dll" Link="nuget\runtimes\win-x64\native\libSkiaSharp.dll" Condition=" '$(IsWindows)' == 'true' " />
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,10 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="Tizen.NET" Version="4.0.0" ExcludeAssets="Runtime" />
<PackageReference Include="Tizen.NET.Sdk" Version="1.0.1" />
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="System.IO.UnmanagedMemoryStream" Version="4.3.0" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
<PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform" Version="6.0.6" />
</ItemGroup>
<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down
4 changes: 2 additions & 2 deletions binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@
<DebugType>pdbonly</DebugType>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="mdoc" Version="5.7.2.3" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.41" PrivateAssets="All" />
<PackageReference Include="mdoc" Version="5.7.3.1" PrivateAssets="All" />
<PackageReference Include="MSBuild.Sdk.Extras" Version="1.6.55" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
<Compile Include="Properties\AssemblyInfo.cs" />
Expand Down
30 changes: 18 additions & 12 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
#addin nuget:?package=Mono.ApiTools.NuGetDiff&version=1.0.0&loaddependencies=true

#tool "nuget:?package=xunit.runner.console&version=2.4.0"
#tool "nuget:?package=mdoc&version=5.7.2.3"
#tool "nuget:?package=mdoc&version=5.7.3.1"
#tool "nuget:?package=vswhere&version=2.5.2"

using System.Linq;
Expand All @@ -26,7 +26,7 @@ var TARGET = Argument ("t", Argument ("target", Argument ("Target", "Default")))
var VERBOSITY = (Verbosity) Enum.Parse (typeof(Verbosity), Argument ("v", Argument ("verbosity", Argument ("Verbosity", "Normal"))), true);
var SKIP_EXTERNALS = Argument ("skipexternals", Argument ("SkipExternals", "")).ToLower ().Split (',');
var PACK_ALL_PLATFORMS = Argument ("packall", Argument ("PackAll", Argument ("PackAllPlatforms", TARGET.ToLower() == "ci" || TARGET.ToLower() == "nuget-only")));
var PRINT_ALL_ENV_VARS = Argument ("printAllenvVars", false);
var PRINT_ALL_ENV_VARS = Argument ("printAllEnvVars", false);

var NuGetSources = new [] { MakeAbsolute (Directory ("./output/nugets")).FullPath, "https://api.nuget.org/v3/index.json" };
var NuGetToolPath = Context.Tools.Resolve ("nuget.exe");
Expand Down Expand Up @@ -63,11 +63,13 @@ if (string.IsNullOrEmpty (BUILD_NUMBER)) {
}

var TRACKED_NUGETS = new Dictionary<string, Version> {
{ "SkiaSharp", new Version (1, 57, 0) },
{ "SkiaSharp.Views", new Version (1, 57, 0) },
{ "SkiaSharp.Views.Forms", new Version (1, 57, 0) },
{ "HarfBuzzSharp", new Version (1, 0, 0) },
{ "SkiaSharp.HarfBuzz", new Version (1, 57, 0) },
{ "SkiaSharp", new Version (1, 57, 0) },
{ "SkiaSharp.NativeAssets.Linux", new Version (1, 57, 0) },
{ "SkiaSharp.Views", new Version (1, 57, 0) },
{ "SkiaSharp.Views.Forms", new Version (1, 57, 0) },
{ "HarfBuzzSharp", new Version (1, 0, 0) },
{ "HarfBuzzSharp.NativeAssets.Linux", new Version (1, 0, 0) },
{ "SkiaSharp.HarfBuzz", new Version (1, 57, 0) },
};

#load "cake/UtilsManaged.cake"
Expand Down Expand Up @@ -354,21 +356,25 @@ Task ("nuget-only")
}
});

DeleteFiles ("./output/*/nuget/*.nuspec");
foreach (var nuspec in GetFiles ("./nuget/*.nuspec")) {
var xdoc = XDocument.Load (nuspec.FullPath);
var metadata = xdoc.Root.Element ("metadata");
var id = metadata.Element ("id");
var id = metadata.Element ("id").Value;
var dir = id;
if (id.Contains(".NativeAssets")) {
dir = id.Substring(0, id.IndexOf(".NativeAssets"));
}

removePlatforms (xdoc);

var outDir = $"./output/{id.Value}/nuget";
DeleteFiles ($"{outDir}/*.nuspec");
var outDir = $"./output/{dir}/nuget";

setVersion (xdoc, "");
xdoc.Save ($"{outDir}/{id.Value}.nuspec");
xdoc.Save ($"{outDir}/{id}.nuspec");

setVersion (xdoc, $"-preview-{BUILD_NUMBER}");
xdoc.Save ($"{outDir}/{id.Value}.prerelease.nuspec");
xdoc.Save ($"{outDir}/{id}.prerelease.nuspec");

// the legal
CopyFile ("./LICENSE.txt", $"{outDir}/LICENSE.txt");
Expand Down
43 changes: 43 additions & 0 deletions nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
<?xml version="1.0" encoding="utf-8"?>
<package>
<metadata>

<!-- package -->
<id>HarfBuzzSharp.NativeAssets.Linux</id>
<title>HarfBuzzSharp - Native Assets for Linux</title>
<version>1.0.0</version>
<description>
HarfBuzzSharp is a cross-platform OpenType text shaping engine for .NET platforms.
</description>
<summary>
HarfBuzzSharp is a cross-platform OpenType text shaping engine for .NET platforms.
</summary>
<releaseNotes>
Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release notes.
</releaseNotes>
<projectUrl>https://go.microsoft.com/fwlink/?linkid=868515</projectUrl>
<iconUrl>https://go.microsoft.com/fwlink/?linkid=868516</iconUrl>
<tags>xamarin text harfbuzz ios android linux windows uwp tvos macos tizen cross-platform harfbuzzsharp</tags>

<!-- legal -->
<licenseUrl>https://go.microsoft.com/fwlink/?linkid=868514</licenseUrl>
<authors>Microsoft</authors>
<owners>Microsoft</owners>
<requireLicenseAcceptance>true</requireLicenseAcceptance>
<copyright>© Microsoft Corporation. All rights reserved.</copyright>

<dependencies>
<dependency id="HarfBuzzSharp" version="1.0.0" />
</dependencies>

</metadata>
<files>

<file platform="linux" src="runtimes/linux-x64/native/libHarfBuzzSharp.so" />

<!-- legal -->
<file src="LICENSE.txt" />
<file src="THIRD-PARTY-NOTICES.txt" />

</files>
</package>
2 changes: 1 addition & 1 deletion nuget/HarfbuzzSharp.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file platform="windows" src="runtimes/win10-x64/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
<file platform="windows" src="runtimes/win10-x86/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
<file platform="windows" src="runtimes/win10-arm/nativeassets/uap10.0/libHarfBuzzSharp.dll" />
<file platform="linux" src="runtimes/linux-x64/native/libHarfBuzzSharp.so" />
<!-- <file platform="linux" src="runtimes/linux-x64/native/libHarfBuzzSharp.so" /> -->
<file src="runtimes/tizen-armel/native/libHarfBuzzSharp.so" />
<file src="runtimes/tizen-x86/native/libHarfBuzzSharp.so" />

Expand Down
Loading