From fbdb9c1df23a106ba77e866adceb42fffd4cba7f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 16:52:44 +0200 Subject: [PATCH 01/35] Prepare the bits to build the linux platforms --- scripts/pipeline.groovy | 56 ++++++++++++++++++++--------------------- 1 file changed, 28 insertions(+), 28 deletions(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index f13d4ec051..71720d32f6 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -4,7 +4,7 @@ import groovy.transform.Field @Field def branchName = null @Field def commitHash = null @Field def githubStatusSha = null -@Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++ mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" +@Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" @Field def customEnv = [ "windows": [ @@ -44,37 +44,37 @@ node("ubuntu-1604-amd64") { stage("Native Builds") { parallel([ - // windows - win32: createNativeBuilder("Windows", "Windows", "components-windows"), - uwp: createNativeBuilder("UWP", "Windows", "components-windows"), - android_windows: createNativeBuilder("Android", "Windows", "components-windows"), - tizen_windows: createNativeBuilder("Tizen", "Windows", "components-windows"), - - // macos - macos: createNativeBuilder("macOS", "macOS", "components"), - ios: createNativeBuilder("iOS", "macOS", "components"), - tvos: createNativeBuilder("tvOS", "macOS", "components"), - watchos: createNativeBuilder("watchOS", "macOS", "components"), - android_macos: createNativeBuilder("Android", "macOS", "components"), - tizen_macos: createNativeBuilder("Tizen", "macOS", "components"), + // // windows + // win32: createNativeBuilder("Windows", "Windows", "components-windows", ""), + // uwp: createNativeBuilder("UWP", "Windows", "components-windows", ""), + // android_windows: createNativeBuilder("Android", "Windows", "components-windows", ""), + // tizen_windows: createNativeBuilder("Tizen", "Windows", "components-windows", ""), + + // // macos + // macos: createNativeBuilder("macOS", "macOS", "components", ""), + // ios: createNativeBuilder("iOS", "macOS", "components", ""), + // tvos: createNativeBuilder("tvOS", "macOS", "components", ""), + // watchos: createNativeBuilder("watchOS", "macOS", "components", ""), + // android_macos: createNativeBuilder("Android", "macOS", "components", ""), + // tizen_macos: createNativeBuilder("Tizen", "macOS", "components", ""), // linux - linux: createNativeBuilder("Linux", "Linux", "ubuntu-1604-amd64"), - tizen_linux: createNativeBuilder("Tizen", "Linux", "ubuntu-1604-amd64"), + linux: createNativeBuilder("Linux", "Linux", "ubuntu-1604-amd64", ""), + // tizen_linux: createNativeBuilder("Tizen", "Linux", "ubuntu-1604-amd64", ""), ]) } stage("Managed Builds") { parallel([ - windows: createManagedBuilder("Windows", "components-windows"), - macos: createManagedBuilder("macOS", "components"), - linux: createManagedBuilder("Linux", "ubuntu-1604-amd64"), + // windows: createManagedBuilder("Windows", "components-windows", ""), + // macos: createManagedBuilder("macOS", "components", ""), + linux: createManagedBuilder("Linux", "ubuntu-1604-amd64", ""), ]) } stage("Packaging") { parallel([ - package: createPackagingBuilder(), + package: createPackagingBuilder(""), ]) } @@ -88,7 +88,7 @@ node("ubuntu-1604-amd64") { // ============================================================================ // Functions -def createNativeBuilder(platform, host, label) { +def createNativeBuilder(platform, host, label, additionalPackages) { def githubContext = "Build Native - ${platform} on ${host}" platform = platform.toLowerCase(); host = host.toLowerCase(); @@ -109,7 +109,7 @@ def createNativeBuilder(platform, host, label) { if (host == "linux" && platform == "tizen") { pre = "./scripts/install-tizen.sh && " } - bootstrapper("-t externals-${platform} -v minimal", host, pre) + bootstrapper("-t externals-${platform} -v minimal", host, pre, additionalPackages) uploadBlobs("native-${platform}_${host}") @@ -127,7 +127,7 @@ def createNativeBuilder(platform, host, label) { } } -def createManagedBuilder(host, label) { +def createManagedBuilder(host, label, additionalPackages) { def githubContext = "Build Managed - ${host}" host = host.toLowerCase(); @@ -143,7 +143,7 @@ def createManagedBuilder(host, label) { checkout scm downloadBlobs("native-*") - bootstrapper("-t everything -v minimal --skipexternals=all", host, "") + bootstrapper("-t everything -v minimal --skipexternals=all", host, "", additionalPackages) step([ $class: "XUnitBuilder", @@ -188,7 +188,7 @@ def createManagedBuilder(host, label) { } } -def createPackagingBuilder() { +def createPackagingBuilder(additionalPackages) { def githubContext = "Packing" def host = "linux" def label = "ubuntu-1604-amd64" @@ -205,7 +205,7 @@ def createPackagingBuilder() { checkout scm downloadBlobs("managed-*"); - bootstrapper("-t nuget-only -v minimal", host, "") + bootstrapper("-t nuget-only -v minimal", host, "", additionalPackages) uploadBlobs("packing-${host}") @@ -223,13 +223,13 @@ def createPackagingBuilder() { } } -def bootstrapper(args, host, pre) { +def bootstrapper(args, host, pre, additionalPackages) { host = host.toLowerCase() if (host == "linux") { chroot( chrootName: "${env.NODE_LABEL}-stable", command: "bash ${pre} ./bootstrapper.sh ${args}", - additionalPackages: "${linuxPackages}") + additionalPackages: "${additionalPackages}") } else if (host == "macos") { sh("bash ${pre} ./bootstrapper.sh ${args}") } else if (host == "windows") { From 8fe29b549cb92889ca92c550071448f85d0bdf95 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 17:06:07 +0200 Subject: [PATCH 02/35] Adding the required native packages --- scripts/pipeline.groovy | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 71720d32f6..acac3fdedf 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -6,6 +6,8 @@ import groovy.transform.Field @Field def githubStatusSha = null @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" +@Field def nativeLinuxPackages = "curl" + @Field def customEnv = [ "windows": [ "TIZEN_STUDIO_HOME=C:\\Tizen", @@ -59,7 +61,7 @@ node("ubuntu-1604-amd64") { // tizen_macos: createNativeBuilder("Tizen", "macOS", "components", ""), // linux - linux: createNativeBuilder("Linux", "Linux", "ubuntu-1604-amd64", ""), + linux: createNativeBuilder("Linux", "Linux", "ubuntu-1604-amd64", nativeLinuxPackages), // tizen_linux: createNativeBuilder("Tizen", "Linux", "ubuntu-1604-amd64", ""), ]) } From 1614ef6d5d27a5767f6ed4337b39ac52c87e18d4 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 17:16:27 +0200 Subject: [PATCH 03/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index acac3fdedf..04fd585769 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -6,7 +6,7 @@ import groovy.transform.Field @Field def githubStatusSha = null @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" -@Field def nativeLinuxPackages = "curl" +@Field def nativeLinuxPackages = "curl mono-devel msbuild" @Field def customEnv = [ "windows": [ From 3ee5cceed8ceae7f317faa8b794bd58a65b9b2b8 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 17:26:41 +0200 Subject: [PATCH 04/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 04fd585769..6c15efb843 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -6,7 +6,7 @@ import groovy.transform.Field @Field def githubStatusSha = null @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" -@Field def nativeLinuxPackages = "curl mono-devel msbuild" +@Field def nativeLinuxPackages = "curl mono msbuild" @Field def customEnv = [ "windows": [ From 3f50801f050357da079c5b799052110cc90f8324 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 17:29:32 +0200 Subject: [PATCH 05/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 6c15efb843..449ffb3811 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -6,7 +6,7 @@ import groovy.transform.Field @Field def githubStatusSha = null @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" -@Field def nativeLinuxPackages = "curl mono msbuild" +@Field def nativeLinuxPackages = "curl mono python" @Field def customEnv = [ "windows": [ From a34a87bb9fcf997f696d2e43a56babae6a1b4b35 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 17:35:38 +0200 Subject: [PATCH 06/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 449ffb3811..3159151448 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -6,7 +6,7 @@ import groovy.transform.Field @Field def githubStatusSha = null @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" -@Field def nativeLinuxPackages = "curl mono python" +@Field def nativeLinuxPackages = "curl mono-runtime python" @Field def customEnv = [ "windows": [ From 093b84dffa87d9033a63789a8ec0b3be6a56157a Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 17:46:06 +0200 Subject: [PATCH 07/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 3159151448..15f1496c61 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -6,7 +6,7 @@ import groovy.transform.Field @Field def githubStatusSha = null @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" -@Field def nativeLinuxPackages = "curl mono-runtime python" +@Field def nativeLinuxPackages = "curl mono-devel python" @Field def customEnv = [ "windows": [ From a0663c61d0bdb9ed008da543d08487ea140a58a7 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 17:57:32 +0200 Subject: [PATCH 08/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 15f1496c61..365d1e0852 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -6,7 +6,7 @@ import groovy.transform.Field @Field def githubStatusSha = null @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" -@Field def nativeLinuxPackages = "curl mono-devel python" +@Field def nativeLinuxPackages = "curl mono-devel python git" @Field def customEnv = [ "windows": [ From 6e763833239e258440dcfbcc863e193d79443ca1 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 18:01:32 +0200 Subject: [PATCH 09/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 365d1e0852..3060537346 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -6,7 +6,7 @@ import groovy.transform.Field @Field def githubStatusSha = null @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" -@Field def nativeLinuxPackages = "curl mono-devel python git" +@Field def nativeLinuxPackages = "curl mono-devel python git libfontconfig1-dev" @Field def customEnv = [ "windows": [ From b11db17f3b53cf674b18d6405053567c99d72e12 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 18:11:22 +0200 Subject: [PATCH 10/35] More stuff --- scripts/pipeline.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 3060537346..493f3a3dd9 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -7,6 +7,7 @@ import groovy.transform.Field @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" @Field def nativeLinuxPackages = "curl mono-devel python git libfontconfig1-dev" +@Field def managedLinuxPackages = "curl mono-devel" @Field def customEnv = [ "windows": [ @@ -70,7 +71,7 @@ node("ubuntu-1604-amd64") { parallel([ // windows: createManagedBuilder("Windows", "components-windows", ""), // macos: createManagedBuilder("macOS", "components", ""), - linux: createManagedBuilder("Linux", "ubuntu-1604-amd64", ""), + linux: createManagedBuilder("Linux", "ubuntu-1604-amd64", managedLinuxPackages), ]) } From 46a98c4bf5b1101ab24b22b46b13ee1793571c88 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 18:27:56 +0200 Subject: [PATCH 11/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 493f3a3dd9..7fed65d202 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -7,7 +7,7 @@ import groovy.transform.Field @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" @Field def nativeLinuxPackages = "curl mono-devel python git libfontconfig1-dev" -@Field def managedLinuxPackages = "curl mono-devel" +@Field def managedLinuxPackages = "curl mono-devel msbuild" @Field def customEnv = [ "windows": [ From 52e916848922afebcc99fa31543d7915982bd54c Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 18:56:04 +0200 Subject: [PATCH 12/35] Update mdoc and add the --quiet flag to reduce output noise --- VERSIONS.txt | 2 +- binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj | 2 +- binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj | 2 +- .../HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj | 2 +- binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj | 2 +- binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj | 2 +- binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj | 2 +- binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj | 2 +- binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj | 2 +- binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj | 2 +- binding/SkiaSharp.Android/SkiaSharp.Android.csproj | 2 +- binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj | 2 +- binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj | 2 +- binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj | 2 +- binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj | 2 +- binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj | 2 +- binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj | 2 +- binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj | 2 +- binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj | 2 +- build.cake | 2 +- source/SkiaSharp.Build.targets | 2 +- .../SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj | 2 +- .../SkiaSharp.Views.Forms.Android.csproj | 2 +- .../SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj | 2 +- .../SkiaSharp.Views.Forms.Tizen.csproj | 2 +- .../SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj | 2 +- .../SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj | 2 +- .../SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj | 2 +- .../SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj | 2 +- .../SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj | 2 +- .../SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj | 2 +- .../SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj | 2 +- .../SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj | 2 +- .../SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj | 2 +- .../SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj | 2 +- .../SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj | 2 +- .../SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj | 2 +- .../SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj | 2 +- 38 files changed, 38 insertions(+), 38 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index 5b3b4d4b74..7adc86bbd4 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -1,7 +1,7 @@ # 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 diff --git a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj index 5225132832..fc46e71186 100644 --- a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj +++ b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj b/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj index 3f204ccad3..aa8a35b632 100644 --- a/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj +++ b/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj b/binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj index d45a1ce04e..2f1626332f 100644 --- a/binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj +++ b/binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj index acf7b226f1..2e7b7d79f3 100644 --- a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj +++ b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj b/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj index 9066723052..75aac3ddce 100644 --- a/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj +++ b/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj @@ -21,7 +21,7 @@ - + diff --git a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj index 9c7865d788..23add0c430 100644 --- a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj +++ b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj index 1320fbd5bb..bf052840db 100644 --- a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj +++ b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj index 98104d41dd..3b6fe0d313 100644 --- a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj +++ b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj index 0f4ed14e73..9561e6224b 100644 --- a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj +++ b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj index 734a7a8f07..1e78e30d60 100644 --- a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj +++ b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj b/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj index 62b32edcfa..e8771b9cee 100644 --- a/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj +++ b/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj b/binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj index 177cfc749f..a743b80c9b 100644 --- a/binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj +++ b/binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj index 6c20745b01..9ebea78739 100644 --- a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj +++ b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj b/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj index d60f26d925..b65478515a 100644 --- a/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj +++ b/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj @@ -22,7 +22,7 @@ - + diff --git a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj index 029d1a860c..e49cdee0ca 100644 --- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj +++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj @@ -17,7 +17,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj index e477305f88..2d35a80eda 100644 --- a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj +++ b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj index 3b74e0fc5a..3fd0fd96eb 100644 --- a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj +++ b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj index 44df5280e1..5a1a392a28 100644 --- a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj +++ b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/build.cake b/build.cake index d508c6818f..ca6557167f 100644 --- a/build.cake +++ b/build.cake @@ -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; diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets index e39cabab76..5b9d4ed07d 100644 --- a/source/SkiaSharp.Build.targets +++ b/source/SkiaSharp.Build.targets @@ -133,7 +133,7 @@ + Command="$(_ManagedExeLauncher) "$(MDocToolPath)" export-msxdoc --quiet "$(MDocDocumentationDirectory)"" /> $(DefineConstants);NET_STANDARD - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj index 8a952ceacc..fddea7a5a3 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj @@ -11,7 +11,7 @@ $(DefineConstants); - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj index 9d0024dd42..884e454409 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj @@ -11,7 +11,7 @@ $(DefineConstants);__MACOS__ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj index 1c26ab4e6d..3e0b06521c 100755 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj @@ -16,7 +16,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj index 160fcc5836..f8b8174ea2 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj @@ -11,7 +11,7 @@ $(DefineConstants); - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj index d684738c97..1c8664b8e0 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj @@ -11,7 +11,7 @@ $(DefineConstants); - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj index 0332beaf0b..8019b455c1 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj @@ -11,7 +11,7 @@ $(DefineConstants);NET_STANDARD - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj index 730ec98c43..9d56154b80 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj @@ -10,7 +10,7 @@ $(DefineConstants); - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj index 9455eb7b61..dbcef6284c 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj @@ -10,7 +10,7 @@ $(DefineConstants);__DESKTOP__ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj index 69d0f9f814..b742d7dd45 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj @@ -24,7 +24,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj index 00614c766f..953b82290b 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj @@ -10,7 +10,7 @@ $(DefineConstants);__MACOS__ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj index e9b76b1b84..3b6100af2b 100755 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj @@ -16,7 +16,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj index 4844aba3f0..abcf934979 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj @@ -10,7 +10,7 @@ $(DefineConstants); - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj index 837ac021eb..5f66ee396f 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj @@ -11,7 +11,7 @@ $(DefineConstants);__DESKTOP__;__WPF__ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj index 3a8eb0c84d..6e83c130d8 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj @@ -10,7 +10,7 @@ $(DefineConstants); - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj index b3864ca27b..ff5ce3cd18 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj @@ -10,7 +10,7 @@ $(DefineConstants); - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj index d3bff3d48c..f7a5db031f 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj @@ -10,7 +10,7 @@ $(DefineConstants); - + From c6c38e5493eba8f972af98094b5b093b6cd6f5ae Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 21:24:29 +0200 Subject: [PATCH 13/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 7fed65d202..e152651329 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -7,7 +7,7 @@ import groovy.transform.Field @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" @Field def nativeLinuxPackages = "curl mono-devel python git libfontconfig1-dev" -@Field def managedLinuxPackages = "curl mono-devel msbuild" +@Field def managedLinuxPackages = "curl mono-devel msbuild dotnet-sdk-2.0.0" @Field def customEnv = [ "windows": [ From 1c208be112a41bd4dbda330750167e139669df2e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 22:38:38 +0200 Subject: [PATCH 14/35] More stuff --- scripts/pipeline.groovy | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index e152651329..cad6302fb6 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -7,6 +7,7 @@ import groovy.transform.Field @Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" @Field def nativeLinuxPackages = "curl mono-devel python git libfontconfig1-dev" +@Field def nativeTizenPackages = "curl mono-devel python git" @Field def managedLinuxPackages = "curl mono-devel msbuild dotnet-sdk-2.0.0" @Field def customEnv = [ @@ -63,7 +64,7 @@ node("ubuntu-1604-amd64") { // linux linux: createNativeBuilder("Linux", "Linux", "ubuntu-1604-amd64", nativeLinuxPackages), - // tizen_linux: createNativeBuilder("Tizen", "Linux", "ubuntu-1604-amd64", ""), + tizen_linux: createNativeBuilder("Tizen", "Linux", "ubuntu-1604-amd64", nativeTizenPackages), ]) } From 69df8f613ad36c29799ba218600d71baf79e817c Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 22:47:23 +0200 Subject: [PATCH 15/35] More stuff --- scripts/pipeline.groovy | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index cad6302fb6..d7728a46a5 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -4,10 +4,9 @@ import groovy.transform.Field @Field def branchName = null @Field def commitHash = null @Field def githubStatusSha = null -@Field def linuxPackages = "xvfb xauth libfontconfig1-dev libglu1-mesa-dev g++-5 mono-complete msbuild curl ca-certificates-mono unzip python git referenceassemblies-pcl dotnet-sdk-2.0.0 ttf-ancient-fonts openjdk-8-jdk zip gettext openvpn acl libxcb-render-util0 libv4l-0 libsdl1.2debian libxcb-image0 bridge-utils rpm2cpio libxcb-icccm4 libwebkitgtk-1.0-0 cpio" @Field def nativeLinuxPackages = "curl mono-devel python git libfontconfig1-dev" -@Field def nativeTizenPackages = "curl mono-devel python git" +@Field def nativeTizenPackages = "curl mono-devel python git openjdk-8-jdk" @Field def managedLinuxPackages = "curl mono-devel msbuild dotnet-sdk-2.0.0" @Field def customEnv = [ @@ -63,7 +62,7 @@ node("ubuntu-1604-amd64") { // tizen_macos: createNativeBuilder("Tizen", "macOS", "components", ""), // linux - linux: createNativeBuilder("Linux", "Linux", "ubuntu-1604-amd64", nativeLinuxPackages), + // linux: createNativeBuilder("Linux", "Linux", "ubuntu-1604-amd64", nativeLinuxPackages), tizen_linux: createNativeBuilder("Tizen", "Linux", "ubuntu-1604-amd64", nativeTizenPackages), ]) } From 9b2379f73ec1663500218747f732090a45a7d808 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 22:54:10 +0200 Subject: [PATCH 16/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index d7728a46a5..c9ed42a6b4 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -6,7 +6,7 @@ import groovy.transform.Field @Field def githubStatusSha = null @Field def nativeLinuxPackages = "curl mono-devel python git libfontconfig1-dev" -@Field def nativeTizenPackages = "curl mono-devel python git openjdk-8-jdk" +@Field def nativeTizenPackages = "curl mono-devel python git openjdk-8-jdk zip" @Field def managedLinuxPackages = "curl mono-devel msbuild dotnet-sdk-2.0.0" @Field def customEnv = [ From fa23545766456c4e0a65d1706cedf6d3f4c6d5ad Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 23:03:53 +0200 Subject: [PATCH 17/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index c9ed42a6b4..ac483bae01 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -6,7 +6,7 @@ import groovy.transform.Field @Field def githubStatusSha = null @Field def nativeLinuxPackages = "curl mono-devel python git libfontconfig1-dev" -@Field def nativeTizenPackages = "curl mono-devel python git openjdk-8-jdk zip" +@Field def nativeTizenPackages = "curl mono-devel python git openjdk-8-jdk zip libxcb-xfixes0 libxcb-render-util0 libwebkitgtk-1.0-0 libxcb-image0 acl libsdl1.2debian libv4l-0 libxcb-randr0 libxcb-shape0 libxcb-icccm4 libsm6 gettext rpm2cpio cpio bridge-utils openvpn" @Field def managedLinuxPackages = "curl mono-devel msbuild dotnet-sdk-2.0.0" @Field def customEnv = [ From 411a4aa109ade8e98496ddc51317ecc44c234a3e Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Thu, 13 Sep 2018 23:26:45 +0200 Subject: [PATCH 18/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index ac483bae01..ffc6020b90 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -62,7 +62,7 @@ node("ubuntu-1604-amd64") { // tizen_macos: createNativeBuilder("Tizen", "macOS", "components", ""), // linux - // linux: createNativeBuilder("Linux", "Linux", "ubuntu-1604-amd64", nativeLinuxPackages), + linux: createNativeBuilder("Linux", "Linux", "ubuntu-1604-amd64", nativeLinuxPackages), tizen_linux: createNativeBuilder("Tizen", "Linux", "ubuntu-1604-amd64", nativeTizenPackages), ]) } From 2fe2889293ca8f826afceb1ab81c29a2175c1448 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 14 Sep 2018 01:16:32 +0200 Subject: [PATCH 19/35] More stuff --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index ffc6020b90..3198f535e2 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -7,7 +7,7 @@ import groovy.transform.Field @Field def nativeLinuxPackages = "curl mono-devel python git libfontconfig1-dev" @Field def nativeTizenPackages = "curl mono-devel python git openjdk-8-jdk zip libxcb-xfixes0 libxcb-render-util0 libwebkitgtk-1.0-0 libxcb-image0 acl libsdl1.2debian libv4l-0 libxcb-randr0 libxcb-shape0 libxcb-icccm4 libsm6 gettext rpm2cpio cpio bridge-utils openvpn" -@Field def managedLinuxPackages = "curl mono-devel msbuild dotnet-sdk-2.0.0" +@Field def managedLinuxPackages = "curl mono-complete msbuild dotnet-sdk-2.0.0" @Field def customEnv = [ "windows": [ From d8661039b6f1856b7c63056b3af53c3b27a3875f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 14 Sep 2018 12:37:15 +0200 Subject: [PATCH 20/35] Moved the linux native assets into a separate nuget --- build.cake | 16 ++++--- nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec | 43 ++++++++++++++++++ nuget/HarfbuzzSharp.nuspec | 2 +- nuget/SkiaSharp.NativeAssets.Linux.nuspec | 45 +++++++++++++++++++ nuget/SkiaSharp.nuspec | 2 +- 5 files changed, 100 insertions(+), 8 deletions(-) create mode 100644 nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec create mode 100644 nuget/SkiaSharp.NativeAssets.Linux.nuspec diff --git a/build.cake b/build.cake index ca6557167f..943d94eb81 100644 --- a/build.cake +++ b/build.cake @@ -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"); @@ -354,21 +354,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"); diff --git a/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec b/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec new file mode 100644 index 0000000000..cd31f28495 --- /dev/null +++ b/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec @@ -0,0 +1,43 @@ + + + + + + HarfbuzzSharp.NativeAssets.Linux + HarfbuzzSharp - Native Assets for Linux + 1.0.0 + +HarfBuzzSharp is a cross-platform OpenType text shaping engine for .NET platforms. + + +HarfBuzzSharp is a cross-platform OpenType text shaping engine for .NET platforms. + + +Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release notes. + + https://go.microsoft.com/fwlink/?linkid=868515 + https://go.microsoft.com/fwlink/?linkid=868516 + xamarin text harfbuzz ios android linux windows uwp tvos macos tizen cross-platform harfbuzzsharp + + + https://go.microsoft.com/fwlink/?linkid=868514 + Microsoft + Microsoft + true + © Microsoft Corporation. All rights reserved. + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuget/HarfbuzzSharp.nuspec b/nuget/HarfbuzzSharp.nuspec index 709d09363b..1ed927813f 100644 --- a/nuget/HarfbuzzSharp.nuspec +++ b/nuget/HarfbuzzSharp.nuspec @@ -60,7 +60,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.NativeAssets.Linux.nuspec b/nuget/SkiaSharp.NativeAssets.Linux.nuspec new file mode 100644 index 0000000000..8a5e62fbec --- /dev/null +++ b/nuget/SkiaSharp.NativeAssets.Linux.nuspec @@ -0,0 +1,45 @@ + + + + + + SkiaSharp.NativeAssets.Linux + SkiaSharp - Native Assets for Linux + 1.0.0 + +SkiaSharp is a cross-platform 2D graphics API for .NET platforms based on Google's Skia Graphics Library. +It provides a comprehensive 2D API that can be used across mobile, server and desktop models to render images. + + +SkiaSharp is a cross-platform 2D graphics API for .NET platforms that can be used across mobile, server and desktop models to render images. + + +Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release notes. + + https://go.microsoft.com/fwlink/?linkid=868515 + https://go.microsoft.com/fwlink/?linkid=868516 + xamarin graphics ios android linux windows uwp tvos watchos macos tizen cross-platform skiasharp + + + https://go.microsoft.com/fwlink/?linkid=868514 + Microsoft + Microsoft + true + © Microsoft Corporation. All rights reserved. + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec index cf3d842377..2817e198d1 100644 --- a/nuget/SkiaSharp.nuspec +++ b/nuget/SkiaSharp.nuspec @@ -67,7 +67,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + From 68ef4ab3b442d4a4b326f6b0d6463f40f7ddae5f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 14 Sep 2018 13:07:30 +0200 Subject: [PATCH 21/35] Added more logging to see what is happening in the package stage --- build.cake | 6 ++++++ scripts/pipeline.groovy | 7 ++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/build.cake b/build.cake index 943d94eb81..51df674179 100644 --- a/build.cake +++ b/build.cake @@ -287,6 +287,12 @@ Task ("nuget") Task ("nuget-only") .Does (() => { + Information("OUTPUT FILES:"); + foreach(var f in GetFiles("./output/**/*")){ + Information(f.FullPath); + } + Information("OUTPUT FILES COMPLETE."); + var platform = ""; if (!PACK_ALL_PLATFORMS) { if (IsRunningOnWindows ()) { diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 3198f535e2..f67bfabe5c 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -1,5 +1,6 @@ import groovy.transform.Field +@Field def verbosity = "normal" @Field def isPr = false @Field def branchName = null @Field def commitHash = null @@ -112,7 +113,7 @@ def createNativeBuilder(platform, host, label, additionalPackages) { if (host == "linux" && platform == "tizen") { pre = "./scripts/install-tizen.sh && " } - bootstrapper("-t externals-${platform} -v minimal", host, pre, additionalPackages) + bootstrapper("-t externals-${platform} -v ${verbosity}", host, pre, additionalPackages) uploadBlobs("native-${platform}_${host}") @@ -146,7 +147,7 @@ def createManagedBuilder(host, label, additionalPackages) { checkout scm downloadBlobs("native-*") - bootstrapper("-t everything -v minimal --skipexternals=all", host, "", additionalPackages) + bootstrapper("-t everything -v ${verbosity} --skipexternals=all", host, "", additionalPackages) step([ $class: "XUnitBuilder", @@ -208,7 +209,7 @@ def createPackagingBuilder(additionalPackages) { checkout scm downloadBlobs("managed-*"); - bootstrapper("-t nuget-only -v minimal", host, "", additionalPackages) + bootstrapper("-t nuget-only -v ${verbosity}", host, "", additionalPackages) uploadBlobs("packing-${host}") From 04552b4fa58e2c7c269a25e397ecc8f634b434b1 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 14 Sep 2018 14:36:59 +0200 Subject: [PATCH 22/35] increase verbosity --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index f67bfabe5c..23b490a8ce 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -1,6 +1,6 @@ import groovy.transform.Field -@Field def verbosity = "normal" +@Field def verbosity = "diagnostic" @Field def isPr = false @Field def branchName = null @Field def commitHash = null From 928a9f4bb0000e715f53d0cec54eb411e8e428d1 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 14 Sep 2018 15:26:38 +0200 Subject: [PATCH 23/35] normal verbosity --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 23b490a8ce..f67bfabe5c 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -1,6 +1,6 @@ import groovy.transform.Field -@Field def verbosity = "diagnostic" +@Field def verbosity = "normal" @Field def isPr = false @Field def branchName = null @Field def commitHash = null From 3c312a82f4f5eef872900f7d919de2b87ec8980f Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 14 Sep 2018 16:08:31 +0200 Subject: [PATCH 24/35] Fixed up the merge --- VERSIONS.txt | 2 +- binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj | 2 +- binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj | 2 +- .../HarfBuzzSharp.NetStandard.csproj | 2 +- binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj | 2 +- binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj | 2 +- binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj | 2 +- binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj | 2 +- binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj | 2 +- binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj | 2 +- binding/SkiaSharp.Android/SkiaSharp.Android.csproj | 2 +- binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj | 2 +- binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj | 2 +- binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj | 2 +- binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj | 2 +- binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj | 2 +- binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj | 2 +- binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj | 2 +- binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj | 2 +- .../SkiaSharp.HarfBuzz.Desktop.csproj | 4 ++-- .../SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj | 2 +- .../SkiaSharp.Views.Forms.Android.csproj | 2 +- .../SkiaSharp.Views.Forms.Mac.csproj | 2 +- .../SkiaSharp.Views.Forms.Tizen.csproj | 2 +- .../SkiaSharp.Views.Forms.UWP.csproj | 2 +- .../SkiaSharp.Views.Forms.iOS.csproj | 2 +- .../SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj | 2 +- .../SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj | 2 +- .../SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj | 2 +- .../SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj | 2 +- .../SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj | 2 +- .../SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj | 2 +- .../SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj | 2 +- .../SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj | 2 +- .../SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj | 2 +- .../SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj | 2 +- .../SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj | 2 +- source/SkiaSharp.Workbooks/SkiaSharp.Workbooks.csproj | 2 +- 38 files changed, 39 insertions(+), 39 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index 7adc86bbd4..e6ff1e5d5b 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -8,7 +8,7 @@ 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 diff --git a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj index fc46e71186..bf98322b31 100644 --- a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj +++ b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj @@ -18,7 +18,7 @@ - + diff --git a/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj b/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj index aa8a35b632..a738450504 100644 --- a/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj +++ b/binding/HarfBuzzSharp.Desktop/HarfBuzzSharp.Desktop.csproj @@ -18,7 +18,7 @@ - + diff --git a/binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj b/binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj index 2f1626332f..556966457c 100644 --- a/binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj +++ b/binding/HarfBuzzSharp.NetStandard/HarfBuzzSharp.NetStandard.csproj @@ -18,7 +18,7 @@ - + diff --git a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj index 2e7b7d79f3..5c09abd58a 100644 --- a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj +++ b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj @@ -20,7 +20,7 @@ - + diff --git a/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj b/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj index 75aac3ddce..9793c603ff 100644 --- a/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj +++ b/binding/HarfBuzzSharp.Tizen/HarfBuzzSharp.Tizen.csproj @@ -18,7 +18,7 @@ pdbonly - + diff --git a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj index 23add0c430..c6bdd0da8a 100644 --- a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj +++ b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj @@ -18,7 +18,7 @@ - + diff --git a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj index bf052840db..6dd1631f8e 100644 --- a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj +++ b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj @@ -20,7 +20,7 @@ - + diff --git a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj index 3b6fe0d313..4b298d89bf 100644 --- a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj +++ b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj @@ -20,7 +20,7 @@ - + diff --git a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj index 9561e6224b..778fbe986e 100644 --- a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj +++ b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj @@ -20,7 +20,7 @@ - + diff --git a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj index 1e78e30d60..07aa0ff1c6 100644 --- a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj +++ b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj @@ -18,7 +18,7 @@ - + diff --git a/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj b/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj index e8771b9cee..3b1f6d1d56 100644 --- a/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj +++ b/binding/SkiaSharp.Desktop/SkiaSharp.Desktop.csproj @@ -18,7 +18,7 @@ - + diff --git a/binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj b/binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj index a743b80c9b..8106f9d889 100644 --- a/binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj +++ b/binding/SkiaSharp.NetStandard/SkiaSharp.NetStandard.csproj @@ -18,7 +18,7 @@ - + diff --git a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj index 9ebea78739..7aa118a125 100644 --- a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj +++ b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj @@ -20,7 +20,7 @@ - + diff --git a/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj b/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj index b65478515a..d65b053d5f 100644 --- a/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj +++ b/binding/SkiaSharp.Tizen/SkiaSharp.Tizen.csproj @@ -19,7 +19,7 @@ pdbonly - + diff --git a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj index e49cdee0ca..12a8a8bd38 100644 --- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj +++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj @@ -18,7 +18,7 @@ - + diff --git a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj index 2d35a80eda..79e3f704fa 100644 --- a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj +++ b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj @@ -20,7 +20,7 @@ - + diff --git a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj index 3fd0fd96eb..9bb71c6175 100644 --- a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj +++ b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj @@ -20,7 +20,7 @@ - + diff --git a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj index 5a1a392a28..90062b8648 100644 --- a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj +++ b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj @@ -20,7 +20,7 @@ - + diff --git a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.Desktop/SkiaSharp.HarfBuzz.Desktop.csproj b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.Desktop/SkiaSharp.HarfBuzz.Desktop.csproj index 6c4fb07d46..d056523979 100644 --- a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.Desktop/SkiaSharp.HarfBuzz.Desktop.csproj +++ b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.Desktop/SkiaSharp.HarfBuzz.Desktop.csproj @@ -10,8 +10,8 @@ $(DefineConstants);__DESKTOP__ - - + + diff --git a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj index d030fac312..4c2714f650 100644 --- a/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj +++ b/source/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz/SkiaSharp.HarfBuzz.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj index fddea7a5a3..9c9b981ee0 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj @@ -12,7 +12,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj index 884e454409..101ba5bc1c 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj @@ -12,7 +12,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj index 3e0b06521c..25d66ac0ec 100755 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Tizen/SkiaSharp.Views.Forms.Tizen.csproj @@ -17,7 +17,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj index f8b8174ea2..023bffeaa9 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj @@ -13,7 +13,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj index 1c8664b8e0..30ed2a90de 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj @@ -12,7 +12,7 @@ - + diff --git a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj index 8019b455c1..5b0fdfa522 100644 --- a/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj +++ b/source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.csproj @@ -13,7 +13,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj index 9d56154b80..b36b5a7e4a 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj index dbcef6284c..836052cd42 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Desktop/SkiaSharp.Views.Desktop.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj index b742d7dd45..4356ca4183 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Gtk/SkiaSharp.Views.Gtk.csproj @@ -25,7 +25,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj index 953b82290b..320c1c0301 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj index 3b6100af2b..7f123070db 100755 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Tizen/SkiaSharp.Views.Tizen.csproj @@ -12,7 +12,7 @@ $(DefineConstants);__TIZEN__; - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj index abcf934979..d85f7a2331 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj index 5f66ee396f..ca30cfd2ce 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj @@ -12,7 +12,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj index 6e83c130d8..b4f5fd1dc0 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj index ff5ce3cd18..cee4968aef 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj index f7a5db031f..eee99a5621 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj @@ -11,7 +11,7 @@ - + diff --git a/source/SkiaSharp.Workbooks/SkiaSharp.Workbooks.csproj b/source/SkiaSharp.Workbooks/SkiaSharp.Workbooks.csproj index e817afea38..b8cea1e205 100644 --- a/source/SkiaSharp.Workbooks/SkiaSharp.Workbooks.csproj +++ b/source/SkiaSharp.Workbooks/SkiaSharp.Workbooks.csproj @@ -11,7 +11,7 @@ xamarin.interactive - + From 2bb5da947d114628f908e05fb0fecb0ada9bbdd9 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 14 Sep 2018 17:20:58 +0200 Subject: [PATCH 25/35] fix the casing --- nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec b/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec index cd31f28495..5df50b5bc7 100644 --- a/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec +++ b/nuget/HarfbuzzSharp.NativeAssets.Linux.nuspec @@ -3,8 +3,8 @@ - HarfbuzzSharp.NativeAssets.Linux - HarfbuzzSharp - Native Assets for Linux + HarfBuzzSharp.NativeAssets.Linux + HarfBuzzSharp - Native Assets for Linux 1.0.0 HarfBuzzSharp is a cross-platform OpenType text shaping engine for .NET platforms. From ab81c0496a7963561f28b1d00000fc398807fe50 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 14 Sep 2018 17:24:16 +0200 Subject: [PATCH 26/35] Make sure to process the native asset nugets --- build.cake | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-) diff --git a/build.cake b/build.cake index 51df674179..ff416ec695 100644 --- a/build.cake +++ b/build.cake @@ -63,11 +63,13 @@ if (string.IsNullOrEmpty (BUILD_NUMBER)) { } var TRACKED_NUGETS = new Dictionary { - { "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" @@ -287,12 +289,6 @@ Task ("nuget") Task ("nuget-only") .Does (() => { - Information("OUTPUT FILES:"); - foreach(var f in GetFiles("./output/**/*")){ - Information(f.FullPath); - } - Information("OUTPUT FILES COMPLETE."); - var platform = ""; if (!PACK_ALL_PLATFORMS) { if (IsRunningOnWindows ()) { From d64b588879814f76e3dc1b7abe014b057a8ec563 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 14 Sep 2018 17:26:42 +0200 Subject: [PATCH 27/35] Add the new nugets to versions.txt --- VERSIONS.txt | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/VERSIONS.txt b/VERSIONS.txt index e6ff1e5d5b..90b4dd734c 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -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 From c8c38d1f60f97f72b637c33713275595a9966dfe Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Fri, 14 Sep 2018 18:16:31 +0200 Subject: [PATCH 28/35] Workaround for https://github.com/mono/api-doc-tools/pull/351 --- scripts/pipeline.groovy | 2 +- source/SkiaSharp.Build.targets | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index f67bfabe5c..fccf83480e 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -1,6 +1,6 @@ import groovy.transform.Field -@Field def verbosity = "normal" +@Field def verbosity = "minimal" @Field def isPr = false @Field def branchName = null @Field def commitHash = null diff --git a/source/SkiaSharp.Build.targets b/source/SkiaSharp.Build.targets index 5b9d4ed07d..2963ca77be 100644 --- a/source/SkiaSharp.Build.targets +++ b/source/SkiaSharp.Build.targets @@ -133,7 +133,7 @@ + Command="$(_ManagedExeLauncher) "$(MDocToolPath)" export-msxdoc --quiet=true "$(MDocDocumentationDirectory)"" /> Date: Fri, 14 Sep 2018 18:57:53 +0200 Subject: [PATCH 29/35] Adding the emoji fonts for linux tests --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index fccf83480e..8676cfa485 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -8,7 +8,7 @@ import groovy.transform.Field @Field def nativeLinuxPackages = "curl mono-devel python git libfontconfig1-dev" @Field def nativeTizenPackages = "curl mono-devel python git openjdk-8-jdk zip libxcb-xfixes0 libxcb-render-util0 libwebkitgtk-1.0-0 libxcb-image0 acl libsdl1.2debian libv4l-0 libxcb-randr0 libxcb-shape0 libxcb-icccm4 libsm6 gettext rpm2cpio cpio bridge-utils openvpn" -@Field def managedLinuxPackages = "curl mono-complete msbuild dotnet-sdk-2.0.0" +@Field def managedLinuxPackages = "curl mono-complete msbuild dotnet-sdk-2.0.0 ttf-ancient-fonts" @Field def customEnv = [ "windows": [ From 10395c429dbc0f9543393f380d768fbec13859a8 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 15 Sep 2018 01:04:00 +0200 Subject: [PATCH 30/35] Added the native nugets to the netcore tests --- tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj | 3 +++ 1 file changed, 3 insertions(+) diff --git a/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj b/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj index 5dc4e178ba..eaeac451a8 100644 --- a/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj +++ b/tests/SkiaSharp.NetCore.Tests/SkiaSharp.NetCore.Tests.csproj @@ -20,6 +20,9 @@ + + + From 14489852635dd258b2cebe72d0df5bd000635c03 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 15 Sep 2018 02:22:35 +0200 Subject: [PATCH 31/35] trying to fix the build --- scripts/pipeline.groovy | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 8676cfa485..4172dfedd2 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -150,7 +150,7 @@ def createManagedBuilder(host, label, additionalPackages) { bootstrapper("-t everything -v ${verbosity} --skipexternals=all", host, "", additionalPackages) step([ - $class: "XUnitBuilder", + $class: "XUnitPublisher", testTimeMargin: "3000", thresholdMode: 1, thresholds: [[ From 30ca0310b4599be53bdf44199d85a10aec09f32b Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 15 Sep 2018 03:32:41 +0200 Subject: [PATCH 32/35] Enable all the builds again --- scripts/pipeline.groovy | 57 +++++++++++++++++++++-------------------- 1 file changed, 29 insertions(+), 28 deletions(-) diff --git a/scripts/pipeline.groovy b/scripts/pipeline.groovy index 4172dfedd2..7707163ca3 100644 --- a/scripts/pipeline.groovy +++ b/scripts/pipeline.groovy @@ -6,9 +6,10 @@ import groovy.transform.Field @Field def commitHash = null @Field def githubStatusSha = null -@Field def nativeLinuxPackages = "curl mono-devel python git libfontconfig1-dev" -@Field def nativeTizenPackages = "curl mono-devel python git openjdk-8-jdk zip libxcb-xfixes0 libxcb-render-util0 libwebkitgtk-1.0-0 libxcb-image0 acl libsdl1.2debian libv4l-0 libxcb-randr0 libxcb-shape0 libxcb-icccm4 libsm6 gettext rpm2cpio cpio bridge-utils openvpn" -@Field def managedLinuxPackages = "curl mono-complete msbuild dotnet-sdk-2.0.0 ttf-ancient-fonts" +@Field def minimalLinuxPackages = "curl mono-complete msbuild" +@Field def nativeLinuxPackages = "python git libfontconfig1-dev" +@Field def nativeTizenPackages = "python git openjdk-8-jdk zip libxcb-xfixes0 libxcb-render-util0 libwebkitgtk-1.0-0 libxcb-image0 acl libsdl1.2debian libv4l-0 libxcb-randr0 libxcb-shape0 libxcb-icccm4 libsm6 gettext rpm2cpio cpio bridge-utils openvpn" +@Field def managedLinuxPackages = "dotnet-sdk-2.0.0 ttf-ancient-fonts" @Field def customEnv = [ "windows": [ @@ -40,45 +41,45 @@ node("ubuntu-1604-amd64") { githubStatusSha = isPr ? env.ghprbActualCommit : commitHash echo "Building SHA1: ${commitHash}..." - echo " - PR: ${isPr}..." - echo " - Branch Name: ${branchName}..." - echo " - GitHub Status SHA1: ${githubStatusSha}..." + echo " - PR: ${isPr}" + echo " - Branch Name: ${branchName}" + echo " - GitHub Status SHA1: ${githubStatusSha}" } } stage("Native Builds") { parallel([ - // // windows - // win32: createNativeBuilder("Windows", "Windows", "components-windows", ""), - // uwp: createNativeBuilder("UWP", "Windows", "components-windows", ""), - // android_windows: createNativeBuilder("Android", "Windows", "components-windows", ""), - // tizen_windows: createNativeBuilder("Tizen", "Windows", "components-windows", ""), - - // // macos - // macos: createNativeBuilder("macOS", "macOS", "components", ""), - // ios: createNativeBuilder("iOS", "macOS", "components", ""), - // tvos: createNativeBuilder("tvOS", "macOS", "components", ""), - // watchos: createNativeBuilder("watchOS", "macOS", "components", ""), - // android_macos: createNativeBuilder("Android", "macOS", "components", ""), - // tizen_macos: createNativeBuilder("Tizen", "macOS", "components", ""), + // windows + win32: createNativeBuilder("Windows", "Windows", "components-windows", ""), + uwp: createNativeBuilder("UWP", "Windows", "components-windows", ""), + android_windows: createNativeBuilder("Android", "Windows", "components-windows", ""), + tizen_windows: createNativeBuilder("Tizen", "Windows", "components-windows", ""), + + // macos + macos: createNativeBuilder("macOS", "macOS", "components", ""), + ios: createNativeBuilder("iOS", "macOS", "components", ""), + tvos: createNativeBuilder("tvOS", "macOS", "components", ""), + watchos: createNativeBuilder("watchOS", "macOS", "components", ""), + android_macos: createNativeBuilder("Android", "macOS", "components", ""), + tizen_macos: createNativeBuilder("Tizen", "macOS", "components", ""), // linux - linux: createNativeBuilder("Linux", "Linux", "ubuntu-1604-amd64", nativeLinuxPackages), - tizen_linux: createNativeBuilder("Tizen", "Linux", "ubuntu-1604-amd64", nativeTizenPackages), + linux: createNativeBuilder("Linux", "Linux", "ubuntu-1604-amd64", nativeLinuxPackages), + tizen_linux: createNativeBuilder("Tizen", "Linux", "ubuntu-1604-amd64", nativeTizenPackages), ]) } stage("Managed Builds") { parallel([ - // windows: createManagedBuilder("Windows", "components-windows", ""), - // macos: createManagedBuilder("macOS", "components", ""), - linux: createManagedBuilder("Linux", "ubuntu-1604-amd64", managedLinuxPackages), + windows: createManagedBuilder("Windows", "components-windows", ""), + macos: createManagedBuilder("macOS", "components", ""), + linux: createManagedBuilder("Linux", "ubuntu-1604-amd64", managedLinuxPackages), ]) } stage("Packaging") { parallel([ - package: createPackagingBuilder(""), + package: createPackagingBuilder(), ]) } @@ -192,7 +193,7 @@ def createManagedBuilder(host, label, additionalPackages) { } } -def createPackagingBuilder(additionalPackages) { +def createPackagingBuilder() { def githubContext = "Packing" def host = "linux" def label = "ubuntu-1604-amd64" @@ -209,7 +210,7 @@ def createPackagingBuilder(additionalPackages) { checkout scm downloadBlobs("managed-*"); - bootstrapper("-t nuget-only -v ${verbosity}", host, "", additionalPackages) + bootstrapper("-t nuget-only -v ${verbosity}", host, "", "") uploadBlobs("packing-${host}") @@ -233,7 +234,7 @@ def bootstrapper(args, host, pre, additionalPackages) { chroot( chrootName: "${env.NODE_LABEL}-stable", command: "bash ${pre} ./bootstrapper.sh ${args}", - additionalPackages: "${additionalPackages}") + additionalPackages: "${minimalLinuxPackages} ${additionalPackages}") } else if (host == "macos") { sh("bash ${pre} ./bootstrapper.sh ${args}") } else if (host == "windows") { From 586d35f3687a35ee8d634b0c8fdf06d572ed8d89 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 15 Sep 2018 17:57:49 +0200 Subject: [PATCH 33/35] Update the UWP signing key --- .../Skia.UWP.Demo_StoreKey.pfx | Bin 2568 -> 0 bytes .../SkiaSharpSample_TemporaryKey.pfx | Bin 0 -> 2528 bytes .../UWP/SkiaSharpSample/SkiaSharpSample.csproj | 4 ++-- .../SkiaSharpSample.UWP.csproj | 4 ++-- .../UWP/SkiaSharpSample/SkiaSharpSample.csproj | 4 ++-- samples/Gallery/Xamarin.Forms/UWP/UWP.csproj | 4 ++-- 6 files changed, 8 insertions(+), 8 deletions(-) delete mode 100644 samples/AppStoreCertificates/Skia.UWP.Demo_StoreKey.pfx create mode 100644 samples/AppStoreCertificates/SkiaSharpSample_TemporaryKey.pfx diff --git a/samples/AppStoreCertificates/Skia.UWP.Demo_StoreKey.pfx b/samples/AppStoreCertificates/Skia.UWP.Demo_StoreKey.pfx deleted file mode 100644 index a026a0baedde606acccbc773bea079e2d261e17a..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 2568 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 diff --git a/samples/AppStoreCertificates/SkiaSharpSample_TemporaryKey.pfx b/samples/AppStoreCertificates/SkiaSharpSample_TemporaryKey.pfx new file mode 100644 index 0000000000000000000000000000000000000000..5f399b756da1407bb4e41bc9472ee071714496db GIT binary patch literal 2528 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 literal 0 HcmV?d00001 diff --git a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj index c117e5f9e2..a58eec2453 100644 --- a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -16,8 +16,8 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\AppStoreCertificates\Skia.UWP.Demo_StoreKey.pfx - A9102DF7FB3501F23B65D59B624A9CB05C065366 + ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx + 8DD3DBEC438E69AF67465BF733A17DBA8397D719 PackageReference diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index ff4f9d1416..306ab73dbc 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -17,8 +17,8 @@ true 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\AppStoreCertificates\Skia.UWP.Demo_StoreKey.pfx - A9102DF7FB3501F23B65D59B624A9CB05C065366 + ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx + 8DD3DBEC438E69AF67465BF733A17DBA8397D719 PackageReference diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj index f26936f5b8..56eccbf2f9 100644 --- a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -16,8 +16,8 @@ 14 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\AppStoreCertificates\Skia.UWP.Demo_StoreKey.pfx - A9102DF7FB3501F23B65D59B624A9CB05C065366 + ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx + 8DD3DBEC438E69AF67465BF733A17DBA8397D719 PackageReference diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj index 6dd994d8a4..5b452e125a 100644 --- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj +++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj @@ -17,8 +17,8 @@ true 512 {A5A43C5B-DE2A-4C0C-9213-0A381AF9435A};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - ..\..\..\AppStoreCertificates\Skia.UWP.Demo_StoreKey.pfx - A9102DF7FB3501F23B65D59B624A9CB05C065366 + ..\..\..\AppStoreCertificates\SkiaSharpSample_TemporaryKey.pfx + 8DD3DBEC438E69AF67465BF733A17DBA8397D719 PackageReference From 9b7fa126a31b66baf05e8d8920cfcc356cf9b47b Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 15 Sep 2018 17:58:17 +0200 Subject: [PATCH 34/35] Remove the old index8 member --- binding/Binding/SKBitmap.cs | 3 ++- binding/Binding/SkiaApi.cs | 2 -- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/binding/Binding/SKBitmap.cs b/binding/Binding/SKBitmap.cs index 9ace2ee06f..9d5a3e7da3 100644 --- a/binding/Binding/SKBitmap.cs +++ b/binding/Binding/SKBitmap.cs @@ -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) diff --git a/binding/Binding/SkiaApi.cs b/binding/Binding/SkiaApi.cs index 06b13597d1..f6b0d1c198 100755 --- a/binding/Binding/SkiaApi.cs +++ b/binding/Binding/SkiaApi.cs @@ -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)] From 122e0892b62b123efdceda18b9d10c5050074463 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Sat, 15 Sep 2018 17:58:49 +0200 Subject: [PATCH 35/35] Make sure the propertyset extensions can be used --- .../SkiaSharpSample/SkiaSharpSample.csproj | 1 + .../SkiaSharpSample.UWP.csproj | 1 + .../SkiaSharpSample/SkiaSharpSample.csproj | 1 + samples/Gallery/Xamarin.Forms/UWP/UWP.csproj | 1 + .../PropertySetExtensions.h | 19 +++++-------------- 5 files changed, 9 insertions(+), 14 deletions(-) diff --git a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj index a58eec2453..e09db9c964 100644 --- a/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Basic/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -106,6 +106,7 @@ + diff --git a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj index 306ab73dbc..c5b79dc4d2 100644 --- a/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj +++ b/samples/Basic/Xamarin.Forms/SkiaSharpSample.UWP/SkiaSharpSample.UWP.csproj @@ -116,6 +116,7 @@ + diff --git a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj index 56eccbf2f9..6a45ed7ffb 100644 --- a/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj +++ b/samples/Gallery/UWP/SkiaSharpSample/SkiaSharpSample.csproj @@ -115,6 +115,7 @@ + diff --git a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj index 5b452e125a..0bccfb9b39 100644 --- a/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj +++ b/samples/Gallery/Xamarin.Forms/UWP/UWP.csproj @@ -125,6 +125,7 @@ + diff --git a/source/SkiaSharp.Views.Interop.UWP/PropertySetExtensions.h b/source/SkiaSharp.Views.Interop.UWP/PropertySetExtensions.h index be73b8da48..146a973ff5 100644 --- a/source/SkiaSharp.Views.Interop.UWP/PropertySetExtensions.h +++ b/source/SkiaSharp.Views.Interop.UWP/PropertySetExtensions.h @@ -4,28 +4,19 @@ #include #if defined(_WIN32) -# if defined(INTEROP_LIBRARY) # define API_EXPORT __declspec(dllexport) -# else -# define API_EXPORT __declspec(dllimport) -# endif #elif defined(__GNUC__) -# if defined(INTEROP_LIBRARY) # define API_EXPORT __attribute__((visibility ("default"))) -# else -# define API_EXPORT -# endif #else -# define API_EXPORT +# define API_EXPORT #endif #ifdef __cplusplus -# define C_PLUS_PLUS_BEGIN_GUARD extern "C" { -# define C_PLUS_PLUS_END_GUARD } +# define C_PLUS_PLUS_BEGIN_GUARD extern "C" { +# define C_PLUS_PLUS_END_GUARD } #else -# include -# define C_PLUS_PLUS_BEGIN_GUARD -# define C_PLUS_PLUS_END_GUARD +# define C_PLUS_PLUS_BEGIN_GUARD +# define C_PLUS_PLUS_END_GUARD #endif #include