Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[release/9.0] [browser] Fix fingerprinting and loadAllSatelliteResources=true #108198

Merged
merged 5 commits into from
Sep 25, 2024
Merged

[release/9.0] [browser] Fix fingerprinting and loadAllSatelliteResources=true #108198

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
d6a1dbd
Set virtualPath for resource show loaded with loadAllSatelliteResourc…
maraf Sep 24, 2024
3a20c0b
WBT using loadAllSatelliteResources=true
maraf Sep 24, 2024
7cd0a5b
Fix passing parameter to test added in #108190
maraf Sep 24, 2024
65bb592
Update expected test outputs
maraf Sep 24, 2024
f041e33
Merge branch 'release/9.0' into backport/pr-108190-to-release/9.0
jeffschwMSFT Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/mono/browser/runtime/loader/assets.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -375,12 +375,12 @@ export function prepareAssets () {
if (config.loadAllSatelliteResources && resources.satelliteResources) {
for (const culture in resources.satelliteResources) {
for (const name in resources.satelliteResources[culture]) {
assetsToLoad.push({
addAsset({
name,
hash: resources.satelliteResources[culture][name],
behavior: "resource",
culture
});
}, !resources.coreAssembly);
}
}
}
Expand Down
12 changes: 9 additions & 3 deletions src/mono/wasm/Wasm.Build.Tests/TestAppScenarios/SatelliteLoadingTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,19 @@ public SatelliteLoadingTests(ITestOutputHelper output, SharedBuildPerTestClassFi
{
}

[Fact, TestCategory("no-fingerprinting")]
public async Task LoadSatelliteAssembly()
[Theory, TestCategory("no-fingerprinting")]
[InlineData(false)]
[InlineData(true)]
public async Task LoadSatelliteAssembly(bool loadAllSatelliteResources)
{
CopyTestAsset("WasmBasicTestApp", "SatelliteLoadingTests", "App");
BuildProject("Debug");

var result = await RunSdkStyleAppForBuild(new(Configuration: "Debug", TestScenario: "SatelliteAssembliesTest"));
var result = await RunSdkStyleAppForBuild(new(
Configuration: "Debug",
TestScenario: "SatelliteAssembliesTest",
BrowserQueryString: new Dictionary<string, string> { ["loadAllSatelliteResources"] = loadAllSatelliteResources.ToString().ToLowerInvariant() }
));
Assert.Collection(
result.TestOutput,
m => Assert.Equal("default: hello", m),
Expand Down
5 changes: 3 additions & 2 deletions src/mono/wasm/testassets/WasmBasicTestApp/App/SatelliteAssembliesTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,12 @@
public partial class SatelliteAssembliesTest
{
[JSExport]
public static async Task Run()
public static async Task Run(bool loadSatelliteAssemblies)
{
ResourceLibrary.ResourceAccessor.Read(TestOutput.WriteLine, false);

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

ResourceLibrary.ResourceAccessor.Read(TestOutput.WriteLine, true);
}
Expand Down
7 changes: 6 additions & 1 deletion src/mono/wasm/testassets/WasmBasicTestApp/App/wwwroot/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,11 @@ dotnet

// Modify runtime start based on test case
switch (testCase) {
case "SatelliteAssembliesTest":
if (params.get("loadAllSatelliteResources") === "true") {
dotnet.withConfig({ loadAllSatelliteResources: true });
}
break;
case "AppSettingsTest":
dotnet.withApplicationEnvironment(params.get("applicationEnvironment"));
break;
Expand Down Expand Up @@ -132,7 +137,7 @@ const assemblyExtension = Object.keys(config.resources.coreAssembly)[0].endsWith
try {
switch (testCase) {
case "SatelliteAssembliesTest":
await exports.SatelliteAssembliesTest.Run();
await exports.SatelliteAssembliesTest.Run(params.get("loadAllSatelliteResources") !== "true");
exit(0);
break;
case "LazyLoadingTest":
Expand Down
Loading