mono
/
SkiaSharp
зеркало из https://github.com/mono/SkiaSharp.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

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 <jerome.laban@nventive.com>
This commit is contained in:
Matthew Leibowitz 2021-01-27 06:07:39 +02:00 коммит произвёл GitHub
Родитель 2e5c9c4f62
Коммит 66ed32a5a0
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
45 изменённых файлов: 99 добавлений и 59 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

2
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

2
binding/HarfBuzzSharp.Android/HarfBuzzSharp.Android.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>monoandroid9.0</TargetFramework>
<RootNamespace>HarfBuzzSharp</RootNamespace>

2
binding/HarfBuzzSharp.OSX/HarfBuzzSharp.OSX.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinmac2.0</TargetFramework>
<RootNamespace>HarfBuzzSharp</RootNamespace>

2
binding/HarfBuzzSharp.UWP/HarfBuzzSharp.UWP.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFrameworks>uap10.0.10240;uap10.0.16299</TargetFrameworks>
<RootNamespace>HarfBuzzSharp</RootNamespace>

2
binding/HarfBuzzSharp.iOS/HarfBuzzSharp.iOS.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinios1.0</TargetFramework>
<RootNamespace>HarfBuzzSharp</RootNamespace>

2
binding/HarfBuzzSharp.tvOS/HarfBuzzSharp.tvOS.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarintvos1.0</TargetFramework>
<RootNamespace>HarfBuzzSharp</RootNamespace>

2
binding/HarfBuzzSharp.watchOS/HarfBuzzSharp.watchOS.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinwatchos1.0</TargetFramework>
<RootNamespace>HarfBuzzSharp</RootNamespace>

2
binding/HarfBuzzSharp/HarfBuzzSharp.csproj
Просмотреть файл

@ -48,7 +48,7 @@
<None Include="..\..\output\native\alpinenodeps\arm64\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm64\native\%(Filename)%(Extension)" />
<None Include="..\..\output\native\alpinenodeps\arm\libHarfBuzzSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm\native\%(Filename)%(Extension)" />
<!-- WASM -->
<None Include="..\..\output\native\wasm\libHarfBuzzSharp*" Link="nuget\build\wasm\%(Filename)%(Extension)" />
<None Include="..\..\output\native\wasm\**\*.a" Link="nuget\build\wasm\%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="nuget\build\wasm\HarfBuzzSharp.props" Link="nuget\build\wasm\HarfBuzzSharp.props" />
<None Include="nuget\build\wasm\HarfBuzzSharp.targets" Link="nuget\build\wasm\HarfBuzzSharp.targets" />
</ItemGroup>

2
binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.props
Просмотреть файл

@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<HarfBuzzSharpStaticLibrary Include="$(HarfBuzzSharpStaticLibraryPath)" />
<HarfBuzzSharpStaticLibrary Include="$(HarfBuzzSharpStaticLibraryPath)\*\*.a" />
</ItemGroup>
</Project>

4
binding/HarfBuzzSharp/nuget/build/wasm/HarfBuzzSharp.targets
Просмотреть файл

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition="'$(IsUnoHead)' == 'True' and '$(WasmHead)' == 'True'">
<Content Include="$(HarfBuzzSharpStaticLibraryPath)" Visible="false" />
<ItemGroup Condition="'$(IsUnoHead)' == 'True' and '$(UnoRuntimeIdentifier)' == 'WebAssembly'">
<Content Include="@(HarfBuzzSharpStaticLibrary)" Visible="false" />
</ItemGroup>
</Project>

2
binding/SkiaSharp.Android/SkiaSharp.Android.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>monoandroid9.0</TargetFramework>
<RootNamespace>SkiaSharp</RootNamespace>

2
binding/SkiaSharp.OSX/SkiaSharp.OSX.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinmac2.0</TargetFramework>
<RootNamespace>SkiaSharp</RootNamespace>

2
binding/SkiaSharp.UWP/SkiaSharp.UWP.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFrameworks>uap10.0.10240;uap10.0.16299</TargetFrameworks>
<RootNamespace>SkiaSharp</RootNamespace>

2
binding/SkiaSharp.iOS/SkiaSharp.iOS.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinios1.0</TargetFramework>
<RootNamespace>SkiaSharp</RootNamespace>

2
binding/SkiaSharp.tvOS/SkiaSharp.tvOS.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarintvos1.0</TargetFramework>
<RootNamespace>SkiaSharp</RootNamespace>

2
binding/SkiaSharp.watchOS/SkiaSharp.watchOS.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinwatchos1.0</TargetFramework>
<RootNamespace>SkiaSharp</RootNamespace>

2
binding/SkiaSharp/SkiaSharp.csproj
Просмотреть файл

