Skip to content

Alter InvokeOnSpacerBeforeVisible for NET 11.0 so it uses 4 parameters #1919

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
linkdotnet merged 6 commits into from
Sep 13, 2026
Merged

Alter InvokeOnSpacerBeforeVisible for NET 11.0 so it uses 4 parameters #1919

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
be53d52
Alter InvokeOnSpacerBeforeVisible for NET 11.0 so it uses 4 parameter…
vnbaaij Sep 9, 2026
742be77
- Use xunit.v3.mtp-v2
vnbaaij Sep 9, 2026
5129e63
Fix BL0013 errors
vnbaaij Sep 9, 2026
f8c1ddf
- Surpress BL0013 and BL0016 errors for this PR. Can be solved in a l…
vnbaaij Sep 10, 2026
5839730
Revert back to solving only the issue descibed. The rest will be hand…
vnbaaij Sep 13, 2026
98c12b7
More undos
vnbaaij Sep 13, 2026
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
24 changes: 12 additions & 12 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,18 @@
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net11.0'">
<PackageVersion Include="Microsoft.Extensions.Logging" Version="11.0.0-preview.6.26359.118"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="11.0.0-preview.6.26359.118"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="11.0.0-preview.6.26359.118"/>

<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="11.0.0-preview.6.26359.118"/>
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="11.0.0-preview.6.26359.118"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="11.0.0-preview.6.26359.118"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="11.0.0-preview.6.26359.118"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="11.0.0-preview.6.26359.118"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="11.0.0-preview.6.26359.118"/>

<PackageVersion Include="System.Text.Json" Version="11.0.0-preview.6.26359.118"/>
<PackageVersion Include="Microsoft.Extensions.Logging" Version="11.0.0-rc.1.26425.128"/>
<PackageVersion Include="Microsoft.Extensions.Logging.Abstractions" Version="11.0.0-rc.1.26425.128"/>
<PackageVersion Include="Microsoft.AspNetCore.Components" Version="11.0.0-rc.1.26425.128"/>

<PackageVersion Include="Microsoft.AspNetCore.Components.Authorization" Version="11.0.0-rc.1.26425.128"/>
<PackageVersion Include="Microsoft.Extensions.Localization.Abstractions" Version="11.0.0-rc.1.26425.128"/>
<PackageVersion Include="Microsoft.Extensions.Caching.Memory" Version="11.0.0-rc.1.26425.128"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.Web" Version="11.0.0-rc.1.26425.128"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly" Version="11.0.0-rc.1.26425.128"/>
<PackageVersion Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="11.0.0-rc.1.26425.128"/>

<PackageVersion Include="System.Text.Json" Version="11.0.0-rc.1.26425.128"/>
</ItemGroup>

<ItemGroup Label="Test Dependencies">
Expand Down
14 changes: 12 additions & 2 deletions ...bunit/JSInterop/InvocationHandlers/Implementation/VirtualizeJSRuntimeInvocationHandler.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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;

Expand Down Expand Up @@ -35,10 +35,15 @@ internal VirtualizeJSRuntimeInvocationHandler()
/// <inheritdoc/>
protected internal override Task<Microsoft.JSInterop.Infrastructure.IJSVoidResult> 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]!);
Expand All @@ -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 <see cref="SpacerVisibilityReason" /> */
#endif
Comment thread
vnbaaij marked this conversation as resolved.

};

onSpacerBeforeVisibleMethodInfo.Invoke(virtualizeJsInterop, parameters);
}
}
4 changes: 2 additions & 2 deletions tests/Directory.Build.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
<OutputType>Exe</OutputType>
</PropertyGroup>

<PropertyGroup>
<!--
<!--
Because of a CVE in System.Text.Json we get NU1903.
As this is a test project, we can ignore this warning for the time being.
-->
Expand Down
44 changes: 22 additions & 22 deletions tests/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,30 +3,30 @@
@inject AuthenticationStateProvider AuthenticationStateProvider

<AuthorizeView>
<div>Authorized!</div>
<div>Name: @userName</div>
@if (hasUserEmail)
{
<div>Email: @userEmail</div>
}
@if (hasUserId)
{
<div>Id: @userId</div>
}
<div>Authorized!</div>
<div>Name: @userName</div>
@if (hasUserEmail)
{
<div>Email: @userEmail</div>
}
@if (hasUserId)
{
<div>Id: @userId</div>
}
</AuthorizeView>

