Merge pull request #910 from unoplatform/mergify/bp/release/stable/9.…

…0/pr-909 Native references adjustements (backport #909)
unoplatform · Oct 26, 2024 · ad639b3 · ad639b3
2 parents 616b298 + 354225c
commit ad639b3
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 3 deletions.
diff --git a/doc/features-idbfs.md b/doc/features-idbfs.md
@@ -0,0 +1,22 @@
+---
+uid: UnoWasmBootstrap.Features.idbfs
+---
+
+# Support for IDBFS
+
+In order to support emulated filesystem using [IDBFS](https://emscripten.org/docs/api_reference/Filesystem-API.html#filesystem-api-idbfs), add the following to your `.csproj`:
+
+```xml
+<PropertyGroup>
+  <WasmShellEnableIDBFS>true</WasmShellEnableIDBFS>
+</PropertyGroup>
+```
+
+Note that this property is a shortcut to this equivalent configuration:
+
+```xml
+<ItemGroup>
+    <WasmShellExtraEmccFlags Include="-lidbfs.js" />
+    <WasmShellEmccExportedRuntimeMethod Include="IDBFS" />
+</ItemGroup>
+```
diff --git a/doc/toc.yml b/doc/toc.yml
@@ -28,6 +28,8 @@ items:
       href: features-threading.md
     - name: Deep linking (routing)
       href: features-deep-linking.md
+    - name: IDBFS Support
+      href: features-idbfs.md
     - name: Pre-compression
       href: features-pre-compression.md
     - name: Embedded mode

diff --git a/doc/using-the-bootstrapper.md b/doc/using-the-bootstrapper.md
@@ -104,6 +104,12 @@ By default, the .NET runtime does not load all resource assemblies, but if you w
 </PropertyGroup>
 ```
 
+### IDBFS
+
+In version 8.x and earlier of the bootstrapper, IDBFS support was enabled by default.
+
+Moving the .NET 9, the default interpreter runtime does not enable it by default. Read this documentation in order to [restore IDBFS support](xref:UnoWasmBootstrap.Features.idbfs).
+
 ### Interop
 
 - `Module.mono_bind_static_method` is not available anymore, you'll need to use `Module.getAssemblyExports` instead.

diff --git a/src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets b/src/Uno.Wasm.Bootstrap/build/Uno.Wasm.Bootstrap.targets
@@ -149,6 +149,10 @@
 			BeforeTargets="ResolveStaticWebAssetsConfiguration">
 
 		<ItemGroup>
+			<!-- IDBFS support -->
+			<WasmShellExtraEmccFlags Condition=" '$(WasmShellEnableIDBFS)' == 'true' " Include="-lidbfs.js" />
+			<WasmShellEmccExportedRuntimeMethod Condition=" '$(WasmShellEnableIDBFS)' == 'true' " Include="IDBFS" />
+
 			<!-- PInvoke compat -->
 			<_WasmPInvokeModules Include="__Native" />
 			<_WasmPInvokeModules Include="__Internal" />
@@ -316,6 +320,16 @@
 			<WasmAotProfilePath>$([System.IO.Path]::GetFullPath($(_FilteredAotProfile)))</WasmAotProfilePath>
 		</PropertyGroup>
 
+		<PropertyGroup>
+
+			<!-- if we found native references, let's enable wasm native build as well -->
+			<WasmBuildNative Condition=" 
+				$(WasmBuildNative) == ''
+				AND @(NativeFileReference->Count()) > 0"
+				>true</WasmBuildNative>
+
+		</PropertyGroup>
+
 	</Target>
 
 	<Target Name="GenerateUnoWasmAssets"

diff --git a/src/Uno.Wasm.StaticLinking.Shared/Common.props b/src/Uno.Wasm.StaticLinking.Shared/Common.props
@@ -6,19 +6,20 @@
 		<WasmShellNativeCompile Include="$(MSBuildThisFileDirectory)test2.cpp" />
 	</ItemGroup>
 
+	<PropertyGroup>
+		<WasmShellEnableIDBFS>true</WasmShellEnableIDBFS>
+	</PropertyGroup>
+
 	<ItemGroup>
 		<PackageReference Include="System.Web.Services.Description" Version="4.10.0" />
 	</ItemGroup>
 	<ItemGroup>
 		<WasmShellEmccExportedRuntimeMethod Include="GL" />
-		<WasmShellEmccExportedRuntimeMethod Include="IDBFS" />
 		<WasmShellEmccExportedRuntimeMethod Include="FS" />
 
 		<!-- Based on https://github.com/dotnet/runtime/issues/76077#issuecomment-1260231545 -->
 		<WasmShellExtraEmccFlags Include="-s LEGACY_GL_EMULATION=1" />
 		<WasmShellExtraEmccFlags Include="-s USE_CLOSURE_COMPILER=1" />
-
-		<WasmShellExtraEmccFlags Include="-lidbfs.js" />
 	</ItemGroup>
 
 	<ItemGroup Condition="'$(UseAOT)'=='true'">