diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs
index 12d5c4b14cf099..3b670a42aa07f7 100644
--- a/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs
@@ -84,7 +84,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config)
[Theory]
[InlineData("Debug")]
[InlineData("Release")]
- public void WithDllImportInMainAssembly(string config)
+ public async Task WithDllImportInMainAssembly(string config)
{
// Based on https://github.com/dotnet/runtime/issues/59255
string id = $"blz_dllimp_{config}";
@@ -124,12 +124,12 @@ public static class MyDllImports
BlazorPublish(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
CheckNativeFileLinked(forPublish: true);
- // [ActiveIssue("https://github.com/dotnet/runtime/issues/79514")]
- //await BlazorRun(config, async (page) => {
- //await page.Locator("text=\"cpp_add\"").ClickAsync();
- //var txt = await page.Locator("p[role='test']").InnerHTMLAsync();
- //Assert.Equal("Output: 22", txt);
- //});
+ await BlazorRun(config, async (page) =>
+ {
+ await page.Locator("text=\"cpp_add\"").ClickAsync();
+ var txt = await page.Locator("p[role='test']").InnerHTMLAsync();
+ Assert.Equal("Output: 22", txt);
+ });
void CheckNativeFileLinked(bool forPublish)
{
diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs
index 71640acd2a4608..2d65479379d4da 100644
--- a/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs
@@ -22,12 +22,17 @@ public MiscTests(ITestOutputHelper output, SharedBuildPerTestClassFixture buildC
[InlineData("Debug", false)]
[InlineData("Release", true)]
[InlineData("Release", false)]
- //[ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRelink)
{
string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}";
string projectFile = CreateProjectWithNativeReference(id);
- AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "true");
+ string extraProperties = config == "Debug"
+ ? ("-O1" +
+ "-O1")
+ : string.Empty;
+ if (!nativeRelink)
+ extraProperties += "true";
+ AddItemsPropertiesToProject(projectFile, extraProperties: extraProperties);
// build with -p:DeployOnBuild=true, and that will trigger a publish
(CommandResult res, _) = BuildInternal(id, config, publish: false, setWasmDevel: false, "-p:DeployOnBuild=true");
@@ -67,7 +72,12 @@ public void DefaultTemplate_AOT_InProjectFile(string config)
{
string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}";
string projectFile = CreateBlazorWasmTemplateProject(id);
- AddItemsPropertiesToProject(projectFile, extraProperties: "true");
+
+ string extraProperties = config == "Debug"
+ ? ("-O1" +
+ "-O1")
+ : string.Empty;
+ AddItemsPropertiesToProject(projectFile, extraProperties: "true" + extraProperties);
// No relinking, no AOT
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
diff --git a/src/mono/wasm/Wasm.Build.Tests/Blazor/NativeRefTests.cs b/src/mono/wasm/Wasm.Build.Tests/Blazor/NativeRefTests.cs
index 5c6b5456109459..7fa5eb2475e43e 100644
--- a/src/mono/wasm/Wasm.Build.Tests/Blazor/NativeRefTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/Blazor/NativeRefTests.cs
@@ -20,12 +20,15 @@ public NativeRefTests(ITestOutputHelper output, SharedBuildPerTestClassFixture b
[Theory]
[InlineData("Debug")]
[InlineData("Release")]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
public void WithNativeReference_AOTInProjectFile(string config)
{
string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
string projectFile = CreateProjectWithNativeReference(id);
- AddItemsPropertiesToProject(projectFile, extraProperties: "true");
+ string extraProperties = config == "Debug"
+ ? ("-O1" +
+ "-O1")
+ : string.Empty;
+ AddItemsPropertiesToProject(projectFile, extraProperties: "true" + extraProperties);
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
@@ -38,11 +41,15 @@ public void WithNativeReference_AOTInProjectFile(string config)
[Theory]
[InlineData("Debug")]
[InlineData("Release")]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
public void WithNativeReference_AOTOnCommandLine(string config)
{
string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
- CreateProjectWithNativeReference(id);
+ string projectFile = CreateProjectWithNativeReference(id);
+ string extraProperties = config == "Debug"
+ ? ("-O1" +
+ "-O1")
+ : string.Empty;
+ AddItemsPropertiesToProject(projectFile, extraProperties: extraProperties);
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
diff --git a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
index c6ce15afd831bd..da06061a47aa35 100644
--- a/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
@@ -29,7 +29,7 @@ namespace Wasm.Build.Tests
public abstract class BuildTestBase : IClassFixture, IDisposable
{
public const string DefaultTargetFramework = "net8.0";
- public const string DefaultTargetFrameworkForBlazor = "net7.0";
+ public const string DefaultTargetFrameworkForBlazor = "net8.0";
protected static readonly bool s_skipProjectCleanup;
protected static readonly string s_xharnessRunnerCommand;
protected string? _projectDir;
diff --git a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs
index e1c0398e056e00..4507dddd1ff511 100644
--- a/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs
+++ b/src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs
@@ -416,7 +416,6 @@ public void ConsolePublishAndRun(string config, bool aot, bool relinking)
}
[ConditionalFact(typeof(BuildTestBase), nameof(IsUsingWorkloads))]
- [ActiveIssue("https://github.com/dotnet/runtime/issues/79514")]
public async Task BlazorRunTest()
{
string config = "Debug";