Skip to content

Commit 68bf4cb

Browse files
maraflewing
andauthored
[wasm] Enable previously disabled tests (#43073)
Co-authored-by: Larry Ewing <[email protected]>
1 parent e8d9057 commit 68bf4cb

File tree

4 files changed

+187
-4
lines changed

4 files changed

+187
-4
lines changed

test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.files.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@
8383
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.IO.Pipes.wasm",
8484
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.IO.UnmanagedMemoryStream.wasm",
8585
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.IO.wasm",
86+
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Linq.AsyncEnumerable.wasm",
8687
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Linq.Expressions.wasm",
8788
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Linq.Parallel.wasm",
8889
"${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Linq.Queryable.wasm",
@@ -321,6 +322,7 @@
321322
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.IO.Pipes.wasm.gz",
322323
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.IO.UnmanagedMemoryStream.wasm.gz",
323324
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.IO.wasm.gz",
325+
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Linq.AsyncEnumerable.wasm.gz",
324326
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Linq.Expressions.wasm.gz",
325327
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Linq.Parallel.wasm.gz",
326328
"${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Linq.Queryable.wasm.gz",
@@ -647,6 +649,8 @@
647649
"${OutputPath}\\wwwroot\\_framework\\System.IO.UnmanagedMemoryStream.wasm.gz",
648650
"${OutputPath}\\wwwroot\\_framework\\System.IO.wasm",
649651
"${OutputPath}\\wwwroot\\_framework\\System.IO.wasm.gz",
652+
"${OutputPath}\\wwwroot\\_framework\\System.Linq.AsyncEnumerable.wasm",
653+
"${OutputPath}\\wwwroot\\_framework\\System.Linq.AsyncEnumerable.wasm.gz",
650654
"${OutputPath}\\wwwroot\\_framework\\System.Linq.Expressions.wasm",
651655
"${OutputPath}\\wwwroot\\_framework\\System.Linq.Expressions.wasm.gz",
652656
"${OutputPath}\\wwwroot\\_framework\\System.Linq.Parallel.wasm",

test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/StaticWebAssetsBaselines/Build_SatelliteAssembliesAreCopiedToBuildOutput.Build.staticwebassets.json

Lines changed: 180 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1852,6 +1852,27 @@
18521852
"CopyToPublishDirectory": "Never",
18531853
"OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\System.IO.wasm"
18541854
},
1855+
{
1856+
"Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Linq.AsyncEnumerable.wasm",
1857+
"SourceId": "blazorwasm",
1858+
"SourceType": "Computed",
1859+
"ContentRoot": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\",
1860+
"BasePath": "/",
1861+
"RelativePath": "_framework/System.Linq.AsyncEnumerable.wasm",
1862+
"AssetKind": "Build",
1863+
"AssetMode": "All",
1864+
"AssetRole": "Primary",
1865+
"AssetMergeBehavior": "",
1866+
"AssetMergeSource": "",
1867+
"RelatedAsset": "",
1868+
"AssetTraitName": "WasmResource",
1869+
"AssetTraitValue": "runtime",
1870+
"Fingerprint": "__fingerprint__",
1871+
"Integrity": "__integrity__",
1872+
"CopyToOutputDirectory": "PreserveNewest",
1873+
"CopyToPublishDirectory": "Never",
1874+
"OriginalItemSpec": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\webcil\\System.Linq.AsyncEnumerable.wasm"
1875+
},
18551876
{
18561877
"Identity": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Linq.Expressions.wasm",
18571878
"SourceId": "blazorwasm",
@@ -6871,6 +6892,27 @@
68716892
"CopyToPublishDirectory": "Never",
68726893
"OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\System.IO.wasm.gz"
68736894
},
6895+
{
6896+
"Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Linq.AsyncEnumerable.wasm.gz",
6897+
"SourceId": "blazorwasm",
6898+
"SourceType": "Computed",
6899+
"ContentRoot": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\",
6900+
"BasePath": "/",
6901+
"RelativePath": "_framework/System.Linq.AsyncEnumerable.wasm.gz",
6902+
"AssetKind": "Build",
6903+
"AssetMode": "All",
6904+
"AssetRole": "Alternative",
6905+
"AssetMergeBehavior": "",
6906+
"AssetMergeSource": "",
6907+
"RelatedAsset": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Linq.AsyncEnumerable.wasm",
6908+
"AssetTraitName": "Content-Encoding",
6909+
"AssetTraitValue": "gzip",
6910+
"Fingerprint": "__fingerprint__",
6911+
"Integrity": "__integrity__",
6912+
"CopyToOutputDirectory": "PreserveNewest",
6913+
"CopyToPublishDirectory": "Never",
6914+
"OriginalItemSpec": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\_framework\\System.Linq.AsyncEnumerable.wasm.gz"
6915+
},
68746916
{
68756917
"Identity": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Linq.Expressions.wasm.gz",
68766918
"SourceId": "blazorwasm",
@@ -13604,6 +13646,43 @@
1360413646
}
1360513647
]
1360613648
},
13649+
{
13650+
"Route": "_framework/System.Linq.AsyncEnumerable.wasm",
13651+
"AssetFile": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Linq.AsyncEnumerable.wasm",
13652+
"Selectors": [],
13653+
"ResponseHeaders": [
13654+
{
13655+
"Name": "Accept-Ranges",
13656+
"Value": "bytes"
13657+
},
13658+
{
13659+
"Name": "Cache-Control",
13660+
"Value": "no-cache"
13661+
},
13662+
{
13663+
"Name": "Content-Length",
13664+
"Value": "__content-length__"
13665+
},
13666+
{
13667+
"Name": "Content-Type",
13668+
"Value": "application/wasm"
13669+
},
13670+
{
13671+
"Name": "ETag",
13672+
"Value": "__etag__"
13673+
},
13674+
{
13675+
"Name": "Last-Modified",
13676+
"Value": "__last-modified__"
13677+
}
13678+
],
13679+
"EndpointProperties": [
13680+
{
13681+
"Name": "integrity",
13682+
"Value": "__integrity__"
13683+
}
13684+
]
13685+
},
1360713686
{
1360813687
"Route": "_framework/System.Linq.Expressions.wasm",
1360913688
"AssetFile": "${ProjectPath}\\blazorwasm\\bin\\Debug\\${Tfm}\\wwwroot\\_framework\\System.Linq.Expressions.wasm",
@@ -27802,6 +27881,106 @@
2780227881
}
2780327882
]
2780427883
},
27884+
{
27885+
"Route": "_framework/System.Linq.AsyncEnumerable.wasm.gz",
27886+
"AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Linq.AsyncEnumerable.wasm.gz",
27887+
"Selectors": [],
27888+
"ResponseHeaders": [
27889+
{
27890+
"Name": "Accept-Ranges",
27891+
"Value": "bytes"
27892+
},
27893+
{
27894+
"Name": "Cache-Control",
27895+
"Value": "no-cache"
27896+
},
27897+
{
27898+
"Name": "Content-Encoding",
27899+
"Value": "gzip"
27900+
},
27901+
{
27902+
"Name": "Content-Length",
27903+
"Value": "__content-length__"
27904+
},
27905+
{
27906+
"Name": "Content-Type",
27907+
"Value": "application/wasm"
27908+
},
27909+
{
27910+
"Name": "ETag",
27911+
"Value": "__etag__"
27912+
},
27913+
{
27914+
"Name": "Last-Modified",
27915+
"Value": "__last-modified__"
27916+
},
27917+
{
27918+
"Name": "Vary",
27919+
"Value": "Content-Encoding"
27920+
}
27921+
],
27922+
"EndpointProperties": [
27923+
{
27924+
"Name": "integrity",
27925+
"Value": "__integrity__"
27926+
}
27927+
]
27928+
},
27929+
{
27930+
"Route": "_framework/System.Linq.AsyncEnumerable.wasm",
27931+
"AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Linq.AsyncEnumerable.wasm.gz",
27932+
"Selectors": [
27933+
{
27934+
"Name": "Content-Encoding",
27935+
"Value": "gzip",
27936+
"Quality": "__quality__"
27937+
}
27938+
],
27939+
"ResponseHeaders": [
27940+
{
27941+
"Name": "Accept-Ranges",
27942+
"Value": "bytes"
27943+
},
27944+
{
27945+
"Name": "Cache-Control",
27946+
"Value": "no-cache"
27947+
},
27948+
{
27949+
"Name": "Content-Encoding",
27950+
"Value": "gzip"
27951+
},
27952+
{
27953+
"Name": "Content-Length",
27954+
"Value": "__content-length__"
27955+
},
27956+
{
27957+
"Name": "Content-Type",
27958+
"Value": "application/wasm"
27959+
},
27960+
{
27961+
"Name": "ETag",
27962+
"Value": "__etag__"
27963+
},
27964+
{
27965+
"Name": "ETag",
27966+
"Value": "__etag__"
27967+
},
27968+
{
27969+
"Name": "Last-Modified",
27970+
"Value": "__last-modified__"
27971+
},
27972+
{
27973+
"Name": "Vary",
27974+
"Value": "Content-Encoding"
27975+
}
27976+
],
27977+
"EndpointProperties": [
27978+
{
27979+
"Name": "integrity",
27980+
"Value": "__integrity__"
27981+
}
27982+
]
27983+
},
2780527984
{
2780627985
"Route": "_framework/System.Linq.Expressions.wasm.gz",
2780727986
"AssetFile": "${ProjectPath}\\blazorwasm\\obj\\Debug\\${Tfm}\\compressed\\_framework\\System.Linq.Expressions.wasm.gz",
@@ -40225,7 +40404,7 @@
4022540404
},
4022640405
{
4022740406
"Name": "Content-Type",
40228-
"Value": "application/x-gzip"
40407+
"Value": "text/plain"
4022940408
},
4023040409
{
4023140410
"Name": "ETag",

test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmBuildIntegrationTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -562,7 +562,7 @@ public void Build_Hosted_Works()
562562
new FileInfo(Path.Combine(buildOutputDirectory, "wwwroot", "_framework", "_bin", "blazorwasm.wasm")).Should().NotExist();
563563
}
564564

