From b791bc4b025588b59fce37fad87cb345913c2e9d Mon Sep 17 00:00:00 2001
From: "dotnet-maestro[bot]"
<42748379+dotnet-maestro[bot]@users.noreply.github.com>
Date: Fri, 19 May 2023 13:13:18 +0000
Subject: [PATCH] [main] Update dependencies from dotnet/runtime (#48323)
[main] Update dependencies from dotnet/runtime
- Fix E2E tests to expect .wasm files instead of .dll files
- Fix BootResourceCachingTest.IncrementallyUpdatesCach
---
eng/Version.Details.xml | 248 +++++++++---------
eng/Versions.props | 124 ++++-----
.../E2ETest/Tests/BootResourceCachingTest.cs | 11 +-
.../E2ETest/Tests/WebAssemblyLazyLoadTest.cs | 20 +-
.../BasicTestApp/BasicTestApp.csproj | 4 +-
.../TestRouterWithLazyAssembly.razor | 6 +-
6 files changed, 206 insertions(+), 207 deletions(-)
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
index dbf9dfa22253..f004e3f009e4 100644
--- a/eng/Version.Details.xml
+++ b/eng/Version.Details.xml
@@ -41,259 +41,259 @@
https://github.com/dotnet/efcore
6b973689970d0cd30a5b22fd1fe1a0650dfa1eb3
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
https://github.com/dotnet/source-build-externals
a1460948fd0a4ab66b885c1575b085af70139e9a
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
https://github.com/dotnet/xdt
@@ -326,9 +326,9 @@
-
+
https://github.com/dotnet/runtime
- 0096ba52e8c86e4d712013f6330a9b8a6496a1e0
+ 51d467ad5b52c8bc532e048840e51aa0247d5f88
https://github.com/dotnet/arcade
diff --git a/eng/Versions.props b/eng/Versions.props
index f0097c4c597c..8f4b7b2a5e27 100644
--- a/eng/Versions.props
+++ b/eng/Versions.props
@@ -63,69 +63,69 @@
-->
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
- 8.0.0-preview.5.23268.1
- 8.0.0-preview.5.23268.1
+ 8.0.0-preview.5.23268.13
+ 8.0.0-preview.5.23268.13
8.0.0-preview.5.23268.2
8.0.0-preview.5.23268.2
diff --git a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
index 39d31594da4a..5c16fb02d0fd 100644
--- a/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
+++ b/src/Components/test/E2ETest/Tests/BootResourceCachingTest.cs
@@ -45,10 +45,10 @@ public void CachesResourcesAfterFirstLoad()
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/blazor.boot.json", StringComparison.Ordinal)));
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/dotnet.native.wasm", StringComparison.Ordinal)));
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".js", StringComparison.Ordinal)));
- Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".dll", StringComparison.Ordinal)));
+ Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith(".wasm", StringComparison.Ordinal)));
// On subsequent loads, we skip the items referenced from blazor.boot.json
- // which includes .dll files and dotnet.native.wasm
+ // which includes .wasm (original .dll) files and dotnet.native.wasm
Navigate("about:blank");
Browser.Equal(string.Empty, () => Browser.Title);
Navigate("/");
@@ -57,7 +57,7 @@ public void CachesResourcesAfterFirstLoad()
Assert.NotEmpty(initialResourcesRequested.Where(path => path.EndsWith("/blazor.boot.json", StringComparison.Ordinal)));
Assert.Empty(subsequentResourcesRequested.Where(path => path.EndsWith("/dotnet.native.wasm", StringComparison.Ordinal)));
Assert.NotEmpty(subsequentResourcesRequested.Where(path => path.EndsWith(".js", StringComparison.Ordinal)));
- Assert.Empty(subsequentResourcesRequested.Where(path => path.EndsWith(".dll", StringComparison.Ordinal)));
+ Assert.Empty(subsequentResourcesRequested.Where(path => path.EndsWith(".wasm", StringComparison.Ordinal) && !path.EndsWith("/dotnet.native.wasm", StringComparison.Ordinal)));
}
[Fact]
@@ -67,7 +67,7 @@ public void IncrementallyUpdatesCache()
Navigate("/");
WaitUntilLoaded();
var cacheEntryUrls1 = GetCacheEntryUrls();
- var cacheEntryForComponentsDll = cacheEntryUrls1.Single(url => url.Contains("/Microsoft.AspNetCore.Components.dll"));
+ var cacheEntryForComponentsDll = cacheEntryUrls1.Single(url => url.Contains("/Microsoft.AspNetCore.Components.wasm"));
var cacheEntryForDotNetWasm = cacheEntryUrls1.Single(url => url.Contains("/dotnet.native.wasm"));
var cacheEntryForDotNetWasmWithChangedHash = cacheEntryForDotNetWasm.Replace(".sha256-", ".sha256-different");
@@ -87,9 +87,8 @@ public void IncrementallyUpdatesCache()
Navigate("/");
WaitUntilLoaded();
var subsequentResourcesRequested = GetAndClearRequestedPaths();
- Assert.Collection(subsequentResourcesRequested.Where(url => url.Contains(".dll")),
- requestedDll => Assert.Contains("/Microsoft.AspNetCore.Components.dll", requestedDll));
Assert.Collection(subsequentResourcesRequested.Where(url => url.Contains(".wasm")),
+ requestedDll => Assert.Contains("/Microsoft.AspNetCore.Components.wasm", requestedDll),
requestedDll => Assert.Contains("/dotnet.native.wasm", requestedDll));
// We also update the cache (add new items, remove unnecessary items)
diff --git a/src/Components/test/E2ETest/Tests/WebAssemblyLazyLoadTest.cs b/src/Components/test/E2ETest/Tests/WebAssemblyLazyLoadTest.cs
index 13affeeeceb5..1c2879efe6b5 100644
--- a/src/Components/test/E2ETest/Tests/WebAssemblyLazyLoadTest.cs
+++ b/src/Components/test/E2ETest/Tests/WebAssemblyLazyLoadTest.cs
@@ -39,7 +39,7 @@ public void CanLazyLoadOnRouteChange()
var app = Browser.MountTestComponent();
// Ensure that we haven't requested the lazy loaded assembly
- Assert.False(HasLoadedAssembly("Newtonsoft.Json.dll"));
+ Assert.False(HasLoadedAssembly("Newtonsoft.Json.wasm"));
// Visit the route for the lazy-loaded assembly
SetUrlViaPushState("/WithLazyAssembly");
@@ -47,7 +47,7 @@ public void CanLazyLoadOnRouteChange()
var button = Browser.Exists(By.Id("use-package-button"));
// Now we should have requested the DLL
- Assert.True(HasLoadedAssembly("Newtonsoft.Json.dll"));
+ Assert.True(HasLoadedAssembly("Newtonsoft.Json.wasm"));
button.Click();
@@ -66,7 +66,7 @@ public void CanLazyLoadOnFirstVisit()
var button = Browser.Exists(By.Id("use-package-button"));
// We should have requested the DLL
- Assert.True(HasLoadedAssembly("Newtonsoft.Json.dll"));
+ Assert.True(HasLoadedAssembly("Newtonsoft.Json.wasm"));
button.Click();
@@ -82,7 +82,7 @@ public void CanLazyLoadAssemblyWithRoutes()
var app = Browser.MountTestComponent();
// Ensure that we haven't requested the lazy loaded assembly or its PDB
- Assert.False(HasLoadedAssembly("LazyTestContentPackage.dll"));
+ Assert.False(HasLoadedAssembly("LazyTestContentPackage.wasm"));
Assert.False(HasLoadedAssembly("LazyTestContentPackage.pdb"));
// Navigate to the designated route
@@ -92,7 +92,7 @@ public void CanLazyLoadAssemblyWithRoutes()
Browser.Exists(By.Id("lazy-load-msg"));
// Now the assembly has been loaded
- Assert.True(HasLoadedAssembly("LazyTestContentPackage.dll"));
+ Assert.True(HasLoadedAssembly("LazyTestContentPackage.wasm"));
var button = Browser.Exists(By.Id("go-to-lazy-route"));
button.Click();
@@ -116,7 +116,7 @@ public void ThrowsErrorForUnavailableAssemblies()
var errorUiElem = Browser.Exists(By.Id("blazor-error-ui"), TimeSpan.FromSeconds(10));
Assert.NotNull(errorUiElem);
- AssertLogContainsCriticalMessages("DoesNotExist.dll must be marked with 'BlazorWebAssemblyLazyLoad' item group in your project file to allow lazy-loading.");
+ AssertLogContainsCriticalMessages("DoesNotExist.wasm must be marked with 'BlazorWebAssemblyLazyLoad' item group in your project file to allow lazy-loading.");
}
[Fact]
@@ -127,21 +127,21 @@ public void CanLazyLoadViaLinkChange()
var app = Browser.MountTestComponent();
// We start off with no lazy assemblies loaded
- Assert.False(HasLoadedAssembly("LazyTestContentPackage.dll"));
- Assert.False(HasLoadedAssembly("Newtonsoft.Json.dll"));
+ Assert.False(HasLoadedAssembly("LazyTestContentPackage.wasm"));
+ Assert.False(HasLoadedAssembly("Newtonsoft.Json.wasm"));
// Click the first link and verify that it worked as expected
var lazyAssemblyLink = Browser.Exists(By.Id("with-lazy-assembly"));
lazyAssemblyLink.Click();
var pkgButton = Browser.Exists(By.Id("use-package-button"));
- Assert.True(HasLoadedAssembly("Newtonsoft.Json.dll"));
+ Assert.True(HasLoadedAssembly("Newtonsoft.Json.wasm"));
pkgButton.Click();
// Navigate to the next page and verify that it loaded its assembly
var lazyRoutesLink = Browser.Exists(By.Id("with-lazy-routes"));
lazyRoutesLink.Click();
Browser.Exists(By.Id("lazy-load-msg"));
- Assert.True(HasLoadedAssembly("LazyTestContentPackage.dll"));
+ Assert.True(HasLoadedAssembly("LazyTestContentPackage.wasm"));
// Interact with that assembly to ensure it was loaded properly
var button = Browser.Exists(By.Id("go-to-lazy-route"));
diff --git a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
index 26ecf2993b52..2b34d11f8103 100644
--- a/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
+++ b/src/Components/test/testassets/BasicTestApp/BasicTestApp.csproj
@@ -41,8 +41,8 @@
-
-
+
+
diff --git a/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithLazyAssembly.razor b/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithLazyAssembly.razor
index bb7eb780575b..cf0764190b59 100644
--- a/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithLazyAssembly.razor
+++ b/src/Components/test/testassets/BasicTestApp/RouterTest/TestRouterWithLazyAssembly.razor
@@ -35,20 +35,20 @@
if (uri.EndsWith("WithLazyAssembly"))
{
Console.WriteLine($"Loading assemblies for WithLazyAssembly...");
- var assemblies = await lazyLoader.LoadAssembliesAsync(new List() { "Newtonsoft.Json.dll" });
+ var assemblies = await lazyLoader.LoadAssembliesAsync(new List() { "Newtonsoft.Json.wasm" });
lazyLoadedAssemblies.AddRange(assemblies);
}
if (uri.EndsWith("WithLazyLoadedRoutes"))
{
Console.WriteLine($"Loading assemblies for WithLazyLoadedRoutes...");
- var assemblies = await lazyLoader.LoadAssembliesAsync(new List() { "LazyTestContentPackage.dll" });
+ var assemblies = await lazyLoader.LoadAssembliesAsync(new List() { "LazyTestContentPackage.wasm" });
lazyLoadedAssemblies.AddRange(assemblies);
}
if (uri.EndsWith("Other")) {
Console.WriteLine($"Loading assemblies for Other...");
- var assemblies = await lazyLoader.LoadAssembliesAsync(new List() { "DoesNotExist.dll" });
+ var assemblies = await lazyLoader.LoadAssembliesAsync(new List() { "DoesNotExist.wasm" });
lazyLoadedAssemblies.AddRange(assemblies);
}
}