@ -47,7 +47,7 @@
<None Include="..\..\output\native\alpinenodeps\arm64\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm64\native\%(Filename)%(Extension)" />
<None Include="..\..\output\native\alpinenodeps\arm\libSkiaSharp*" Link="nuget\runtimes\linuxnodeps-musl-arm\native\%(Filename)%(Extension)" />
<!-- WASM -->
<None Include="..\..\output\native\wasm\libSkiaSharp*" Link="nuget\build\wasm\%(Filename)%(Extension)" />
<None Include="..\..\output\native\wasm\**\*.a" Link="nuget\build\wasm\%(RecursiveDir)%(Filename)%(Extension)" />
<None Include="nuget\build\wasm\SkiaSharp.props" Link="nuget\build\wasm\SkiaSharp.props" />
<None Include="nuget\build\wasm\SkiaSharp.targets" Link="nuget\build\wasm\SkiaSharp.targets" />
</ItemGroup>

2
binding/SkiaSharp/nuget/build/wasm/SkiaSharp.props
Просмотреть файл

@ -12,7 +12,7 @@
</PropertyGroup>
<ItemGroup>
<SkiaSharpStaticLibrary Include="$(SkiaSharpStaticLibraryPath)" />
<SkiaSharpStaticLibrary Include="$(SkiaSharpStaticLibraryPath)\*\*.a" />
</ItemGroup>
</Project>

4
binding/SkiaSharp/nuget/build/wasm/SkiaSharp.targets
Просмотреть файл

@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup Condition="'$(IsUnoHead)' == 'True' and '$(WasmHead)' == 'True'">
<Content Include="$(SkiaSharpStaticLibraryPath)" Visible="false" />
<ItemGroup Condition="'$(IsUnoHead)' == 'True' and '$(UnoRuntimeIdentifier)' == 'WebAssembly'">
<Content Include="@(SkiaSharpStaticLibrary)" Visible="false" />
</ItemGroup>
</Project>

5
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 ("/", "\\");
}
}
}

5
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);

2
nuget/HarfBuzzSharp.NativeAssets.WebAssembly.nuspec
Просмотреть файл

@ -36,7 +36,7 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file src="build/wasm/HarfBuzzSharp.targets" target="buildTransitive/netstandard1.0/HarfBuzzSharp.NativeAssets.WebAssembly.targets" />
<!-- libHarfBuzzSharp.a and other native files -->
<file src="build/wasm/libHarfBuzzSharp.a" target="build/netstandard1.0/libHarfBuzzSharp.a" />
<file src="build/wasm/libHarfBuzzSharp.a/**/*" target="build/netstandard1.0/libHarfBuzzSharp.a" />
<!-- placeholders -->
<file src="_._" target="lib/netstandard1.0/_._" />

2
nuget/SkiaSharp.NativeAssets.WebAssembly.nuspec
Просмотреть файл

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

6
nuget/SkiaSharp.nuspec
Просмотреть файл

@ -133,11 +133,11 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
<file platform="macos,windows" src="build/monoandroid1.0/arm/libSkiaSharp.so" />
<file platform="macos,windows" src="build/monoandroid1.0/arm64/libSkiaSharp.so" />
<!-- ios -->
<file platform="macos" src="build/xamarinios1.0/libSkiaSharp.framework/" target="/" />
<file platform="macos" src="build/xamarinios1.0/libSkiaSharp.framework/**/*" target="build/xamarinios1.0/libSkiaSharp.framework" />
<!-- tvos -->
<file platform="macos" src="build/xamarintvos1.0/libSkiaSharp.framework/" target="/" />
<file platform="macos" src="build/xamarintvos1.0/libSkiaSharp.framework/**/*" target="build/xamarintvos1.0/libSkiaSharp.framework" />
<!-- watchos -->
<file platform="macos" src="build/xamarinwatchos1.0/libSkiaSharp.framework/" target="/" />
<file platform="macos" src="build/xamarinwatchos1.0/libSkiaSharp.framework/**/*" target="build/xamarinwatchos1.0/libSkiaSharp.framework" />
<!-- legal -->
<file src="LICENSE.txt" />

4
samples/Basic/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj
Просмотреть файл

@ -25,8 +25,8 @@
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.UI.WebAssembly" Version="3.0.12" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.12" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.52" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.52" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="2.0.0-dev.148" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.0.0-dev.148" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

4
samples/Gallery/Uno/SkiaSharpSample.Wasm/SkiaSharpSample.Wasm.csproj
Просмотреть файл

@ -26,8 +26,8 @@
<PackageReference Include="Microsoft.Extensions.Logging.Filter" Version="1.1.1" />
<PackageReference Include="Uno.UI.WebAssembly" Version="3.0.12" />
<PackageReference Include="Uno.UI.RemoteControl" Version="3.0.12" Condition="'$(Configuration)'=='Debug'" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.52" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.52" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="2.0.0-dev.148" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.0.0-dev.148" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\binding\SkiaSharp\SkiaSharp.csproj" />

