From 66ed32a5a087ceda44d2bfae8d1c08776471a1e7 Mon Sep 17 00:00:00 2001 From: Matthew Leibowitz Date: Wed, 27 Jan 2021 06:07:39 +0200 Subject: [PATCH] Build and include all the emscripten version for WASM (#1590) * Build for the most common Emscripten versions * Update MSBuild.Sdk.Extras for .NET 5 * Do not rely on WasmHead to detect WebAssembly (#1550) Co-authored-by: Jerome Laban --- VERSIONS.txt | 2 +- .../HarfBuzzSharp.Android.csproj | 2 +- .../HarfBuzzSharp.OSX.csproj | 2 +- .../HarfBuzzSharp.UWP.csproj | 2 +- .../HarfBuzzSharp.iOS.csproj | 2 +- .../HarfBuzzSharp.tvOS.csproj | 2 +- .../HarfBuzzSharp.watchOS.csproj | 2 +- binding/HarfBuzzSharp/HarfBuzzSharp.csproj | 2 +- .../nuget/build/wasm/HarfBuzzSharp.props | 2 +- .../nuget/build/wasm/HarfBuzzSharp.targets | 4 ++-- .../SkiaSharp.Android.csproj | 2 +- binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj | 2 +- binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj | 2 +- binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj | 2 +- binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj | 2 +- .../SkiaSharp.watchOS.csproj | 2 +- binding/SkiaSharp/SkiaSharp.csproj | 2 +- .../nuget/build/wasm/SkiaSharp.props | 2 +- .../nuget/build/wasm/SkiaSharp.targets | 4 ++-- build.cake | 5 +++++ native/wasm/build.cake | 5 +++++ ...fBuzzSharp.NativeAssets.WebAssembly.nuspec | 2 +- .../SkiaSharp.NativeAssets.WebAssembly.nuspec | 2 +- nuget/SkiaSharp.nuspec | 6 +++--- .../SkiaSharpSample.Wasm.csproj | 4 ++-- .../SkiaSharpSample.Wasm.csproj | 4 ++-- scripts/Docker/wasm/Dockerfile | 3 ++- scripts/Docker/wasm/build-local.sh | 7 ++++++- scripts/azure-pipelines.yml | 17 +++++++++------- scripts/azure-templates-wasm-matrix.yml | 20 +++++++++++++++++++ .../SkiaSharp.Views.Forms.Android.csproj | 2 +- .../SkiaSharp.Views.Forms.Mac.csproj | 2 +- .../SkiaSharp.Views.Forms.UWP.csproj | 2 +- .../SkiaSharp.Views.Forms.iOS.csproj | 2 +- .../SkiaSharp.Views.Uno.Android.csproj | 2 +- .../SkiaSharp.Views.Uno.Mac.csproj | 2 +- .../SkiaSharp.Views.Uno.iOS.csproj | 2 +- .../SkiaSharp.Views.Android.csproj | 2 +- .../SkiaSharp.Views.Mac.csproj | 2 +- .../SkiaSharp.Views.UWP.csproj | 2 +- .../SkiaSharp.Views.iOS.csproj | 2 +- .../SkiaSharp.Views.tvOS.csproj | 2 +- .../SkiaSharp.Views.watchOS.csproj | 2 +- .../SkiaSharp.Wasm.Tests.csproj | 8 ++++---- .../wasm/NativeLibraryMiniTest.csproj | 7 ++++--- 45 files changed, 99 insertions(+), 59 deletions(-) create mode 100644 scripts/azure-templates-wasm-matrix.yml diff --git a/VERSIONS.txt b/VERSIONS.txt index d1724ef54..4be6006b3 100644 --- a/VERSIONS.txt +++ b/VERSIONS.txt @@ -11,7 +11,7 @@ Tizen.NET release 4.0.0 Tizen.NET.Sdk release 1.0.9 OpenTK release 3.1.0 OpenTK.GLControl release 3.1.0 -MSBuild.Sdk.Extras release 2.1.2 +MSBuild.Sdk.Extras release 3.0.23 Cake release 0.38.4 GtkSharp release 3.22.24.37 GdkSharp release 3.22.24.37 diff --git a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj index 6ecbda955..2311a147b 100644 --- a/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj +++ b/binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj @@ -1,4 +1,4 @@ - + monoandroid9.0 HarfBuzzSharp diff --git a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj index b6cf5de70..599017805 100644 --- a/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj +++ b/binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj @@ -1,4 +1,4 @@ - + xamarinmac2.0 HarfBuzzSharp diff --git a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj index 83f448a26..e7a1a287b 100644 --- a/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj +++ b/binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj @@ -1,4 +1,4 @@ - + uap10.0.10240;uap10.0.16299 HarfBuzzSharp diff --git a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj index edd0fb329..2e9931ceb 100644 --- a/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj +++ b/binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj @@ -1,4 +1,4 @@ - + xamarinios1.0 HarfBuzzSharp diff --git a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj index ab8535013..589947710 100644 --- a/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj +++ b/binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj @@ -1,4 +1,4 @@ - + xamarintvos1.0 HarfBuzzSharp diff --git a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj index f2e37eaec..22ed006cc 100644 --- a/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj +++ b/binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj @@ -1,4 +1,4 @@ - + xamarinwatchos1.0 HarfBuzzSharp diff --git a/binding/HarfBuzzSharp/HarfBuzzSharp.csproj b/binding/HarfBuzzSharp/HarfBuzzSharp.csproj index e764a6089..5f09b45d1 100644 --- a/binding/HarfBuzzSharp/HarfBuzzSharp.csproj +++ b/binding/HarfBuzzSharp/HarfBuzzSharp.csproj @@ -48,7 +48,7 @@ - + diff --git a/binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.props b/binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.props index 2dcffe92d..013ef410d 100644 --- a/binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.props +++ b/binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.props @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.targets b/binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.targets index 3cb6592ee..568a9bd14 100644 --- a/binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.targets +++ b/binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.targets @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj index 294e02254..f2623cd7f 100644 --- a/binding/SkiaSharp.Android/SkiaSharp.Android.csproj +++ b/binding/SkiaSharp.Android/SkiaSharp.Android.csproj @@ -1,4 +1,4 @@ - + monoandroid9.0 SkiaSharp diff --git a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj index 23eff7091..38be41b89 100644 --- a/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj +++ b/binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj @@ -1,4 +1,4 @@ - + xamarinmac2.0 SkiaSharp diff --git a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj index 42046f6a2..338b2a736 100644 --- a/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj +++ b/binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj @@ -1,4 +1,4 @@ - + uap10.0.10240;uap10.0.16299 SkiaSharp diff --git a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj index a39f271a4..503d6f9f6 100644 --- a/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj +++ b/binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj @@ -1,4 +1,4 @@ - + xamarinios1.0 SkiaSharp diff --git a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj index 5f0346e3e..63fd4ecd2 100644 --- a/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj +++ b/binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj @@ -1,4 +1,4 @@ - + xamarintvos1.0 SkiaSharp diff --git a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj index 4f00adf43..04929d737 100644 --- a/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj +++ b/binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj @@ -1,4 +1,4 @@ - + xamarinwatchos1.0 SkiaSharp diff --git a/binding/SkiaSharp/SkiaSharp.csproj b/binding/SkiaSharp/SkiaSharp.csproj index 25fe8d192..1ccae6524 100644 --- a/binding/SkiaSharp/SkiaSharp.csproj +++ b/binding/SkiaSharp/SkiaSharp.csproj @@ -47,7 +47,7 @@ - + diff --git a/binding/SkiaSharp/nuget/build/wasm/SkiaSharp.props b/binding/SkiaSharp/nuget/build/wasm/SkiaSharp.props index f7bc2b8b0..d28906c9b 100644 --- a/binding/SkiaSharp/nuget/build/wasm/SkiaSharp.props +++ b/binding/SkiaSharp/nuget/build/wasm/SkiaSharp.props @@ -12,7 +12,7 @@ - + \ No newline at end of file diff --git a/binding/SkiaSharp/nuget/build/wasm/SkiaSharp.targets b/binding/SkiaSharp/nuget/build/wasm/SkiaSharp.targets index 87111aae1..b47153896 100644 --- a/binding/SkiaSharp/nuget/build/wasm/SkiaSharp.targets +++ b/binding/SkiaSharp/nuget/build/wasm/SkiaSharp.targets @@ -1,8 +1,8 @@ - - + + \ No newline at end of file diff --git a/build.cake b/build.cake index e7dd72401..6c289a0cc 100644 --- a/build.cake +++ b/build.cake @@ -425,6 +425,11 @@ Task ("nuget") if (string.IsNullOrEmpty (file.Attribute ("target")?.Value)) { file.Add (new XAttribute ("target", file.Attribute ("src").Value)); } + // make sure all the paths have the correct slash + if (IsRunningOnWindows ()) { + file.Attribute ("src").Value = file.Attribute ("src").Value.Replace ("/", "\\"); + file.Attribute ("target").Value = file.Attribute ("target").Value.Replace ("/", "\\"); + } } } diff --git a/native/wasm/build.cake b/native/wasm/build.cake index 562374ff3..8e299e019 100644 --- a/native/wasm/build.cake +++ b/native/wasm/build.cake @@ -4,6 +4,7 @@ DirectoryPath OUTPUT_PATH = MakeAbsolute(ROOT_PATH.Combine("output/native")); #load "../../cake/native-shared.cake" string SUPPORT_GPU_VAR = Argument("supportGpu", EnvironmentVariable("SUPPORT_GPU") ?? "true").ToLower(); +string EMSCRIPTEN_VERSION = Argument("emscriptenVersion", EnvironmentVariable("EMSCRIPTEN_VERSION") ?? "").ToLower(); bool SUPPORT_GPU = SUPPORT_GPU_VAR == "1" || SUPPORT_GPU_VAR == "true"; string CC = Argument("cc", "emcc"); @@ -80,6 +81,8 @@ Task("libSkiaSharp") RunProcess(AR, $"-crs {a} {string.Join(" ", oFiles)}"); var outDir = OUTPUT_PATH.Combine($"wasm"); + if (!string.IsNullOrEmpty(EMSCRIPTEN_VERSION)) + outDir = outDir.Combine("libSkiaSharp.a").Combine(EMSCRIPTEN_VERSION); EnsureDirectoryExists(outDir); CopyFileToDirectory(a, outDir); }); @@ -97,6 +100,8 @@ Task("libHarfBuzzSharp") ADDITIONAL_GN_ARGS); var outDir = OUTPUT_PATH.Combine($"wasm"); + if (!string.IsNullOrEmpty(EMSCRIPTEN_VERSION)) + outDir = outDir.Combine("libHarfBuzzSharp.a").Combine(EMSCRIPTEN_VERSION); EnsureDirectoryExists(outDir); var so = SKIA_PATH.CombineWithFilePath($"out/wasm/libHarfBuzzSharp.a"); CopyFileToDirectory(so, outDir); diff --git a/nuget/HarfBuzzSharp.NativeAssets.WebAssembly.nuspec b/nuget/HarfBuzzSharp.NativeAssets.WebAssembly.nuspec index 27b72ce58..1c13399b8 100644 --- a/nuget/HarfBuzzSharp.NativeAssets.WebAssembly.nuspec +++ b/nuget/HarfBuzzSharp.NativeAssets.WebAssembly.nuspec @@ -36,7 +36,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.NativeAssets.WebAssembly.nuspec b/nuget/SkiaSharp.NativeAssets.WebAssembly.nuspec index 46cc1b34c..2b9a0fb3b 100644 --- a/nuget/SkiaSharp.NativeAssets.WebAssembly.nuspec +++ b/nuget/SkiaSharp.NativeAssets.WebAssembly.nuspec @@ -37,7 +37,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + diff --git a/nuget/SkiaSharp.nuspec b/nuget/SkiaSharp.nuspec index 4bafe75ab..e617b2885 100644 --- a/nuget/SkiaSharp.nuspec +++ b/nuget/SkiaSharp.nuspec @@ -133,11 +133,11 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release - + - + - + diff --git a/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj index 1ba8f81ac..1522a446e 100644 --- a/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj +++ b/samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj @@ -25,8 +25,8 @@ - - + + diff --git a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj index 2b0118da3..f42fa4f44 100644 --- a/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj +++ b/samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj @@ -26,8 +26,8 @@ - - + + diff --git a/scripts/Docker/wasm/Dockerfile b/scripts/Docker/wasm/Dockerfile index 868aa1031..aa6a937b8 100644 --- a/scripts/Docker/wasm/Dockerfile +++ b/scripts/Docker/wasm/Dockerfile @@ -1,6 +1,7 @@ FROM mcr.microsoft.com/dotnet/core/sdk:3.1.201-bionic -ARG EMSCRIPTEN_VERSION=1.40.0 +# default value, but should be provided depending on app +ARG EMSCRIPTEN_VERSION=2.0.11 RUN apt-get update \ && apt-get install -y apt-transport-https curl wget python python3 git make \ diff --git a/scripts/Docker/wasm/build-local.sh b/scripts/Docker/wasm/build-local.sh index 79ff70a0f..1856ed51a 100644 --- a/scripts/Docker/wasm/build-local.sh +++ b/scripts/Docker/wasm/build-local.sh @@ -3,5 +3,10 @@ set -e DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" -(cd $DIR && docker build --tag skiasharp-wasm .) +VERSION_ARGS="" +if [ "$1" ]; then + VERSION_ARGS="--build-arg EMSCRIPTEN_VERSION=$1" +fi + +(cd $DIR && docker build --tag skiasharp-wasm $VERSION_ARGS .) (cd $DIR/../../../ && docker run --rm --name skiasharp-wasm --volume $(pwd):/work skiasharp-wasm /bin/bash ./bootstrapper.sh -t externals-wasm) diff --git a/scripts/azure-pipelines.yml b/scripts/azure-pipelines.yml index d76148202..7430ace22 100644 --- a/scripts/azure-pipelines.yml +++ b/scripts/azure-pipelines.yml @@ -33,7 +33,7 @@ variables: THROW_ON_TEST_FAILURE: true NUGET_DIFF_PRERELEASE: false ENABLE_CODE_COVERAGE: true - EMSCRIPTEN_VERSION: 1.40.0 + EMSCRIPTEN_VERSION: 2.0.12 resources: repositories: @@ -297,13 +297,16 @@ stages: displayName: Native WASM dependsOn: prepare jobs: - - template: azure-templates-bootstrapper.yml # Build Native WASM (Linux) + - template: azure-templates-wasm-matrix.yml # Build Native WASM (Linux) parameters: - name: native_wasm_linux - displayName: WASM - vmImage: $(VM_IMAGE_LINUX) - docker: scripts/Docker/wasm - target: externals-wasm + emscripten: + - 1.39.11 + - 1.40.0 + - 2.0.5 + - 2.0.6 + - 2.0.9 + - 2.0.11 + - 2.0.12 - stage: managed displayName: Build Managed diff --git a/scripts/azure-templates-wasm-matrix.yml b/scripts/azure-templates-wasm-matrix.yml new file mode 100644 index 000000000..89ceb851a --- /dev/null +++ b/scripts/azure-templates-wasm-matrix.yml @@ -0,0 +1,20 @@ +parameters: + emscripten: [ ] + +jobs: + - ${{ each version in parameters.emscripten }}: + - template: azure-templates-bootstrapper.yml + parameters: + name: native_wasm_${{ replace(version, '.', '_') }}_linux + displayName: WASM (${{ version }}) + vmImage: $(VM_IMAGE_LINUX) + docker: scripts/Docker/wasm + target: externals-wasm + dockerArgs: --build-arg EMSCRIPTEN_VERSION=${{ version }} + additionalArgs: --emscriptenVersion=${{ version }} + postBuildSteps: + - task: PublishBuildArtifacts@1 + displayName: Publish the native_wasm_linux artifacts + inputs: + artifactName: native_wasm_linux + pathToPublish: 'output' \ No newline at end of file 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 955e7b88b..ad7cc5729 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 @@ -1,4 +1,4 @@ - + monoandroid9.0 SkiaSharp.Views.Forms 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 950142411..2aeb77edc 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 @@ -1,4 +1,4 @@ - + xamarinmac2.0 SkiaSharp.Views.Forms 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 26c9a2661..da45efe5f 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 @@ -1,4 +1,4 @@ - + uap10.0.16299 SkiaSharp.Views.Forms 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 97d873db4..0d4e73e3c 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 @@ -1,4 +1,4 @@ - + xamarinios1.0 SkiaSharp.Views.Forms diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj index 24a61664c..fdd3e2862 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj @@ -1,4 +1,4 @@ - + monoandroid9.0 SkiaSharp.Views.UWP diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj index 2d9f5ef6c..76a809c71 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj @@ -1,4 +1,4 @@ - + xamarinmac2.0 SkiaSharp.Views.UWP diff --git a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj index 6821d6bc3..b0801b753 100644 --- a/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj +++ b/source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj @@ -1,4 +1,4 @@ - + xamarinios1.0 SkiaSharp.Views.UWP 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 c4fdc008e..e97c29105 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj @@ -1,4 +1,4 @@ - + monoandroid9.0 SkiaSharp.Views.Android 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 a802b8bae..a26d88971 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj @@ -1,4 +1,4 @@ - + xamarinmac2.0 SkiaSharp.Views.Mac 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 f751ba5eb..8c8917ed3 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj @@ -1,4 +1,4 @@ - + uap10.0.10240 SkiaSharp.Views.UWP 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 2942a196a..7bbe624e9 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj @@ -1,4 +1,4 @@ - + xamarinios1.0 SkiaSharp.Views.iOS 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 aa88db751..157a5a49f 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj @@ -1,4 +1,4 @@ - + xamarintvos1.0 SkiaSharp.Views.tvOS 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 9393a5b01..143e42f59 100644 --- a/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj +++ b/source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj @@ -1,4 +1,4 @@ - + xamarinwatchos1.0 SkiaSharp.Views.watchOS diff --git a/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj b/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj index 2cd004ebe..98e77b522 100644 --- a/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj +++ b/tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj @@ -12,13 +12,13 @@ - - + + - - + + diff --git a/utils/NativeLibraryMiniTest/wasm/NativeLibraryMiniTest.csproj b/utils/NativeLibraryMiniTest/wasm/NativeLibraryMiniTest.csproj index 3d2619bae..d2c38523f 100644 --- a/utils/NativeLibraryMiniTest/wasm/NativeLibraryMiniTest.csproj +++ b/utils/NativeLibraryMiniTest/wasm/NativeLibraryMiniTest.csproj @@ -10,13 +10,14 @@ - - + + - + +