Skip to content

Unskip Blazor Integration Tests #22945

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.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 9, 2021
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 2 additions & 1 deletion src/BlazorWasmSdk/Tasks/ComputeBlazorBuildAssets.cs
Original file line number Diff line number Diff line change
Expand Up @@ -278,7 +278,8 @@ public static bool ShouldFilterCandidate(
".props" when fromMonoPackage => "extension is .props is not supported.",
".blat" when !timezoneSupport => "timezone support is not enabled.",
".dat" when invariantGlobalization && fileName.StartsWith("icudt") => "invariant globalization is enabled",
".json" when fromMonoPackage && fileName == "emcc-props" => $"{fileName}{extension} is not used by Blazor",
".json" when fromMonoPackage && (fileName == "emcc-props" || fileName == "package") => $"{fileName}{extension} is not used by Blazor",
".ts" when fromMonoPackage && fileName == "dotnet.d" => "dotnet type definition is not used by Blazor",
".js" when assetType == "native" && fileName != "dotnet" => $"{fileName}{extension} is not used by Blazor",
".pdb" when !copySymbols => "copying symbols is disabled",
_ => null
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ public BlazorWasmStaticWebAssetsIntegrationTest(ITestOutputHelper log) : base(lo
DotNet5JSTemplate = $"dotnet.{RuntimeVersion}.js";
}

[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/38844")]
[Fact]
public void StaticWebAssets_BuildMinimal_Works()
{
// Arrange
Expand Down Expand Up @@ -90,7 +90,7 @@ public void StaticWebAssets_PublishMinimal_Works()
intermediateOutputPath);
}

[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/38844")]
[Fact]
public void StaticWebAssets_Build_Hosted_Works()
{
// Arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -432,7 +432,7 @@ public void Build_Hosted_Works()
new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "_bin", "blazorwasm.dll")).Should().NotExist();
}

[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/38844")]
[Fact]
public void Build_SatelliteAssembliesAreCopiedToBuildOutput()
{
// Arrange
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public WasmJsModulesIntegrationTests(ITestOutputHelper log) : base(log, Generate
{
}

[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/38844")]
[Fact]
public void Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonManifest()
{
// Arrange
Expand Down Expand Up @@ -53,7 +53,7 @@ public void Build_DoesNotGenerateManifestJson_IncludesJSModulesOnBlazorBootJsonM
new FileInfo(Path.Combine(outputPath, "wwwroot", "blazorwasm-minimal.modules.json")).Should().NotExist();
}

[Fact(Skip = "https://github.com/dotnet/aspnetcore/issues/38844")]
[Fact]
public void JSModules_ManifestIncludesModuleTargetPaths()
{
// Arrange
Expand Down