3
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 \

7
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)

17
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

20
scripts/azure-templates-wasm-matrix.yml Normal file
Просмотреть файл

@ -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'

2
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Android/SkiaSharp.Views.Forms.Android.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>monoandroid9.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.Forms</RootNamespace>

2
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.Mac/SkiaSharp.Views.Forms.Mac.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinmac2.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.Forms</RootNamespace>

2
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.UWP/SkiaSharp.Views.Forms.UWP.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>uap10.0.16299</TargetFramework>
<RootNamespace>SkiaSharp.Views.Forms</RootNamespace>

2
source/SkiaSharp.Views.Forms/SkiaSharp.Views.Forms.iOS/SkiaSharp.Views.Forms.iOS.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinios1.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.Forms</RootNamespace>

2
source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Android/SkiaSharp.Views.Uno.Android.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>monoandroid9.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.UWP</RootNamespace>

2
source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.Mac/SkiaSharp.Views.Uno.Mac.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinmac2.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.UWP</RootNamespace>

2
source/SkiaSharp.Views.Uno/SkiaSharp.Views.Uno.iOS/SkiaSharp.Views.Uno.iOS.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinios1.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.UWP</RootNamespace>

2
source/SkiaSharp.Views/SkiaSharp.Views.Android/SkiaSharp.Views.Android.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>monoandroid9.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.Android</RootNamespace>

2
source/SkiaSharp.Views/SkiaSharp.Views.Mac/SkiaSharp.Views.Mac.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinmac2.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.Mac</RootNamespace>

2
source/SkiaSharp.Views/SkiaSharp.Views.UWP/SkiaSharp.Views.UWP.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>uap10.0.10240</TargetFramework>
<RootNamespace>SkiaSharp.Views.UWP</RootNamespace>

2
source/SkiaSharp.Views/SkiaSharp.Views.iOS/SkiaSharp.Views.iOS.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinios1.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.iOS</RootNamespace>

2
source/SkiaSharp.Views/SkiaSharp.Views.tvOS/SkiaSharp.Views.tvOS.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarintvos1.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.tvOS</RootNamespace>

2
source/SkiaSharp.Views/SkiaSharp.Views.watchOS/SkiaSharp.Views.watchOS.csproj
Просмотреть файл

@ -1,4 +1,4 @@
<Project Sdk="MSBuild.Sdk.Extras/2.1.2">
<Project Sdk="MSBuild.Sdk.Extras/3.0.23">
<PropertyGroup>
<TargetFramework>xamarinwatchos1.0</TargetFramework>
<RootNamespace>SkiaSharp.Views.watchOS</RootNamespace>

8
tests/SkiaSharp.Wasm.Tests/SkiaSharp.Wasm.Tests.csproj
Просмотреть файл

@ -12,13 +12,13 @@
</PropertyGroup>
<ItemGroup>
<WasmShellExtraEmccFlags Include="-s ASSERTIONS=1" />
<Content Include="..\..\output\native\wasm\libSkiaSharp.a" Visible="false" />
<Content Include="..\..\output\native\wasm\libHarfBuzzSharp.a" Visible="false" />
<Content Include="..\..\output\native\wasm\libSkiaSharp.a\*\*.a" Visible="false" />
<Content Include="..\..\output\native\wasm\libHarfBuzzSharp.a\*\*.a" Visible="false" />
<LinkerDescriptor Include="LinkerConfig.xml" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.52" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.52" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="2.0.0-dev.148" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.0.0-dev.148" />
<PackageReference Include="xunit" Version="2.4.1" />
<PackageReference Include="xunit.extensibility.core" Version="2.4.1" />
<PackageReference Include="xunit.runner.utility" Version="2.4.1" />

7
utils/NativeLibraryMiniTest/wasm/NativeLibraryMiniTest.csproj
Просмотреть файл

@ -10,13 +10,14 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Uno.Wasm.Bootstrap" Version="1.4.0-dev.52" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="1.4.0-dev.52" />
<PackageReference Include="Uno.Wasm.Bootstrap" Version="2.0.0-dev.148" />
<PackageReference Include="Uno.Wasm.Bootstrap.DevServer" Version="2.0.0-dev.148" />
</ItemGroup>
<ItemGroup>
<Compile Include="..\source\*.cs" />
<Content Include="..\..\..\output\native\wasm\*.a" />
<Content Include="..\..\..\output\native\wasm\libSkiaSharp.a\*\*.a" Visible="false" />
<Content Include="..\..\..\output\native\wasm\libHarfBuzzSharp.a\*\*.a" Visible="false" />
</ItemGroup>
<Target Name="CleanThings" BeforeTargets="BuildDist">