From 6dd74a3b8308d6f81d3fa46948bcc6df892dfa75 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Wed, 1 Dec 2021 11:21:59 +0000
Subject: [PATCH] make avalonia.skia pull in wasm native assets.

---
 build/HarfBuzzSharp.props                            | 1 +
 build/SkiaSharp.props                                | 1 +
 samples/ControlCatalog.Web/ControlCatalog.Web.csproj | 7 +------
 src/Skia/Avalonia.Skia/Avalonia.Skia.csproj          | 1 +
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/build/HarfBuzzSharp.props b/build/HarfBuzzSharp.props
index ffe2c62c9d..1346a1dafc 100644
--- a/build/HarfBuzzSharp.props
+++ b/build/HarfBuzzSharp.props
@@ -2,5 +2,6 @@
   <ItemGroup>
     <PackageReference Include="HarfBuzzSharp" Version="2.8.2-preview.171" />
     <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.Linux" Version="2.8.2-preview.171" />
+    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="2.8.2-preview.171"/>
   </ItemGroup>
 </Project>
diff --git a/build/SkiaSharp.props b/build/SkiaSharp.props
index 4aa803141b..4a75a18290 100644
--- a/build/SkiaSharp.props
+++ b/build/SkiaSharp.props
@@ -2,5 +2,6 @@
   <ItemGroup>
     <PackageReference Include="SkiaSharp" Version="2.88.0-preview.171" />
     <PackageReference Condition="'$(IncludeLinuxSkia)' == 'true'" Include="SkiaSharp.NativeAssets.Linux" Version="2.88.0-preview.171" />
+    <PackageReference Condition="'$(IncludeWasmSkia)' == 'true'" Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.0-preview.171"/>
   </ItemGroup>
 </Project>
diff --git a/samples/ControlCatalog.Web/ControlCatalog.Web.csproj b/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
index 8d82239f4f..96936f3000 100644
--- a/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
+++ b/samples/ControlCatalog.Web/ControlCatalog.Web.csproj
@@ -24,16 +24,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="HarfBuzzSharp.NativeAssets.WebAssembly" Version="2.8.2-preview.171"/>
-    <PackageReference Include="SkiaSharp.NativeAssets.WebAssembly" Version="2.88.0-preview.171"/>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.0"/>
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.0" PrivateAssets="all"/>
   </ItemGroup>
 
-  <ItemGroup>
-    <NativeFileReference Include="$(HarfBuzzSharpStaticLibraryPath)\2.0.23\libHarfBuzzSharp.a"/>
-    <NativeFileReference Include="$(SkiaSharpStaticLibraryPath)\2.0.23\libSkiaSharp.a"/>
-  </ItemGroup>
+  <Import Project="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.targets" />
 
   <ItemGroup>
     <ProjectReference Include="..\..\src\Web\Avalonia.Web.Blazor\Avalonia.Web.Blazor.csproj"/>
diff --git a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
index ac029f1062..49311ae1f0 100644
--- a/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
+++ b/src/Skia/Avalonia.Skia/Avalonia.Skia.csproj
@@ -5,6 +5,7 @@
     <AssemblyName>Avalonia.Skia</AssemblyName>
     <PackageId>Avalonia.Skia</PackageId>
     <IncludeLinuxSkia>true</IncludeLinuxSkia>
+    <IncludeWasmSkia>true</IncludeWasmSkia>
     <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
   </PropertyGroup>
   <ItemGroup>