[browser] Clean up Wasm.Build.Tests

eng/testing/scenarios/BuildWasmAppsJobsList.txt

@@ -46,5 +46,4 @@ Wasm.Build.Tests.WasmTemplateTests
 Wasm.Build.Tests.WorkloadTests
 Wasm.Build.Tests.MT.Blazor.SimpleMultiThreadedTests
 Wasm.Build.Tests.DebugLevelTests
-Wasm.Build.Tests.FingerprintingTests
 Wasm.Build.Tests.PreloadingTests

src/mono/wasm/Wasm.Build.Tests/Blazor/AppsettingsTests.cs

@@ -20,11 +20,10 @@ public AppsettingsTests(ITestOutputHelper output, SharedBuildPerTestClassFixture
     }
 
     [Fact]
-    [ActiveIssue("https://github.com/dotnet/aspnetcore/issues/60536")]
     public async Task FileInVfs()
     {
         Configuration config = Configuration.Debug;
-        ProjectInfo info = CreateWasmTemplateProject(Template.BlazorWasm, config, aot: false, "blazor", extraProperties: "<OverrideHtmlAssetPlaceholders>true</OverrideHtmlAssetPlaceholders>");
+        ProjectInfo info = CreateWasmTemplateProject(Template.BlazorWasm, config, aot: false, "blazor");
         UpdateHomePage();
         string projectDirectory = Path.GetDirectoryName(info.ProjectFilePath)!;
         File.WriteAllText(Path.Combine(projectDirectory, "wwwroot", "appsettings.json"), $"{{ \"Id\": \"{info.ProjectName}\" }}");

src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs

@@ -98,23 +98,4 @@ public void BugRegression_60479_WithRazorClassLib()
 
         Assert.Contains(bootJson.resources.lazyAssembly.Keys, f => f.StartsWith(razorClassLibraryName));
     }
-
-
-    [Fact]
-    public async Task TestOverrideHtmlAssetPlaceholders()
-    {
-        var config = Configuration.Release;
-        string extraProperties = "<OverrideHtmlAssetPlaceholders>true</OverrideHtmlAssetPlaceholders>";
-        ProjectInfo info = CopyTestAsset(config, aot: false, TestAsset.BlazorBasicTestApp, "blz_import_map_html", extraProperties: extraProperties);
-        UpdateFile(Path.Combine("wwwroot", "index.html"), new Dictionary<string, string> {
-            { """<base href="/" />""", """<script type="importmap"></script> <base href="/" />""" }
-        });
-
-        BuildProject(info, config);
-        BrowserRunOptions runOptions = new(config, TestScenario: "DotnetRun");
-        await RunForBuildWithDotnetRun(runOptions);
-
-        PublishProject(info, config, new PublishOptions(UseCache: false));
-        await RunForPublishWithWebServer(runOptions);
-    }
 }

src/mono/wasm/Wasm.Build.Tests/BrowserStructures/AssertBundleOptions.cs

@@ -15,5 +15,5 @@ public record AssertBundleOptions(
     bool ExpectSymbolsFile = true,
     bool AssertIcuAssets = true,
     bool AssertSymbolsFile = true,
-    bool? ExpectDotnetJsFingerprinting = false
+    bool? ExpectDotnetJsFingerprinting = null
 );

src/mono/wasm/Wasm.Build.Tests/PreloadingTests.cs

@@ -22,17 +22,16 @@ public PreloadingTests(ITestOutputHelper output, SharedBuildPerTestClassFixture
     [InlineData(false, true)]
     [InlineData(true, false)]
     [InlineData(true, true)]
-    public void PreloadAssets(bool isPublish, bool fingerprintAssets)
+    public void PreloadAssets(bool isPublish, bool fingerprintDotnetJs)
     {
         Configuration config = Configuration.Debug;
         ProjectInfo info = CopyTestAsset(config, aot: false, TestAsset.WasmBasicTestApp, "PreloadAssets");
 
-        // TODO: AssertAppBundle doesn't with fingerprinted dotnet.js at the moment
-        string extraMSBuildArgs = $"-p:OverrideHtmlAssetPlaceholders=true -p:WasmFingerprintAssets={fingerprintAssets}";
+        string extraMSBuildArgs = $"-p:WasmFingerprintDotnetJs={fingerprintDotnetJs}";
         if (isPublish)
-            PublishProject(info, config, new PublishOptions(ExtraMSBuildArgs: extraMSBuildArgs, AssertAppBundle: false));
+            PublishProject(info, config, new PublishOptions(ExtraMSBuildArgs: extraMSBuildArgs), wasmFingerprintDotnetJs: fingerprintDotnetJs);
         else
-            BuildProject(info, config, new BuildOptions(ExtraMSBuildArgs: extraMSBuildArgs, AssertAppBundle: false));
+            BuildProject(info, config, new BuildOptions(ExtraMSBuildArgs: extraMSBuildArgs), wasmFingerprintDotnetJs: fingerprintDotnetJs);
 
         string? indexHtmlPath = null;
         if (isPublish)
@@ -52,7 +51,7 @@ public void PreloadAssets(bool isPublish, bool fingerprintAssets)
         Assert.True(File.Exists(indexHtmlPath));
         string indexHtmlContent = File.ReadAllText(indexHtmlPath);
 
-        if (fingerprintAssets)
+        if (fingerprintDotnetJs)
         {
             // Expect to find fingerprinted preload
             Assert.Contains("<link href=\"_framework/dotnet", indexHtmlContent);

src/mono/wasm/Wasm.Build.Tests/WasmSdkBasedProjectProvider.cs

@@ -40,9 +40,12 @@ protected override IReadOnlyDictionary<string, bool> GetAllKnownDotnetFilesToFin
             { "dotnet.diagnostics.js.map", false },
         };
 
-        if (assertOptions.BuildOptions.BootConfigFileName?.EndsWith(".js") ?? false)
+        if ((assertOptions.BuildOptions.BootConfigFileName?.EndsWith(".js")) ?? false)
             result[assertOptions.BuildOptions.BootConfigFileName] = true;
 
+        if (assertOptions.ExpectDotnetJsFingerprinting == false)
+            result["dotnet.js"] = false;
+
         return result;
     }