565-
[Fact(Skip = "https://github.com/dotnet/runtime/issues/105399")]
565+
[Fact]
566566
public void Build_SatelliteAssembliesAreCopiedToBuildOutput()
567567
{
568568
// Arrange

test/Microsoft.NET.Sdk.BlazorWebAssembly.Tests/WasmPublishIntegrationTest.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -522,7 +522,7 @@ public void Publish_WithTrimmingdDisabled_Works()
522522
VerifyAssemblyHasTypes(loggingAssemblyPath, new[] { "Microsoft.Extensions.Logging.Abstractions.NullLogger" });
523523
}
524524

525-
[Fact(Skip = "https://github.com/dotnet/runtime/issues/105399")]
525+
[Fact]
526526
public void Publish_SatelliteAssemblies_AreCopiedToBuildOutput()
527527
{
528528
// Arrange
@@ -1128,7 +1128,7 @@ public void Publish_HostedAppWithScopedCss_VisualStudio()
11281128

11291129
// Regression test to verify satellite assemblies from the blazor app are copied to the published app's wwwroot output directory as
11301130
// part of publishing in VS
1131-
[Fact(Skip = "https://github.com/dotnet/runtime/issues/105399")]
1131+
[Fact]
11321132
public void Publish_HostedApp_VisualStudio_WithSatelliteAssemblies()
11331133
{
11341134
var testAppName = "BlazorWasmWithLibrary";

0 commit comments

Comments
 (0)