Skip to content

[wasm] Wasm.Build.Tests improvements#76381

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 14 commits into from
Oct 3, 2022
Merged

[wasm] Wasm.Build.Tests improvements #76381

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
e456077
InstallWorkloadFromArtifacts: Remove hack because we have an updated …
radical Sep 29, 2022
7756540
[wasm] WBT: Make project names unique
radical Sep 29, 2022
57e9642
[wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project …
radical Sep 29, 2022
0a67967
[wasm] WBT: Fixes to work with latest sdk
radical Sep 29, 2022
dc345d6
WBT: Revert to test projects created in bindir, instead of a temp one
radical Sep 29, 2022
a03d8c0
[wasm] fix weird build failures
radical Sep 29, 2022
4967d77
WBT: PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time
radical Sep 29, 2022
eb1dd05
WBT: Don't use the nuget packages directory as fallback.
radical Sep 29, 2022
9d7198c
[wasm] Use the latest sdk for Wasm.Build.Tests
radical Sep 29, 2022
24a7fe3
WBT: Add missing nuget8.config
radical Sep 29, 2022
2a38180
WBT: workaround for https://github.com/dotnet/runtime/issues/76201
radical Sep 29, 2022
6aea159
WasmAppHost: add rollforward=latestMajor
radical Sep 29, 2022
07b78e8
Merge branch 'main' into wbt-fixes
radical Sep 30, 2022
de5deea
Merge branch 'main' into wbt-fixes
radical Oct 3, 2022
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
22 changes: 12 additions & 10 deletions src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC
[InlineData("Release")]
public void DefaultTemplate_WithoutWorkload(string config)
{
string id = $"blz_no_workload_{config}";
string id = $"blz_no_workload_{config}_{Path.GetRandomFileName()}";
CreateBlazorWasmTemplateProject(id);

// Build
Expand All@@ -43,7 +43,7 @@ public void DefaultTemplate_WithoutWorkload(string config)
[InlineData("Release")]
public void DefaultTemplate_NoAOT_WithWorkload(string config)
{
string id = $"blz_no_aot_{config}";
string id = $"blz_no_aot_{config}_{Path.GetRandomFileName()}";
CreateBlazorWasmTemplateProject(id);

BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
Expand All@@ -63,7 +63,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config)
[InlineData("Release")]
public void DefaultTemplate_AOT_InProjectFile(string config)
{
string id = $"blz_aot_prj_file_{config}";
string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}";
string projectFile = CreateBlazorWasmTemplateProject(id);
AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -82,10 +82,10 @@ public void DefaultTemplate_AOT_InProjectFile(string config)
[InlineData("Debug", false)]
[InlineData("Release", true)]
[InlineData("Release", false)]
[ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
//[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}";
string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}";
string projectFile = CreateProjectWithNativeReference(id);
AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -94,7 +94,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel

var expectedFileType = nativeRelink ? NativeFilesType.Relinked : NativeFilesType.AOT;

AssertDotNetNativeFiles(expectedFileType, config, forPublish: true);
AssertDotNetNativeFiles(expectedFileType, config, forPublish: true, targetFramework: DefaultTargetFrameworkForBlazor);
AssertBlazorBundle(config, isPublish: true, dotnetWasmFromRuntimePack: false);

if (expectedFileType == NativeFilesType.AOT)
Expand DownExpand Up@@ -147,7 +147,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
[ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
public void WithNativeReference_AOTInProjectFile(string config)
{
string id = $"blz_nativeref_aot_{config}";
string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
string projectFile = CreateProjectWithNativeReference(id);
AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -165,7 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config)
[ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
public void WithNativeReference_AOTOnCommandLine(string config)
{
string id = $"blz_nativeref_aot_{config}";
string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
CreateProjectWithNativeReference(id);

BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
Expand All@@ -182,7 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config)
public void WithDllImportInMainAssembly(string config)
{
// Based on https://github.com/dotnet/runtime/issues/59255
string id = $"blz_dllimp_{config}";
string id = $"blz_dllimp_{config}_{Path.GetRandomFileName()}";
string projectFile = CreateProjectWithNativeReference(id);
string nativeSource = @"
#include <stdio.h>
Expand DownExpand Up@@ -233,14 +233,15 @@ void CheckNativeFileLinked(bool forPublish)
[Fact]
public void BugRegression_60479_WithRazorClassLib()
{
string id = "blz_razor_lib_top";
string id = $"blz_razor_lib_top_{Path.GetRandomFileName()}";
InitBlazorWasmProjectDir(id);

string wasmProjectDir = Path.Combine(_projectDir!, "wasm");
string wasmProjectFile = Path.Combine(wasmProjectDir, "wasm.csproj");
Directory.CreateDirectory(wasmProjectDir);
new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
.WithWorkingDirectory(wasmProjectDir)
.WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
.ExecuteWithCapturedOutput("new blazorwasm")
.EnsureSuccessful();

Expand All@@ -249,6 +250,7 @@ public void BugRegression_60479_WithRazorClassLib()
Directory.CreateDirectory(razorProjectDir);
new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
.WithWorkingDirectory(razorProjectDir)
.WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
.ExecuteWithCapturedOutput("new razorclasslib")
.EnsureSuccessful();

Expand Down
2 changes: 2 additions & 0 deletions src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@ private CommandResult PublishForRequiresWorkloadTest(string config, string extra
string publishLogPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}.binlog");
return new DotNetCommand(s_buildEnv, _testOutput)
.WithWorkingDirectory(_projectDir!)
.WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
.ExecuteWithCapturedOutput("publish",
$"-bl:{publishLogPath}",
$"-p:Configuration={config}");
Expand DownExpand Up@@ -109,6 +110,7 @@ private void BuildNet50Project(string config, bool aot, bool expectError, string
string publishLogPath = Path.Combine(logPath, $"{id}.binlog");
CommandResult result = new DotNetCommand(s_buildEnv, _testOutput)
.WithWorkingDirectory(_projectDir!)
.WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
.ExecuteWithCapturedOutput("publish",
$"-bl:{publishLogPath}",
(aot ? "-p:RunAOTCompilation=true" : ""),
Expand Down
6 changes: 1 addition & 5 deletions src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public class BuildEnvironment
public static readonly string RelativeTestAssetsPath = @"..\testassets\";
public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data");
public static readonly string TmpPath = Path.Combine(Path.GetTempPath(), "wasmbuildtests");
public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt");

private static readonly Dictionary<string, string> s_runtimePackVersions = new();

Expand DownExpand Up@@ -107,7 +107,6 @@ public BuildEnvironment()
EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath;
EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0";
EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
EnvVars["MSBuildSDKsPath"] = string.Empty;
EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}";
EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1";

Expand DownExpand Up@@ -160,8 +159,5 @@ public string GetRuntimeNativeDir(string tfm = BuildTestBase.DefaultTargetFramew

protected static string s_directoryBuildPropsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.props"));
protected static string s_directoryBuildTargetsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.targets"));

protected static string s_directoryBuildPropsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.props"));
protected static string s_directoryBuildTargetsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.targets"));
}
}
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
[wasm] Wasm.Build.Tests improvements by radical · Pull Request #76381 · dotnet/runtime · GitHub
Skip to content
[wasm] Wasm.Build.Tests improvements#76381

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 14 commits into

from

Oct 3, 2022
 Merged


[wasm] Wasm.Build.Tests improvements
#76381
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e456077

InstallWorkloadFromArtifacts: Remove hack because we have an updated …


radical Sep 29, 2022
7756540

[wasm] WBT: Make project names unique


radical Sep 29, 2022
57e9642

[wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project …


radical Sep 29, 2022
0a67967

[wasm] WBT: Fixes to work with latest sdk


radical Sep 29, 2022
dc345d6

WBT: Revert to test projects created in bindir, instead of a temp one


radical Sep 29, 2022
a03d8c0

[wasm] fix weird build failures


radical Sep 29, 2022
4967d77

WBT: PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time


radical Sep 29, 2022
eb1dd05

WBT: Don't use the nuget packages directory as fallback.


radical Sep 29, 2022
9d7198c

[wasm] Use the latest sdk for Wasm.Build.Tests


radical Sep 29, 2022
24a7fe3

WBT: Add missing nuget8.config


radical Sep 29, 2022
2a38180

WBT: workaround for https://github.com/dotnet/runtime/issues/76201


radical Sep 29, 2022
6aea159

WasmAppHost: add rollforward=latestMajor


radical Sep 29, 2022
07b78e8

Merge branch 'main' into wbt-fixes


radical Sep 30, 2022
de5deea

Merge branch 'main' into wbt-fixes


radical Oct 3, 2022

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


22 changes: 12 additions & 10 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC
 [InlineData("Release")]
 public void DefaultTemplate_WithoutWorkload(string config)
 {
 string id = $"blz_no_workload_{config}";
 string id = $"blz_no_workload_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 // Build
Expand All@@ -43,7 +43,7 @@ public void DefaultTemplate_WithoutWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_NoAOT_WithWorkload(string config)
 {
 string id = $"blz_no_aot_{config}";
 string id = $"blz_no_aot_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
Expand All@@ -63,7 +63,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_AOT_InProjectFile(string config)
 {
 string id = $"blz_aot_prj_file_{config}";
 string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateBlazorWasmTemplateProject(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -82,10 +82,10 @@ public void DefaultTemplate_AOT_InProjectFile(string config)
 [InlineData("Debug", false)]
 [InlineData("Release", true)]
 [InlineData("Release", false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
//[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}";
 string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -94,7 +94,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel

 var expectedFileType = nativeRelink ? NativeFilesType.Relinked : NativeFilesType.AOT;

 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true);
 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true, targetFramework: DefaultTargetFrameworkForBlazor);
 AssertBlazorBundle(config, isPublish: true, dotnetWasmFromRuntimePack: false);

 if (expectedFileType == NativeFilesType.AOT)
Expand DownExpand Up@@ -147,7 +147,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTInProjectFile(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -165,7 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTOnCommandLine(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 CreateProjectWithNativeReference(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
Expand All@@ -182,7 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config)
 public void WithDllImportInMainAssembly(string config)
 {
 // Based on https://github.com/dotnet/runtime/issues/59255
 string id = $"blz_dllimp_{config}";
 string id = $"blz_dllimp_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 string nativeSource = @"
 #include <stdio.h>
Expand DownExpand Up@@ -233,14 +233,15 @@ void CheckNativeFileLinked(bool forPublish)
 [Fact]
 public void BugRegression_60479_WithRazorClassLib()
 {
 string id = "blz_razor_lib_top";
 string id = $"blz_razor_lib_top_{Path.GetRandomFileName()}";
 InitBlazorWasmProjectDir(id);

 string wasmProjectDir = Path.Combine(_projectDir!, "wasm");
 string wasmProjectFile = Path.Combine(wasmProjectDir, "wasm.csproj");
 Directory.CreateDirectory(wasmProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(wasmProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new blazorwasm")
 .EnsureSuccessful();

Expand All@@ -249,6 +250,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Directory.CreateDirectory(razorProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(razorProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new razorclasslib")
 .EnsureSuccessful();

Expand Down

2 changes: 2 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@ private CommandResult PublishForRequiresWorkloadTest(string config, string extra
 string publishLogPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}.binlog");
 return new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 $"-p:Configuration={config}");
Expand DownExpand Up@@ -109,6 +110,7 @@ private void BuildNet50Project(string config, bool aot, bool expectError, string
 string publishLogPath = Path.Combine(logPath, $"{id}.binlog");
 CommandResult result = new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 (aot ? "-p:RunAOTCompilation=true" : ""),
Expand Down

6 changes: 1 addition & 5 deletions
src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public class BuildEnvironment
 public static readonly string RelativeTestAssetsPath = @"..\testassets\";
 public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
 public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data");
 public static readonly string TmpPath = Path.Combine(Path.GetTempPath(), "wasmbuildtests");
 public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt");

 private static readonly Dictionary<string, string> s_runtimePackVersions = new();

Expand DownExpand Up@@ -107,7 +107,6 @@ public BuildEnvironment()
 EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath;
 EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0";
 EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
 EnvVars["MSBuildSDKsPath"] = string.Empty;
 EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}";
 EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1";

Expand DownExpand Up@@ -160,8 +159,5 @@ public string GetRuntimeNativeDir(string tfm = BuildTestBase.DefaultTargetFramew

 protected static string s_directoryBuildPropsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.targets"));

 protected static string s_directoryBuildPropsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.targets"));
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[wasm] Wasm.Build.Tests improvements by radical · Pull Request #76381 · dotnet/runtime · GitHub
Skip to content
[wasm] Wasm.Build.Tests improvements#76381

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 14 commits into

from

Oct 3, 2022
 Merged


[wasm] Wasm.Build.Tests improvements
#76381
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e456077

InstallWorkloadFromArtifacts: Remove hack because we have an updated …


radical Sep 29, 2022
7756540

[wasm] WBT: Make project names unique


radical Sep 29, 2022
57e9642

[wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project …


radical Sep 29, 2022
0a67967

[wasm] WBT: Fixes to work with latest sdk


radical Sep 29, 2022
dc345d6

WBT: Revert to test projects created in bindir, instead of a temp one


radical Sep 29, 2022
a03d8c0

[wasm] fix weird build failures


radical Sep 29, 2022
4967d77

WBT: PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time


radical Sep 29, 2022
eb1dd05

WBT: Don't use the nuget packages directory as fallback.


radical Sep 29, 2022
9d7198c

[wasm] Use the latest sdk for Wasm.Build.Tests


radical Sep 29, 2022
24a7fe3

WBT: Add missing nuget8.config


radical Sep 29, 2022
2a38180

WBT: workaround for https://github.com/dotnet/runtime/issues/76201


radical Sep 29, 2022
6aea159

WasmAppHost: add rollforward=latestMajor


radical Sep 29, 2022
07b78e8

Merge branch 'main' into wbt-fixes


radical Sep 30, 2022
de5deea

Merge branch 'main' into wbt-fixes


radical Oct 3, 2022

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


22 changes: 12 additions & 10 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC
 [InlineData("Release")]
 public void DefaultTemplate_WithoutWorkload(string config)
 {
 string id = $"blz_no_workload_{config}";
 string id = $"blz_no_workload_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 // Build
Expand All@@ -43,7 +43,7 @@ public void DefaultTemplate_WithoutWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_NoAOT_WithWorkload(string config)
 {
 string id = $"blz_no_aot_{config}";
 string id = $"blz_no_aot_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
Expand All@@ -63,7 +63,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_AOT_InProjectFile(string config)
 {
 string id = $"blz_aot_prj_file_{config}";
 string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateBlazorWasmTemplateProject(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -82,10 +82,10 @@ public void DefaultTemplate_AOT_InProjectFile(string config)
 [InlineData("Debug", false)]
 [InlineData("Release", true)]
 [InlineData("Release", false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
//[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}";
 string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -94,7 +94,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel

 var expectedFileType = nativeRelink ? NativeFilesType.Relinked : NativeFilesType.AOT;

 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true);
 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true, targetFramework: DefaultTargetFrameworkForBlazor);
 AssertBlazorBundle(config, isPublish: true, dotnetWasmFromRuntimePack: false);

 if (expectedFileType == NativeFilesType.AOT)
Expand DownExpand Up@@ -147,7 +147,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTInProjectFile(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -165,7 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTOnCommandLine(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 CreateProjectWithNativeReference(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
Expand All@@ -182,7 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config)
 public void WithDllImportInMainAssembly(string config)
 {
 // Based on https://github.com/dotnet/runtime/issues/59255
 string id = $"blz_dllimp_{config}";
 string id = $"blz_dllimp_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 string nativeSource = @"
 #include <stdio.h>
Expand DownExpand Up@@ -233,14 +233,15 @@ void CheckNativeFileLinked(bool forPublish)
 [Fact]
 public void BugRegression_60479_WithRazorClassLib()
 {
 string id = "blz_razor_lib_top";
 string id = $"blz_razor_lib_top_{Path.GetRandomFileName()}";
 InitBlazorWasmProjectDir(id);

 string wasmProjectDir = Path.Combine(_projectDir!, "wasm");
 string wasmProjectFile = Path.Combine(wasmProjectDir, "wasm.csproj");
 Directory.CreateDirectory(wasmProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(wasmProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new blazorwasm")
 .EnsureSuccessful();

Expand All@@ -249,6 +250,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Directory.CreateDirectory(razorProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(razorProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new razorclasslib")
 .EnsureSuccessful();

Expand Down

2 changes: 2 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@ private CommandResult PublishForRequiresWorkloadTest(string config, string extra
 string publishLogPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}.binlog");
 return new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 $"-p:Configuration={config}");
Expand DownExpand Up@@ -109,6 +110,7 @@ private void BuildNet50Project(string config, bool aot, bool expectError, string
 string publishLogPath = Path.Combine(logPath, $"{id}.binlog");
 CommandResult result = new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 (aot ? "-p:RunAOTCompilation=true" : ""),
Expand Down

6 changes: 1 addition & 5 deletions
src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public class BuildEnvironment
 public static readonly string RelativeTestAssetsPath = @"..\testassets\";
 public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
 public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data");
 public static readonly string TmpPath = Path.Combine(Path.GetTempPath(), "wasmbuildtests");
 public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt");

 private static readonly Dictionary<string, string> s_runtimePackVersions = new();

Expand DownExpand Up@@ -107,7 +107,6 @@ public BuildEnvironment()
 EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath;
 EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0";
 EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
 EnvVars["MSBuildSDKsPath"] = string.Empty;
 EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}";
 EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1";

Expand DownExpand Up@@ -160,8 +159,5 @@ public string GetRuntimeNativeDir(string tfm = BuildTestBase.DefaultTargetFramew

 protected static string s_directoryBuildPropsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.targets"));

 protected static string s_directoryBuildPropsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.targets"));
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Highlight search terms from Google/DuckDuckGo/Bing referrer
(function() {
var ref = document.referrer;
var terms = [];
if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {
var url = new URL(ref);
var q = url.searchParams.get('q') || url.searchParams.get('p');
if (q) {
terms = q.split(/\s+/).filter(function(t) { return t.length > 2; });
}
}
if (terms.length === 0) return;
var style = document.createElement('style');
style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';
document.head.appendChild(style);
function highlight(node) {
if (node.nodeType === 3) { // text node
var text = node.textContent;
var found = false;
terms.forEach(function(term) {
var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\]\\]/g, '\\') + ')', 'gi');
if (regex.test(text)) {
found = true;
var frag = document.createDocumentFragment();
var parts = text.split(regex);
parts.forEach(function(part, i) {
if (i % 2 === 0) {
frag.appendChild(document.createTextNode(part));
} else {
var span = document.createElement('span');
span.className = 'userscript-highlight';
span.textContent = part;
frag.appendChild(span);
}
});
node.parentNode.replaceChild(frag, node);
}
});
} else if (node.nodeType === 1 && node.childNodes) { // element
var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];
if (!skipTags.includes(node.tagName)) {
Array.from(node.childNodes).forEach(highlight);
}
}
}
highlight(document.body);
// Re-highlight on dynamic content
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1 || node.nodeType === 3) highlight(node);
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[wasm] Wasm.Build.Tests improvements by radical · Pull Request #76381 · dotnet/runtime · GitHub
Skip to content
[wasm] Wasm.Build.Tests improvements#76381

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 14 commits into

from

Oct 3, 2022
 Merged


[wasm] Wasm.Build.Tests improvements
#76381
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e456077

InstallWorkloadFromArtifacts: Remove hack because we have an updated …


radical Sep 29, 2022
7756540

[wasm] WBT: Make project names unique


radical Sep 29, 2022
57e9642

[wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project …


radical Sep 29, 2022
0a67967

[wasm] WBT: Fixes to work with latest sdk


radical Sep 29, 2022
dc345d6

WBT: Revert to test projects created in bindir, instead of a temp one


radical Sep 29, 2022
a03d8c0

[wasm] fix weird build failures


radical Sep 29, 2022
4967d77

WBT: PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time


radical Sep 29, 2022
eb1dd05

WBT: Don't use the nuget packages directory as fallback.


radical Sep 29, 2022
9d7198c

[wasm] Use the latest sdk for Wasm.Build.Tests


radical Sep 29, 2022
24a7fe3

WBT: Add missing nuget8.config


radical Sep 29, 2022
2a38180

WBT: workaround for https://github.com/dotnet/runtime/issues/76201


radical Sep 29, 2022
6aea159

WasmAppHost: add rollforward=latestMajor


radical Sep 29, 2022
07b78e8

Merge branch 'main' into wbt-fixes


radical Sep 30, 2022
de5deea

Merge branch 'main' into wbt-fixes


radical Oct 3, 2022

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


22 changes: 12 additions & 10 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC
 [InlineData("Release")]
 public void DefaultTemplate_WithoutWorkload(string config)
 {
 string id = $"blz_no_workload_{config}";
 string id = $"blz_no_workload_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 // Build
Expand All@@ -43,7 +43,7 @@ public void DefaultTemplate_WithoutWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_NoAOT_WithWorkload(string config)
 {
 string id = $"blz_no_aot_{config}";
 string id = $"blz_no_aot_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
Expand All@@ -63,7 +63,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_AOT_InProjectFile(string config)
 {
 string id = $"blz_aot_prj_file_{config}";
 string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateBlazorWasmTemplateProject(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -82,10 +82,10 @@ public void DefaultTemplate_AOT_InProjectFile(string config)
 [InlineData("Debug", false)]
 [InlineData("Release", true)]
 [InlineData("Release", false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
//[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}";
 string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -94,7 +94,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel

 var expectedFileType = nativeRelink ? NativeFilesType.Relinked : NativeFilesType.AOT;

 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true);
 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true, targetFramework: DefaultTargetFrameworkForBlazor);
 AssertBlazorBundle(config, isPublish: true, dotnetWasmFromRuntimePack: false);

 if (expectedFileType == NativeFilesType.AOT)
Expand DownExpand Up@@ -147,7 +147,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTInProjectFile(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -165,7 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTOnCommandLine(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 CreateProjectWithNativeReference(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
Expand All@@ -182,7 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config)
 public void WithDllImportInMainAssembly(string config)
 {
 // Based on https://github.com/dotnet/runtime/issues/59255
 string id = $"blz_dllimp_{config}";
 string id = $"blz_dllimp_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 string nativeSource = @"
 #include <stdio.h>
Expand DownExpand Up@@ -233,14 +233,15 @@ void CheckNativeFileLinked(bool forPublish)
 [Fact]
 public void BugRegression_60479_WithRazorClassLib()
 {
 string id = "blz_razor_lib_top";
 string id = $"blz_razor_lib_top_{Path.GetRandomFileName()}";
 InitBlazorWasmProjectDir(id);

 string wasmProjectDir = Path.Combine(_projectDir!, "wasm");
 string wasmProjectFile = Path.Combine(wasmProjectDir, "wasm.csproj");
 Directory.CreateDirectory(wasmProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(wasmProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new blazorwasm")
 .EnsureSuccessful();

Expand All@@ -249,6 +250,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Directory.CreateDirectory(razorProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(razorProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new razorclasslib")
 .EnsureSuccessful();

Expand Down

2 changes: 2 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@ private CommandResult PublishForRequiresWorkloadTest(string config, string extra
 string publishLogPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}.binlog");
 return new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 $"-p:Configuration={config}");
Expand DownExpand Up@@ -109,6 +110,7 @@ private void BuildNet50Project(string config, bool aot, bool expectError, string
 string publishLogPath = Path.Combine(logPath, $"{id}.binlog");
 CommandResult result = new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 (aot ? "-p:RunAOTCompilation=true" : ""),
Expand Down

6 changes: 1 addition & 5 deletions
src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public class BuildEnvironment
 public static readonly string RelativeTestAssetsPath = @"..\testassets\";
 public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
 public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data");
 public static readonly string TmpPath = Path.Combine(Path.GetTempPath(), "wasmbuildtests");
 public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt");

 private static readonly Dictionary<string, string> s_runtimePackVersions = new();

Expand DownExpand Up@@ -107,7 +107,6 @@ public BuildEnvironment()
 EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath;
 EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0";
 EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
 EnvVars["MSBuildSDKsPath"] = string.Empty;
 EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}";
 EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1";

Expand DownExpand Up@@ -160,8 +159,5 @@ public string GetRuntimeNativeDir(string tfm = BuildTestBase.DefaultTargetFramew

 protected static string s_directoryBuildPropsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.targets"));

 protected static string s_directoryBuildPropsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.targets"));
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
[wasm] Wasm.Build.Tests improvements by radical · Pull Request #76381 · dotnet/runtime · GitHub
Skip to content
[wasm] Wasm.Build.Tests improvements#76381

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 14 commits into

from

Oct 3, 2022
 Merged


[wasm] Wasm.Build.Tests improvements
#76381
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e456077

InstallWorkloadFromArtifacts: Remove hack because we have an updated …


radical Sep 29, 2022
7756540

[wasm] WBT: Make project names unique


radical Sep 29, 2022
57e9642

[wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project …


radical Sep 29, 2022
0a67967

[wasm] WBT: Fixes to work with latest sdk


radical Sep 29, 2022
dc345d6

WBT: Revert to test projects created in bindir, instead of a temp one


radical Sep 29, 2022
a03d8c0

[wasm] fix weird build failures


radical Sep 29, 2022
4967d77

WBT: PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time


radical Sep 29, 2022
eb1dd05

WBT: Don't use the nuget packages directory as fallback.


radical Sep 29, 2022
9d7198c

[wasm] Use the latest sdk for Wasm.Build.Tests


radical Sep 29, 2022
24a7fe3

WBT: Add missing nuget8.config


radical Sep 29, 2022
2a38180

WBT: workaround for https://github.com/dotnet/runtime/issues/76201


radical Sep 29, 2022
6aea159

WasmAppHost: add rollforward=latestMajor


radical Sep 29, 2022
07b78e8

Merge branch 'main' into wbt-fixes


radical Sep 30, 2022
de5deea

Merge branch 'main' into wbt-fixes


radical Oct 3, 2022

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


22 changes: 12 additions & 10 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC
 [InlineData("Release")]
 public void DefaultTemplate_WithoutWorkload(string config)
 {
 string id = $"blz_no_workload_{config}";
 string id = $"blz_no_workload_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 // Build
Expand All@@ -43,7 +43,7 @@ public void DefaultTemplate_WithoutWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_NoAOT_WithWorkload(string config)
 {
 string id = $"blz_no_aot_{config}";
 string id = $"blz_no_aot_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
Expand All@@ -63,7 +63,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_AOT_InProjectFile(string config)
 {
 string id = $"blz_aot_prj_file_{config}";
 string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateBlazorWasmTemplateProject(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -82,10 +82,10 @@ public void DefaultTemplate_AOT_InProjectFile(string config)
 [InlineData("Debug", false)]
 [InlineData("Release", true)]
 [InlineData("Release", false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
//[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}";
 string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -94,7 +94,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel

 var expectedFileType = nativeRelink ? NativeFilesType.Relinked : NativeFilesType.AOT;

 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true);
 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true, targetFramework: DefaultTargetFrameworkForBlazor);
 AssertBlazorBundle(config, isPublish: true, dotnetWasmFromRuntimePack: false);

 if (expectedFileType == NativeFilesType.AOT)
Expand DownExpand Up@@ -147,7 +147,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTInProjectFile(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -165,7 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTOnCommandLine(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 CreateProjectWithNativeReference(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
Expand All@@ -182,7 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config)
 public void WithDllImportInMainAssembly(string config)
 {
 // Based on https://github.com/dotnet/runtime/issues/59255
 string id = $"blz_dllimp_{config}";
 string id = $"blz_dllimp_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 string nativeSource = @"
 #include <stdio.h>
Expand DownExpand Up@@ -233,14 +233,15 @@ void CheckNativeFileLinked(bool forPublish)
 [Fact]
 public void BugRegression_60479_WithRazorClassLib()
 {
 string id = "blz_razor_lib_top";
 string id = $"blz_razor_lib_top_{Path.GetRandomFileName()}";
 InitBlazorWasmProjectDir(id);

 string wasmProjectDir = Path.Combine(_projectDir!, "wasm");
 string wasmProjectFile = Path.Combine(wasmProjectDir, "wasm.csproj");
 Directory.CreateDirectory(wasmProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(wasmProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new blazorwasm")
 .EnsureSuccessful();

Expand All@@ -249,6 +250,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Directory.CreateDirectory(razorProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(razorProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new razorclasslib")
 .EnsureSuccessful();

Expand Down

2 changes: 2 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@ private CommandResult PublishForRequiresWorkloadTest(string config, string extra
 string publishLogPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}.binlog");
 return new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 $"-p:Configuration={config}");
Expand DownExpand Up@@ -109,6 +110,7 @@ private void BuildNet50Project(string config, bool aot, bool expectError, string
 string publishLogPath = Path.Combine(logPath, $"{id}.binlog");
 CommandResult result = new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 (aot ? "-p:RunAOTCompilation=true" : ""),
Expand Down

6 changes: 1 addition & 5 deletions
src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public class BuildEnvironment
 public static readonly string RelativeTestAssetsPath = @"..\testassets\";
 public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
 public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data");
 public static readonly string TmpPath = Path.Combine(Path.GetTempPath(), "wasmbuildtests");
 public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt");

 private static readonly Dictionary<string, string> s_runtimePackVersions = new();

Expand DownExpand Up@@ -107,7 +107,6 @@ public BuildEnvironment()
 EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath;
 EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0";
 EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
 EnvVars["MSBuildSDKsPath"] = string.Empty;
 EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}";
 EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1";

Expand DownExpand Up@@ -160,8 +159,5 @@ public string GetRuntimeNativeDir(string tfm = BuildTestBase.DefaultTargetFramew

 protected static string s_directoryBuildPropsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.targets"));

 protected static string s_directoryBuildPropsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.targets"));
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[wasm] Wasm.Build.Tests improvements by radical · Pull Request #76381 · dotnet/runtime · GitHub
Skip to content
[wasm] Wasm.Build.Tests improvements#76381

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 14 commits into

from

Oct 3, 2022
 Merged


[wasm] Wasm.Build.Tests improvements
#76381
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e456077

InstallWorkloadFromArtifacts: Remove hack because we have an updated …


radical Sep 29, 2022
7756540

[wasm] WBT: Make project names unique


radical Sep 29, 2022
57e9642

[wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project …


radical Sep 29, 2022
0a67967

[wasm] WBT: Fixes to work with latest sdk


radical Sep 29, 2022
dc345d6

WBT: Revert to test projects created in bindir, instead of a temp one


radical Sep 29, 2022
a03d8c0

[wasm] fix weird build failures


radical Sep 29, 2022
4967d77

WBT: PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time


radical Sep 29, 2022
eb1dd05

WBT: Don't use the nuget packages directory as fallback.


radical Sep 29, 2022
9d7198c

[wasm] Use the latest sdk for Wasm.Build.Tests


radical Sep 29, 2022
24a7fe3

WBT: Add missing nuget8.config


radical Sep 29, 2022
2a38180

WBT: workaround for https://github.com/dotnet/runtime/issues/76201


radical Sep 29, 2022
6aea159

WasmAppHost: add rollforward=latestMajor


radical Sep 29, 2022
07b78e8

Merge branch 'main' into wbt-fixes


radical Sep 30, 2022
de5deea

Merge branch 'main' into wbt-fixes


radical Oct 3, 2022

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


22 changes: 12 additions & 10 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC
 [InlineData("Release")]
 public void DefaultTemplate_WithoutWorkload(string config)
 {
 string id = $"blz_no_workload_{config}";
 string id = $"blz_no_workload_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 // Build
Expand All@@ -43,7 +43,7 @@ public void DefaultTemplate_WithoutWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_NoAOT_WithWorkload(string config)
 {
 string id = $"blz_no_aot_{config}";
 string id = $"blz_no_aot_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
Expand All@@ -63,7 +63,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_AOT_InProjectFile(string config)
 {
 string id = $"blz_aot_prj_file_{config}";
 string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateBlazorWasmTemplateProject(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -82,10 +82,10 @@ public void DefaultTemplate_AOT_InProjectFile(string config)
 [InlineData("Debug", false)]
 [InlineData("Release", true)]
 [InlineData("Release", false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
//[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}";
 string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -94,7 +94,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel

 var expectedFileType = nativeRelink ? NativeFilesType.Relinked : NativeFilesType.AOT;

 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true);
 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true, targetFramework: DefaultTargetFrameworkForBlazor);
 AssertBlazorBundle(config, isPublish: true, dotnetWasmFromRuntimePack: false);

 if (expectedFileType == NativeFilesType.AOT)
Expand DownExpand Up@@ -147,7 +147,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTInProjectFile(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -165,7 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTOnCommandLine(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 CreateProjectWithNativeReference(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
Expand All@@ -182,7 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config)
 public void WithDllImportInMainAssembly(string config)
 {
 // Based on https://github.com/dotnet/runtime/issues/59255
 string id = $"blz_dllimp_{config}";
 string id = $"blz_dllimp_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 string nativeSource = @"
 #include <stdio.h>
Expand DownExpand Up@@ -233,14 +233,15 @@ void CheckNativeFileLinked(bool forPublish)
 [Fact]
 public void BugRegression_60479_WithRazorClassLib()
 {
 string id = "blz_razor_lib_top";
 string id = $"blz_razor_lib_top_{Path.GetRandomFileName()}";
 InitBlazorWasmProjectDir(id);

 string wasmProjectDir = Path.Combine(_projectDir!, "wasm");
 string wasmProjectFile = Path.Combine(wasmProjectDir, "wasm.csproj");
 Directory.CreateDirectory(wasmProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(wasmProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new blazorwasm")
 .EnsureSuccessful();

Expand All@@ -249,6 +250,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Directory.CreateDirectory(razorProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(razorProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new razorclasslib")
 .EnsureSuccessful();

Expand Down

2 changes: 2 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@ private CommandResult PublishForRequiresWorkloadTest(string config, string extra
 string publishLogPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}.binlog");
 return new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 $"-p:Configuration={config}");
Expand DownExpand Up@@ -109,6 +110,7 @@ private void BuildNet50Project(string config, bool aot, bool expectError, string
 string publishLogPath = Path.Combine(logPath, $"{id}.binlog");
 CommandResult result = new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 (aot ? "-p:RunAOTCompilation=true" : ""),
Expand Down

6 changes: 1 addition & 5 deletions
src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public class BuildEnvironment
 public static readonly string RelativeTestAssetsPath = @"..\testassets\";
 public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
 public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data");
 public static readonly string TmpPath = Path.Combine(Path.GetTempPath(), "wasmbuildtests");
 public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt");

 private static readonly Dictionary<string, string> s_runtimePackVersions = new();

Expand DownExpand Up@@ -107,7 +107,6 @@ public BuildEnvironment()
 EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath;
 EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0";
 EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
 EnvVars["MSBuildSDKsPath"] = string.Empty;
 EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}";
 EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1";

Expand DownExpand Up@@ -160,8 +159,5 @@ public string GetRuntimeNativeDir(string tfm = BuildTestBase.DefaultTargetFramew

 protected static string s_directoryBuildPropsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.targets"));

 protected static string s_directoryBuildPropsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.targets"));
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
[wasm] Wasm.Build.Tests improvements by radical · Pull Request #76381 · dotnet/runtime · GitHub
Skip to content
[wasm] Wasm.Build.Tests improvements#76381

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 14 commits into

from

Oct 3, 2022
 Merged


[wasm] Wasm.Build.Tests improvements
#76381
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e456077

InstallWorkloadFromArtifacts: Remove hack because we have an updated …


radical Sep 29, 2022
7756540

[wasm] WBT: Make project names unique


radical Sep 29, 2022
57e9642

[wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project …


radical Sep 29, 2022
0a67967

[wasm] WBT: Fixes to work with latest sdk


radical Sep 29, 2022
dc345d6

WBT: Revert to test projects created in bindir, instead of a temp one


radical Sep 29, 2022
a03d8c0

[wasm] fix weird build failures


radical Sep 29, 2022
4967d77

WBT: PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time


radical Sep 29, 2022
eb1dd05

WBT: Don't use the nuget packages directory as fallback.


radical Sep 29, 2022
9d7198c

[wasm] Use the latest sdk for Wasm.Build.Tests


radical Sep 29, 2022
24a7fe3

WBT: Add missing nuget8.config


radical Sep 29, 2022
2a38180

WBT: workaround for https://github.com/dotnet/runtime/issues/76201


radical Sep 29, 2022
6aea159

WasmAppHost: add rollforward=latestMajor


radical Sep 29, 2022
07b78e8

Merge branch 'main' into wbt-fixes


radical Sep 30, 2022
de5deea

Merge branch 'main' into wbt-fixes


radical Oct 3, 2022

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


22 changes: 12 additions & 10 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC
 [InlineData("Release")]
 public void DefaultTemplate_WithoutWorkload(string config)
 {
 string id = $"blz_no_workload_{config}";
 string id = $"blz_no_workload_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 // Build
Expand All@@ -43,7 +43,7 @@ public void DefaultTemplate_WithoutWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_NoAOT_WithWorkload(string config)
 {
 string id = $"blz_no_aot_{config}";
 string id = $"blz_no_aot_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
Expand All@@ -63,7 +63,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_AOT_InProjectFile(string config)
 {
 string id = $"blz_aot_prj_file_{config}";
 string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateBlazorWasmTemplateProject(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -82,10 +82,10 @@ public void DefaultTemplate_AOT_InProjectFile(string config)
 [InlineData("Debug", false)]
 [InlineData("Release", true)]
 [InlineData("Release", false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
//[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}";
 string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -94,7 +94,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel

 var expectedFileType = nativeRelink ? NativeFilesType.Relinked : NativeFilesType.AOT;

 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true);
 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true, targetFramework: DefaultTargetFrameworkForBlazor);
 AssertBlazorBundle(config, isPublish: true, dotnetWasmFromRuntimePack: false);

 if (expectedFileType == NativeFilesType.AOT)
Expand DownExpand Up@@ -147,7 +147,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTInProjectFile(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -165,7 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTOnCommandLine(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 CreateProjectWithNativeReference(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
Expand All@@ -182,7 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config)
 public void WithDllImportInMainAssembly(string config)
 {
 // Based on https://github.com/dotnet/runtime/issues/59255
 string id = $"blz_dllimp_{config}";
 string id = $"blz_dllimp_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 string nativeSource = @"
 #include <stdio.h>
Expand DownExpand Up@@ -233,14 +233,15 @@ void CheckNativeFileLinked(bool forPublish)
 [Fact]
 public void BugRegression_60479_WithRazorClassLib()
 {
 string id = "blz_razor_lib_top";
 string id = $"blz_razor_lib_top_{Path.GetRandomFileName()}";
 InitBlazorWasmProjectDir(id);

 string wasmProjectDir = Path.Combine(_projectDir!, "wasm");
 string wasmProjectFile = Path.Combine(wasmProjectDir, "wasm.csproj");
 Directory.CreateDirectory(wasmProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(wasmProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new blazorwasm")
 .EnsureSuccessful();

Expand All@@ -249,6 +250,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Directory.CreateDirectory(razorProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(razorProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new razorclasslib")
 .EnsureSuccessful();

Expand Down

2 changes: 2 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@ private CommandResult PublishForRequiresWorkloadTest(string config, string extra
 string publishLogPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}.binlog");
 return new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 $"-p:Configuration={config}");
Expand DownExpand Up@@ -109,6 +110,7 @@ private void BuildNet50Project(string config, bool aot, bool expectError, string
 string publishLogPath = Path.Combine(logPath, $"{id}.binlog");
 CommandResult result = new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 (aot ? "-p:RunAOTCompilation=true" : ""),
Expand Down

6 changes: 1 addition & 5 deletions
src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public class BuildEnvironment
 public static readonly string RelativeTestAssetsPath = @"..\testassets\";
 public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
 public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data");
 public static readonly string TmpPath = Path.Combine(Path.GetTempPath(), "wasmbuildtests");
 public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt");

 private static readonly Dictionary<string, string> s_runtimePackVersions = new();

Expand DownExpand Up@@ -107,7 +107,6 @@ public BuildEnvironment()
 EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath;
 EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0";
 EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
 EnvVars["MSBuildSDKsPath"] = string.Empty;
 EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}";
 EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1";

Expand DownExpand Up@@ -160,8 +159,5 @@ public string GetRuntimeNativeDir(string tfm = BuildTestBase.DefaultTargetFramew

 protected static string s_directoryBuildPropsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.targets"));

 protected static string s_directoryBuildPropsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.targets"));
 }
}
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Universal Dark Mode - works on any site
(function() {
var enabled = true;
function applyDarkMode() {
if (!enabled) return;
// Create style element if it doesn't exist
var style = document.getElementById('universal-dark-mode-style');
if (!style) {
style = document.createElement('style');
style.id = 'universal-dark-mode-style';
document.head.appendChild(style);
}
// Dark mode CSS - inverts colors but preserves images/video
style.textContent = '
/* Invert everything except media */
html {
filter: invert(1) hue-rotate(180deg) !important;
background: #1a1a2e !important;
}
/* Restore images, videos, iframes, canvas */
img, video, iframe, canvas, svg, picture, [style*="background-image"] {
filter: invert(1) hue-rotate(180deg) !important;
}
/* Preserve specific elements that should not be inverted */
.no-dark-mode, .no-dark-mode *,
[data-theme="light"], [data-theme="light"],
.ace_editor, .ace_editor *,
.CodeMirror, .CodeMirror *,
.monaco-editor, .monaco-editor *,
.markdown-body pre, .markdown-body pre *,
.highlight, .highlight *,
pre code, pre code * {
filter: none !important;
}
/* Fix common UI elements */
.modal, .popup, .dropdown-menu, .tooltip, .popover {
filter: invert(1) hue-rotate(180deg) !important;
background: #2d2d44 !important;
border-color: #444 !important;
}
/* Scrollbars */
::-webkit-scrollbar { background: #1a1a2e !important; }
::-webkit-scrollbar-thumb { background: #444 !important; }
::-webkit-scrollbar-thumb:hover { background: #555 !important; }
/* Selection */
::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }
';
}
function removeDarkMode() {
var style = document.getElementById('universal-dark-mode-style');
if (style) style.remove();
}
// Toggle with Alt+Shift+D
document.addEventListener('keydown', function(e) {
if (e.altKey && e.shiftKey && e.key === 'D') {
e.preventDefault();
enabled = !enabled;
if (enabled) {
applyDarkMode();
console.log('[Universal Dark Mode] Enabled');
} else {
removeDarkMode();
console.log('[Universal Dark Mode] Disabled');
}
}
});
// Apply on load
applyDarkMode();
// Re-apply on dynamic content
var observer = new MutationObserver(function(mutations) {
if (enabled && !document.getElementById('universal-dark-mode-style')) {
applyDarkMode();
}
});
observer.observe(document.head, { childList: true });
console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');
})();
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();
[wasm] Wasm.Build.Tests improvements by radical · Pull Request #76381 · dotnet/runtime · GitHub
Skip to content
[wasm] Wasm.Build.Tests improvements#76381

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 14 commits into

from

Oct 3, 2022
 Merged


[wasm] Wasm.Build.Tests improvements
#76381
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


14 commits


Select commit
Hold shift + click to select a range
e456077

InstallWorkloadFromArtifacts: Remove hack because we have an updated …


radical Sep 29, 2022
7756540

[wasm] WBT: Make project names unique


radical Sep 29, 2022
57e9642

[wasm] WBT: Use a clean NUGET_PACKAGES dir separate from the project …


radical Sep 29, 2022
0a67967

[wasm] WBT: Fixes to work with latest sdk


radical Sep 29, 2022
dc345d6

WBT: Revert to test projects created in bindir, instead of a temp one


radical Sep 29, 2022
a03d8c0

[wasm] fix weird build failures


radical Sep 29, 2022
4967d77

WBT: PInvokeTableGenerator: Find path to WasmAppBuilder.dll at test time


radical Sep 29, 2022
eb1dd05

WBT: Don't use the nuget packages directory as fallback.


radical Sep 29, 2022
9d7198c

[wasm] Use the latest sdk for Wasm.Build.Tests


radical Sep 29, 2022
24a7fe3

WBT: Add missing nuget8.config


radical Sep 29, 2022
2a38180

WBT: workaround for https://github.com/dotnet/runtime/issues/76201


radical Sep 29, 2022
6aea159

WasmAppHost: add rollforward=latestMajor


radical Sep 29, 2022
07b78e8

Merge branch 'main' into wbt-fixes


radical Sep 30, 2022
de5deea

Merge branch 'main' into wbt-fixes


radical Oct 3, 2022

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


22 changes: 12 additions & 10 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmBuildPublishTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -26,7 +26,7 @@ public BlazorWasmBuildPublishTests(ITestOutputHelper output, SharedBuildPerTestC
 [InlineData("Release")]
 public void DefaultTemplate_WithoutWorkload(string config)
 {
 string id = $"blz_no_workload_{config}";
 string id = $"blz_no_workload_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 // Build
Expand All@@ -43,7 +43,7 @@ public void DefaultTemplate_WithoutWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_NoAOT_WithWorkload(string config)
 {
 string id = $"blz_no_aot_{config}";
 string id = $"blz_no_aot_{config}_{Path.GetRandomFileName()}";
 CreateBlazorWasmTemplateProject(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.FromRuntimePack));
Expand All@@ -63,7 +63,7 @@ public void DefaultTemplate_NoAOT_WithWorkload(string config)
 [InlineData("Release")]
 public void DefaultTemplate_AOT_InProjectFile(string config)
 {
 string id = $"blz_aot_prj_file_{config}";
 string id = $"blz_aot_prj_file_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateBlazorWasmTemplateProject(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -82,10 +82,10 @@ public void DefaultTemplate_AOT_InProjectFile(string config)
 [InlineData("Debug", false)]
 [InlineData("Release", true)]
 [InlineData("Release", false)]
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
//[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}";
 string id = $"blz_deploy_on_build_{config}_{nativeRelink}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: nativeRelink ? string.Empty : "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -94,7 +94,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel

 var expectedFileType = nativeRelink ? NativeFilesType.Relinked : NativeFilesType.AOT;

 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true);
 AssertDotNetNativeFiles(expectedFileType, config, forPublish: true, targetFramework: DefaultTargetFrameworkForBlazor);
 AssertBlazorBundle(config, isPublish: true, dotnetWasmFromRuntimePack: false);

 if (expectedFileType == NativeFilesType.AOT)
Expand DownExpand Up@@ -147,7 +147,7 @@ public void NativeBuild_WithDeployOnBuild_UsedByVS(string config, bool nativeRel
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTInProjectFile(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 AddItemsPropertiesToProject(projectFile, extraProperties: "<RunAOTCompilation>true</RunAOTCompilation>");

Expand All@@ -165,7 +165,7 @@ public void WithNativeReference_AOTInProjectFile(string config)
 [ActiveIssue("https://github.com/dotnet/runtime/issues/70985", TestPlatforms.Linux)]
 public void WithNativeReference_AOTOnCommandLine(string config)
 {
 string id = $"blz_nativeref_aot_{config}";
 string id = $"blz_nativeref_aot_{config}_{Path.GetRandomFileName()}";
 CreateProjectWithNativeReference(id);

 BlazorBuild(new BlazorBuildOptions(id, config, NativeFilesType.Relinked));
Expand All@@ -182,7 +182,7 @@ public void WithNativeReference_AOTOnCommandLine(string config)
 public void WithDllImportInMainAssembly(string config)
 {
 // Based on https://github.com/dotnet/runtime/issues/59255
 string id = $"blz_dllimp_{config}";
 string id = $"blz_dllimp_{config}_{Path.GetRandomFileName()}";
 string projectFile = CreateProjectWithNativeReference(id);
 string nativeSource = @"
 #include <stdio.h>
Expand DownExpand Up@@ -233,14 +233,15 @@ void CheckNativeFileLinked(bool forPublish)
 [Fact]
 public void BugRegression_60479_WithRazorClassLib()
 {
 string id = "blz_razor_lib_top";
 string id = $"blz_razor_lib_top_{Path.GetRandomFileName()}";
 InitBlazorWasmProjectDir(id);

 string wasmProjectDir = Path.Combine(_projectDir!, "wasm");
 string wasmProjectFile = Path.Combine(wasmProjectDir, "wasm.csproj");
 Directory.CreateDirectory(wasmProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(wasmProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new blazorwasm")
 .EnsureSuccessful();

Expand All@@ -249,6 +250,7 @@ public void BugRegression_60479_WithRazorClassLib()
 Directory.CreateDirectory(razorProjectDir);
 new DotNetCommand(s_buildEnv, _testOutput, useDefaultArgs: false)
 .WithWorkingDirectory(razorProjectDir)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("new razorclasslib")
 .EnsureSuccessful();

Expand Down

2 changes: 2 additions & 0 deletions
src/mono/wasm/Wasm.Build.Tests/BlazorWasmTests.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -61,6 +61,7 @@ private CommandResult PublishForRequiresWorkloadTest(string config, string extra
 string publishLogPath = Path.Combine(s_buildEnv.LogRootPath, id, $"{id}.binlog");
 return new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 $"-p:Configuration={config}");
Expand DownExpand Up@@ -109,6 +110,7 @@ private void BuildNet50Project(string config, bool aot, bool expectError, string
 string publishLogPath = Path.Combine(logPath, $"{id}.binlog");
 CommandResult result = new DotNetCommand(s_buildEnv, _testOutput)
 .WithWorkingDirectory(_projectDir!)
 .WithEnvironmentVariable("NUGET_PACKAGES", _nugetPackagesDir)
 .ExecuteWithCapturedOutput("publish",
 $"-bl:{publishLogPath}",
 (aot ? "-p:RunAOTCompilation=true" : ""),
Expand Down

6 changes: 1 addition & 5 deletions
src/mono/wasm/Wasm.Build.Tests/BuildEnvironment.cs

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -27,7 +27,7 @@ public class BuildEnvironment
 public static readonly string RelativeTestAssetsPath = @"..\testassets\";
 public static readonly string TestAssetsPath = Path.Combine(AppContext.BaseDirectory, "testassets");
 public static readonly string TestDataPath = Path.Combine(AppContext.BaseDirectory, "data");
 public static readonly string TmpPath = Path.Combine(Path.GetTempPath(), "wasmbuildtests");
 public static readonly string TmpPath = Path.Combine(AppContext.BaseDirectory, "wbt");

 private static readonly Dictionary<string, string> s_runtimePackVersions = new();

Expand DownExpand Up@@ -107,7 +107,6 @@ public BuildEnvironment()
 EnvVars["DOTNET_INSTALL_DIR"] = sdkForWorkloadPath;
 EnvVars["DOTNET_MULTILEVEL_LOOKUP"] = "0";
 EnvVars["DOTNET_SKIP_FIRST_TIME_EXPERIENCE"] = "1";
 EnvVars["MSBuildSDKsPath"] = string.Empty;
 EnvVars["PATH"] = $"{sdkForWorkloadPath}{Path.PathSeparator}{Environment.GetEnvironmentVariable("PATH")}";
 EnvVars["EM_WORKAROUND_PYTHON_BUG_34780"] = "1";

Expand DownExpand Up@@ -160,8 +159,5 @@ public string GetRuntimeNativeDir(string tfm = BuildTestBase.DefaultTargetFramew

 protected static string s_directoryBuildPropsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForLocal = File.ReadAllText(Path.Combine(TestDataPath, "Local.Directory.Build.targets"));

 protected static string s_directoryBuildPropsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.props"));
 protected static string s_directoryBuildTargetsForBlazorLocal = File.ReadAllText(Path.Combine(TestDataPath, "Blazor.Local.Directory.Build.targets"));
 }
}
Loading