From 4ca077cd70de7774a4f5a5b7d63b3a4cdff02046 Mon Sep 17 00:00:00 2001
From: Dan Walmsley <dan@walms.co.uk>
Date: Mon, 26 Sep 2022 21:07:00 +0100
Subject: [PATCH] non hard coded path for interop.js

---
 src/Web/Avalonia.Web.Sample/Avalonia.Web.Sample.csproj   | 4 ++--
 src/Web/Avalonia.Web/Avalonia.Web.props                  | 7 +++++++
 src/Web/{Avalonia.Web.Sample => Avalonia.Web}/interop.js | 0
 3 files changed, 9 insertions(+), 2 deletions(-)
 create mode 100644 src/Web/Avalonia.Web/Avalonia.Web.props
 rename src/Web/{Avalonia.Web.Sample => Avalonia.Web}/interop.js (100%)

diff --git a/src/Web/Avalonia.Web.Sample/Avalonia.Web.Sample.csproj b/src/Web/Avalonia.Web.Sample/Avalonia.Web.Sample.csproj
index df254df55b..cb681930c9 100644
--- a/src/Web/Avalonia.Web.Sample/Avalonia.Web.Sample.csproj
+++ b/src/Web/Avalonia.Web.Sample/Avalonia.Web.Sample.csproj
@@ -8,7 +8,6 @@
     <MSBuildEnableWorkloadResolver>true</MSBuildEnableWorkloadResolver>
     <WasmBuildNative>true</WasmBuildNative>
     <EmccFlags>-sVERBOSE -sERROR_ON_UNDEFINED_SYMBOLS=0</EmccFlags>
-    <EmccExtraLDFlags>--js-library="C:\Users\User\repos\Avalonia\src\Web\Avalonia.Web.Sample\interop.js"</EmccExtraLDFlags>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
@@ -34,6 +33,7 @@
     <NativeFileReference Include="C:\Users\User\.nuget\packages\harfbuzzsharp.nativeassets.webassembly\2.8.2.1-preview.108\build\netstandard1.0\libHarfBuzzSharp.a\3.1.7\libHarfBuzzSharp.a" />
     <NativeFileReference Include="C:\Users\User\.nuget\packages\skiasharp.nativeassets.webassembly\2.88.1\build\netstandard1.0\libSkiaSharp.a\3.1.7\libSkiaSharp.a" />
   </ItemGroup>
-  
+
+  <Import Project="..\Avalonia.Web\Avalonia.Web.props" />
   <Import Project="..\Avalonia.Web\Avalonia.Web.targets" />
 </Project>
diff --git a/src/Web/Avalonia.Web/Avalonia.Web.props b/src/Web/Avalonia.Web/Avalonia.Web.props
new file mode 100644
index 0000000000..ae2c19ecc7
--- /dev/null
+++ b/src/Web/Avalonia.Web/Avalonia.Web.props
@@ -0,0 +1,7 @@
+<Project>
+  <UsingTask TaskName="WasmAppBuilder" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
+  <UsingTask TaskName="WasmLoadAssembliesAndReferences" AssemblyFile="$(WasmAppBuilderTasksAssemblyPath)" />
+  <PropertyGroup>
+    <EmccExtraLDFlags>$(EmccExtraLDFlags) --js-library="$(MSBuildThisFileDirectory)\interop.js"</EmccExtraLDFlags>
+  </PropertyGroup>
+</Project>
diff --git a/src/Web/Avalonia.Web.Sample/interop.js b/src/Web/Avalonia.Web/interop.js
similarity index 100%
rename from src/Web/Avalonia.Web.Sample/interop.js
rename to src/Web/Avalonia.Web/interop.js