Skip to content

Commit 4190eb9

Browse files
authored
Merge pull request #952 from unoplatform/dev/jela/satellite
fix(res): Fix invalid loading of satellite assemblies with WasmShellLoadAllSatelliteResources
2 parents 107ec06 + 2fdf51f commit 4190eb9

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

src/Uno.Wasm.Bootstrap/ts/Uno/WebAssembly/Bootstrapper.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ namespace Uno.WebAssembly.Bootstrap {
102102
preRun: () => bootstrapper.wasmRuntimePreRun(),
103103
})
104104
.withRuntimeOptions(config.config.uno_runtime_options)
105-
.withConfig({ loadAllSatelliteResources: config.config.uno_loadAllSatelliteResources });
105+
.withConfig({ loadAllSatelliteResources: config.config.uno_load_all_satellite_resources });
106106

107107
const dotnetRuntime = await m.default(
108108
(context: DotnetPublicAPI) => {

src/Uno.Wasm.StaticLinking.Shared/Common.props

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,12 @@
88

99
<WasmShellNativeCompile Include="$(MSBuildThisFileDirectory)test.cpp" />
1010
<WasmShellNativeCompile Include="$(MSBuildThisFileDirectory)test2.cpp" />
11+
1112
</ItemGroup>
1213

1314
<PropertyGroup>
1415
<WasmShellEnableIDBFS>true</WasmShellEnableIDBFS>
16+
<WasmShellLoadAllSatelliteResources>true</WasmShellLoadAllSatelliteResources>
1517
</PropertyGroup>
1618

1719
<ItemGroup>

src/Uno.Wasm.StaticLinking.Shared/Program.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ static void Main()
9696

9797
var satelliteValidation =
9898
s1 == "Cannot find definition for {0}. Service Description with namespace {1} is missing."
99-
// TODO JELA
100-
// && s2 == "Impossible de localiser une définition pour {0}. Description du service manquante avec l'espace de noms {1}."
99+
&& s2 == "Impossible de localiser une définition pour {0}. Description du service manquante avec l'espace de noms {1}."
101100
;
102101

103102
var res = $"{runtimeMode};" +

0 commit comments

Comments
 (0)