@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();

Check failure on line 27 in tests/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor

View workflow job for this annotation

GitHub Actions / run-test (macos-latest) 

'SimpleAuthViewWithClaims' calls GetAuthenticationStateAsync on AuthenticationStateProvider without subscribing to the AuthenticationStateChanged event. This may result in using stale authentication state.

Check failure on line 27 in tests/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor

View workflow job for this annotation

GitHub Actions / run-test (windows-latest) 

'SimpleAuthViewWithClaims' calls GetAuthenticationStateAsync on AuthenticationStateProvider without subscribing to the AuthenticationStateChanged event. This may result in using stale authentication state.

Check failure on line 27 in tests/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor

View workflow job for this annotation

GitHub Actions / validate-docs 

'SimpleAuthViewWithClaims' calls GetAuthenticationStateAsync on AuthenticationStateProvider without subscribing to the AuthenticationStateChanged event. This may result in using stale authentication state.

Check failure on line 27 in tests/bunit.testassets/SampleComponents/SimpleAuthViewWithClaims.razor

View workflow job for this annotation

GitHub Actions / run-test (ubuntu-latest) 

'SimpleAuthViewWithClaims' calls GetAuthenticationStateAsync on AuthenticationStateProvider without subscribing to the AuthenticationStateChanged event. This may result in using stale authentication state.
userName = state?.User?.Identity?.Name ?? string.Empty;
userEmail = state?.User?.FindFirst(ClaimTypes.Email)?.Value;
userId = state?.User?.FindFirst(ClaimTypes.Sid)?.Value;
}
}
3 changes: 1 addition & 2 deletions tests/bunit.testassets/SampleComponents/SimpleWithHttpClient.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
@inject HttpClient HttpClient
@inject HttpClient HttpClient


<h3>SimpleWithHttpClient</h3>
Expand All @@ -7,6 +7,5 @@
protected override async Task OnInitializedAsync()
{
await HttpClient.GetAsync("/api/weather");
StateHasChanged();
}
}
6 changes: 3 additions & 3 deletions tests/bunit.testassets/SampleComponents/SimpleWithJSRuntimeDep.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
@inject IJSRuntime jsRuntime
@inject IJSRuntime jsRuntime
<p>@name</p>
@code{
@code {
string name = string.Empty;

protected override async Task OnAfterRenderAsync(bool firstRender)
{
if (firstRender)
{
name = await jsRuntime.InvokeAsync<string>("getdata");

Check failure on line 10 in tests/bunit.testassets/SampleComponents/SimpleWithJSRuntimeDep.razor

View workflow job for this annotation

GitHub Actions / run-test (macos-latest) 

JS interop call 'InvokeAsync' is not guarded with a try/catch block.

Check failure on line 10 in tests/bunit.testassets/SampleComponents/SimpleWithJSRuntimeDep.razor

View workflow job for this annotation

GitHub Actions / run-test (windows-latest) 

JS interop call 'InvokeAsync' is not guarded with a try/catch block.

Check failure on line 10 in tests/bunit.testassets/SampleComponents/SimpleWithJSRuntimeDep.razor

View workflow job for this annotation

GitHub Actions / validate-docs 

JS interop call 'InvokeAsync' is not guarded with a try/catch block.

Check failure on line 10 in tests/bunit.testassets/SampleComponents/SimpleWithJSRuntimeDep.razor

View workflow job for this annotation

GitHub Actions / run-test (ubuntu-latest) 

JS interop call 'InvokeAsync' is not guarded with a try/catch block.
StateHasChanged();
}
}
}
}
2 changes: 1 addition & 1 deletion tests/bunit.testassets/bunit.testassets.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<Project Sdk="Microsoft.NET.Sdk.Razor">
<Project Sdk="Microsoft.NET.Sdk.Razor">

<PropertyGroup>
<TargetFrameworks>net8.0;net9.0;net10.0;net11.0</TargetFrameworks>
Expand Down
4 changes: 2 additions & 2 deletions tests/bunit.tests/bunit.tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\src\bunit\bunit.csproj" />
<ProjectReference Include="..\..\src\bunit\bunit.csproj" />
<ProjectReference Include="..\bunit.testassets\bunit.testassets.csproj" />
</ItemGroup>

<ItemGroup>
<Content Include="../xunit.runner.json" CopyToOutputDirectory="PreserveNewest" />
</ItemGroup>

</Project>
Loading