diff --git a/Directory.Packages.props b/Directory.Packages.props
index 56664c00a..e1a2009d4 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -72,18 +72,18 @@
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/src/bunit/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs b/src/bunit/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs
index 2fb2abd73..a771cd259 100644
--- a/src/bunit/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs
+++ b/src/bunit/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs
@@ -1,6 +1,6 @@
-using Microsoft.AspNetCore.Components.Web.Virtualization;
using System.Diagnostics;
using System.Reflection;
+using Microsoft.AspNetCore.Components.Web.Virtualization;
namespace Bunit.JSInterop.InvocationHandlers.Implementation;
@@ -35,10 +35,15 @@ internal VirtualizeJSRuntimeInvocationHandler()
///
protected internal override Task HandleAsync(JSRuntimeInvocation invocation)
{
- if (!invocation.Identifier.Equals(JsFunctionsPrefix + "dispose", StringComparison.Ordinal))
+ if (!invocation.Identifier.Equals(JsFunctionsPrefix + "dispose", StringComparison.Ordinal) &&
+ !invocation.Identifier.Equals(JsFunctionsPrefix + "refreshObservers", StringComparison.Ordinal))
{
Debug.Assert(invocation.Identifier.Equals(JsFunctionsPrefix + "init", StringComparison.Ordinal));
+#if NET11_0_OR_GREATER
+ Debug.Assert(invocation.Arguments.Count == 4);
+#else
Debug.Assert(invocation.Arguments.Count == 3);
+#endif
Debug.Assert(invocation.Arguments[0] is not null);
InvokeOnSpacerBeforeVisible(invocation.Arguments[0]!);
@@ -58,7 +63,12 @@ private static void InvokeOnSpacerBeforeVisible(object dotNetObjectReference)
0f, /* spacerSize */
0f, /* spacerSeparation */
1_000_000_000f, /* containerSize - very large number to ensure all items are loaded at once */
+#if NET11_0_OR_GREATER
+ 0, /* UserScroll */
+#endif
+
};
+
onSpacerBeforeVisibleMethodInfo.Invoke(virtualizeJsInterop, parameters);
}
}
diff --git a/tests/Directory.Build.props b/tests/Directory.Build.props
index cf491ca78..0b5093695 100644
--- a/tests/Directory.Build.props
+++ b/tests/Directory.Build.props
@@ -14,9 +14,9 @@
true
Exe
-
+
-
diff --git a/tests/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor b/tests/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor
index d889342d0..3fd2357d4 100644
--- a/tests/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor
+++ b/tests/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor
@@ -3,30 +3,30 @@
@inject AuthenticationStateProvider AuthenticationStateProvider
- Authorized!
- Name: @userName
- @if (hasUserEmail)
- {
- Email: @userEmail
- }
- @if (hasUserId)
- {
- Id: @userId
- }
+ Authorized!
+ Name: @userName
+ @if (hasUserEmail)
+ {
+ Email: @userEmail
+ }
+ @if (hasUserId)
+ {
+ Id: @userId
+ }
@code {
- string userName = "";
- string? userEmail = "";
- string? userId = "";
- bool hasUserEmail => userEmail != null;
- bool hasUserId => userId != null;
+ string userName = "";
+ string? userEmail = "";
+ string? userId = "";
+ bool hasUserEmail => userEmail != null;
+ bool hasUserId => userId != null;
- protected override async Task OnParametersSetAsync()
- {
- var state = await AuthenticationStateProvider.GetAuthenticationStateAsync();
- userName = state?.User?.Identity?.Name ?? string.Empty;
- userEmail = state?.User?.FindFirst(ClaimTypes.Email)?.Value;
- userId = state?.User?.FindFirst(ClaimTypes.Sid)?.Value;
- }
+ protected override async Task OnParametersSetAsync()
+ {
+ var state = await AuthenticationStateProvider.GetAuthenticationStateAsync();
+ userName = state?.User?.Identity?.Name ?? string.Empty;
+ userEmail = state?.User?.FindFirst(ClaimTypes.Email)?.Value;
+ userId = state?.User?.FindFirst(ClaimTypes.Sid)?.Value;
+ }
}
diff --git a/tests/bunit.testassets/SampleComponents/SimpleWithHttpClient.razor b/tests/bunit.testassets/SampleComponents/SimpleWithHttpClient.razor
index b3ec30bf0..97468e805 100644
--- a/tests/bunit.testassets/SampleComponents/SimpleWithHttpClient.razor
+++ b/tests/bunit.testassets/SampleComponents/SimpleWithHttpClient.razor
@@ -1,4 +1,4 @@
-@inject HttpClient HttpClient
+@inject HttpClient HttpClient
SimpleWithHttpClient
@@ -7,6 +7,5 @@
protected override async Task OnInitializedAsync()
{
await HttpClient.GetAsync("/api/weather");
- StateHasChanged();
}
}
diff --git a/tests/bunit.testassets/SampleComponents/SimpleWithJSRuntimeDep.razor b/tests/bunit.testassets/SampleComponents/SimpleWithJSRuntimeDep.razor
index 4c8f6d1d0..c6f15920c 100644
--- a/tests/bunit.testassets/SampleComponents/SimpleWithJSRuntimeDep.razor
+++ b/tests/bunit.testassets/SampleComponents/SimpleWithJSRuntimeDep.razor
@@ -1,6 +1,6 @@
-@inject IJSRuntime jsRuntime
+@inject IJSRuntime jsRuntime
@name
-@code{
+@code {
string name = string.Empty;
protected override async Task OnAfterRenderAsync(bool firstRender)
@@ -11,4 +11,4 @@
StateHasChanged();
}
}
-}
\ No newline at end of file
+}
diff --git a/tests/bunit.testassets/bunit.testassets.csproj b/tests/bunit.testassets/bunit.testassets.csproj
index 305d09964..b8d28daec 100644
--- a/tests/bunit.testassets/bunit.testassets.csproj
+++ b/tests/bunit.testassets/bunit.testassets.csproj
@@ -1,4 +1,4 @@
-
+
net8.0;net9.0;net10.0;net11.0
diff --git a/tests/bunit.tests/bunit.tests.csproj b/tests/bunit.tests/bunit.tests.csproj
index 638453b1a..93b44ce54 100644
--- a/tests/bunit.tests/bunit.tests.csproj
+++ b/tests/bunit.tests/bunit.tests.csproj
@@ -7,12 +7,12 @@
-
+
-
+
\ No newline at end of file