Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/dotnet/runtime.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJérôme Laban <jlaban@gmail.com>2022-05-10 12:49:22 +0300
committerGitHub <noreply@github.com>2022-05-10 12:49:22 +0300
commit91ca9c4c0e16ac16479aa178c8869d47ea8c13e0 (patch)
treeb92a310d666c1f26c22b12e0f94038fec7e5b202 /src/mono/wasm/runtime
parent6762f54b4193dcf5103f3c03e7ebd0ef95578c54 (diff)
fix(wasm): Discriminate satellite assemblies loading based on culture (#68195)
* fix(wasm): Discriminate satellite assemblies loading based on culture * add `--fetch-random-delay` test parameter * enable emscripten ASSERTIONS=1 on SatelliteAssembliesTests.ResourcesFromMainAssembly Co-authored-by: pavelsavara <pavel.savara@gmail.com>
Diffstat (limited to 'src/mono/wasm/runtime')
-rw-r--r--src/mono/wasm/runtime/startup.ts5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/mono/wasm/runtime/startup.ts b/src/mono/wasm/runtime/startup.ts
index a8f3b7ce85b..c183e882391 100644
--- a/src/mono/wasm/runtime/startup.ts
+++ b/src/mono/wasm/runtime/startup.ts
@@ -490,7 +490,8 @@ async function mono_download_assets(config: MonoConfig | MonoConfigError | undef
});
}
- Module.addRunDependency(asset.name);
+ const moduleDependencyId = asset.name + (asset.culture || "");
+ Module.addRunDependency(moduleDependencyId);
const sourcesList = asset.load_remote ? config.remote_sources! : [""];
let error = undefined;
@@ -561,7 +562,7 @@ async function mono_download_assets(config: MonoConfig | MonoConfigError | undef
if (!isOkToFail)
throw error;
}
- Module.removeRunDependency(asset.name);
+ Module.removeRunDependency(moduleDependencyId);
return result;
};