Skip to content

[wasm] WBT: Update expected blazor tfm to net8.0 to match the latest sdk #80241

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

Merged
merged 6 commits into from
Jan 6, 2023
Merged

[wasm] WBT: Update expected blazor tfm to net8.0 to match the latest sdk #80241

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
a09be09
[wasm] WBT: Update expected blazor tfm to net8.0 to match the latest sdk
radical Jan 5, 2023
554a26a
[wasm] WBT: Re-enable BlazorRunTest. Fixes #79514
radical Jan 5, 2023
492c576
[wasm] WBT: re-enable running a blazor test
radical Jan 5, 2023
02b4661
[wasm] WBT: Use -O1 for some blazor tests
radical Jan 5, 2023
d6b99e5
Add -O1 for NativeBuild_WithDeployOnBuild_UsedByVS
radical Jan 5, 2023
06b6b6b
Fix test
radical Jan 5, 2023
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
14 changes: 7 additions & 7 deletions src/mono/wasm/Wasm.Build.Tests/Blazor/BuildPublishTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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}";
Expand Down Expand Up @@ -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)
{
Expand Down
16 changes: 13 additions & 3 deletions src/mono/wasm/Wasm.Build.Tests/Blazor/MiscTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 : "<RunAOTCompilation>true</RunAOTCompilation>");
string extraProperties = config == "Debug"
? ("<EmccLinkOptimizationFlag>-O1</EmccLinkOptimizationFlag>" +
"<EmccCompileOptimizationFlag>-O1</EmccCompileOptimizationFlag>")
: string.Empty;
if (!nativeRelink)
extraProperties += "<RunAOTCompilation>true</RunAOTCompilation>";
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");
Expand Down Expand Up @@ -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: "<RunAOTCompilation>true</RunAOTCompilation>");

string extraProperties = config == "Debug"
? ("<EmccLinkOptimizationFlag>-O1</EmccLinkOptimizationFlag>" +
"<EmccCompileOptimizationFlag>-O1</EmccCompileOptimizationFlag>")
: string.Empty;
AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>" + extraProperties);

// No relinking, no AOT
BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
Expand Down
15 changes: 11 additions & 4 deletions src/mono/wasm/Wasm.Build.Tests/Blazor/NativeRefTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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: "<RunAOTCompilation>true</RunAOTCompilation>");
string extraProperties = config == "Debug"
? ("<EmccLinkOptimizationFlag>-O1</EmccLinkOptimizationFlag>" +
"<EmccCompileOptimizationFlag>-O1</EmccCompileOptimizationFlag>")
: string.Empty;
AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>" + extraProperties);

BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));

Expand All @@ -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"
? ("<EmccLinkOptimizationFlag>-O1</EmccLinkOptimizationFlag>" +
"<EmccCompileOptimizationFlag>-O1</EmccCompileOptimizationFlag>")
: string.Empty;
AddItemsPropertiesToProject(projectFile, extraProperties: extraProperties);

BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));

Expand Down
2 changes: 1 addition & 1 deletion src/mono/wasm/Wasm.Build.Tests/BuildTestBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ namespace Wasm.Build.Tests
public abstract class BuildTestBase : IClassFixture<SharedBuildPerTestClassFixture>, IDisposable
{
public const string DefaultTargetFramework = "net8.0";
public const string DefaultTargetFrameworkForBlazor = "net7.0";
public const string DefaultTargetFrameworkForBlazor = "net8.0";
Comment on lines 31 to +32
Copy link
Member

@maraf maraf Jan 6, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are leaving these two as separate for net9.0 cycle, right?

protected static readonly bool s_skipProjectCleanup;
protected static readonly string s_xharnessRunnerCommand;
protected string? _projectDir;
Expand Down
1 change: 0 additions & 1 deletion src/mono/wasm/Wasm.Build.Tests/WasmTemplateTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down