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
radical 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 1 commit
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
Prev Previous commit
Next Next commit
[wasm] WBT: Use -O1 for some blazor tests
  • Loading branch information
@radical
radical committed Jan 5, 2023
commit 02b4661375fe8e9c0bb406d8f273c0b1a1fa039d
8 changes: 6 additions & 2 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,7 +22,6 @@ 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()}";
Expand Down Expand Up @@ -67,7 +66,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