Visitar URL original
[browser] Fix fingerprinting and loadAllSatelliteResources=true (#108… · sirntar/runtime@c20f025 · GitHub
Skip to content

Commit c20f025

Browse files
marafsirntar
authored andcommitted
[browser] Fix fingerprinting and loadAllSatelliteResources=true (dotnet#108190)
1 parent c3983bd commit c20f025

4 files changed

Lines changed: 20 additions & 8 deletions

File tree

‎src/mono/browser/runtime/loader/assets.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,12 +375,12 @@ export function prepareAssets () {
375375
if (config.loadAllSatelliteResources && resources.satelliteResources) {
376376
for (const culture in resources.satelliteResources) {
377377
for (const name in resources.satelliteResources[culture]) {
378-
assetsToLoad.push({
378+
addAsset({
379379
name,
380380
hash: resources.satelliteResources[culture][name],
381381
behavior: "resource",
382382
culture
383-
});
383+
}, !resources.coreAssembly);
384384
}
385385
}
386386
}

‎src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,19 @@ public SatelliteLoadingTests(ITestOutputHelper output, SharedBuildPerTestClassFi
2424
{
2525
}
2626

27-
[Fact, TestCategory("no-fingerprinting")]
28-
public async Task LoadSatelliteAssembly()
27+
[Theory, TestCategory("no-fingerprinting")]
28+
[InlineData(false)]
29+
[InlineData(true)]
30+
public async Task LoadSatelliteAssembly(bool loadAllSatelliteResources)
2931
{
3032
CopyTestAsset("WasmBasicTestApp", "SatelliteLoadingTests", "App");
3133
BuildProject("Debug");
3234

33-
var result = await RunSdkStyleAppForBuild(new(Configuration: "Debug", TestScenario: "SatelliteAssembliesTest"));
35+
var result = await RunSdkStyleAppForBuild(new(
36+
Configuration: "Debug",
37+
TestScenario: "SatelliteAssembliesTest",
38+
BrowserQueryString: new Dictionary<string, string> { ["loadAllSatelliteResources"] = loadAllSatelliteResources.ToString() }
39+
));
3440
Assert.Collection(
3541
result.TestOutput,
3642
m => Assert.Equal("default: hello", m),

‎src/mono/wasm/testassets/WasmBasicTestApp/App/SatelliteAssembliesTest.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,12 @@
88
public partial class SatelliteAssembliesTest
99
{
1010
[JSExport]
11-
public static async Task Run()
11+
public static async Task Run(bool loadSatelliteAssemblies)
1212
{
1313
ResourceLibrary.ResourceAccessor.Read(TestOutput.WriteLine, false);
1414

15-
await LoadSatelliteAssemblies(new[] { "es-ES" });
15+
if (loadSatelliteAssemblies)
16+
await LoadSatelliteAssemblies(new[] { "es-ES" });
1617

1718
ResourceLibrary.ResourceAccessor.Read(TestOutput.WriteLine, true);
1819
}

‎src/mono/wasm/testassets/WasmBasicTestApp/App/wwwroot/main.js‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,11 @@ dotnet
2828

2929
// Modify runtime start based on test case
3030
switch (testCase) {
31+
case "SatelliteAssembliesTest":
32+
if (params.get("loadAllSatelliteResources") === "true") {
33+
dotnet.withConfig({ loadAllSatelliteResources: true });
34+
}
35+
break;
3136
case "AppSettingsTest":
3237
dotnet.withApplicationEnvironment(params.get("applicationEnvironment"));
3338
break;
@@ -141,7 +146,7 @@ const assemblyExtension = Object.keys(config.resources.coreAssembly)[0].endsWith
141146
try {
142147
switch (testCase) {
143148
case "SatelliteAssembliesTest":
144-
await exports.SatelliteAssembliesTest.Run();
149+
await exports.SatelliteAssembliesTest.Run(params.get("loadAllSatelliteResources") !== "true");
145150
exit(0);
146151
break;
147152
case "LazyLoadingTest":

0 commit comments

Comments
 (0)