Merge remote-tracking branch 'origin/main' into mbuck/passkey-api-follow-ups

MackinnonBuck · MackinnonBuck · commit d23df367fd34 · 2025-07-10T16:03:18.000-04:00
diff --git a/AspNetCore.slnx b/AspNetCore.slnx
@@ -1143,20 +1143,10 @@
     <Project Path="src/SignalR/server/StackExchangeRedis/src/Microsoft.AspNetCore.SignalR.StackExchangeRedis.csproj" />
     <Project Path="src/SignalR/server/StackExchangeRedis/test/Microsoft.AspNetCore.SignalR.StackExchangeRedis.Tests.csproj" />
   </Folder>
-  <Folder Name="/src/SiteExtensions/">
-    <Project Path="src/SiteExtensions/LoggingBranch/LB.csproj" />
-  </Folder>
-  <Folder Name="/src/SiteExtensions/LoggingAggregate/">
-    <Project Path="src/SiteExtensions/LoggingAggregate/src/Microsoft.AspNetCore.AzureAppServices.SiteExtension/Microsoft.AspNetCore.AzureAppServices.SiteExtension.csproj" />
-    <Project Path="src/SiteExtensions/LoggingAggregate/test/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests/Microsoft.AspNetCore.AzureAppServices.SiteExtension.Tests.csproj" />
-  </Folder>
   <Folder Name="/src/SiteExtensions/Microsoft.Web.Xdt.Extensions/">
     <Project Path="src/SiteExtensions/Microsoft.Web.Xdt.Extensions/src/Microsoft.Web.Xdt.Extensions.csproj" />
     <Project Path="src/SiteExtensions/Microsoft.Web.Xdt.Extensions/tests/Microsoft.Web.Xdt.Extensions.Tests.csproj" />
   </Folder>
-  <Folder Name="/src/SiteExtensions/Sdk/">
-    <Project Path="src/SiteExtensions/Sdk/HostingStartup/HostingStartup.csproj" />
-  </Folder>
   <Folder Name="/src/Testing/">
     <Project Path="src/Analyzers/Microsoft.AspNetCore.Analyzer.Testing/src/Microsoft.AspNetCore.Analyzer.Testing.csproj" />
   </Folder>
@@ -1227,6 +1217,7 @@
   <Project Path="src/Caching/perf/MicroBenchmarks/Microsoft.Extensions.Caching.MicroBenchmarks/Microsoft.Extensions.Caching.MicroBenchmarks.csproj" />
   <Project Path="src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter/src/Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter.csproj" />
   <Project Path="src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Microsoft.AspNetCore.Components.QuickGrid.csproj" />
+  <Project Path="src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/Microsoft.AspNetCore.Components.QuickGrid.Tests.csproj" />
   <Project Path="src/Components/WebView/test/E2ETest/Microsoft.AspNetCore.Components.WebViewE2E.Test.csproj" />
   <Project Path="src/DataProtection/samples/KeyManagementSimulator/KeyManagementSimulator.csproj" />
   <Project Path="src/Framework/AspNetCoreAnalyzers/samples/WebAppSample/WebAppSample.csproj" />
diff --git a/eng/Version.Details.xml b/eng/Version.Details.xml
diff --git a/eng/Versions.props b/eng/Versions.props
diff --git a/global.json b/global.json
@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "10.0.100-preview.6.25315.102"
+    "version": "10.0.100-preview.7.25322.101"
   },
   "tools": {
-    "dotnet": "10.0.100-preview.6.25315.102",
+    "dotnet": "10.0.100-preview.7.25322.101",
     "runtimes": {
       "dotnet/x86": [
         "$(MicrosoftInternalRuntimeAspNetCoreTransportVersion)"
@@ -27,9 +27,9 @@
     "jdk": "latest"
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25351.105",
-    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25351.105",
-    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25351.105",
+    "Microsoft.DotNet.Arcade.Sdk": "10.0.0-beta.25358.102",
+    "Microsoft.DotNet.Helix.Sdk": "10.0.0-beta.25358.102",
+    "Microsoft.DotNet.SharedFramework.Sdk": "10.0.0-beta.25358.102",
     "Microsoft.Build.NoTargets": "3.7.0",
     "Microsoft.Build.Traversal": "3.4.0"
   }
diff --git a/src/Components/Components.slnf b/src/Components/Components.slnf
@@ -19,6 +19,7 @@
       "src\\Components\\Forms\\test\\Microsoft.AspNetCore.Components.Forms.Tests.csproj",
       "src\\Components\\QuickGrid\\Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter\\src\\Microsoft.AspNetCore.Components.QuickGrid.EntityFrameworkAdapter.csproj",
       "src\\Components\\QuickGrid\\Microsoft.AspNetCore.Components.QuickGrid\\src\\Microsoft.AspNetCore.Components.QuickGrid.csproj",
+      "src\\Components\\QuickGrid\\Microsoft.AspNetCore.Components.QuickGrid\\test\\Microsoft.AspNetCore.Components.QuickGrid.Tests.csproj",
       "src\\Components\\Samples\\BlazorServerApp\\BlazorServerApp.csproj",
       "src\\Components\\Samples\\BlazorUnitedApp.Client\\BlazorUnitedApp.Client.csproj",
       "src\\Components\\Samples\\BlazorUnitedApp\\BlazorUnitedApp.csproj",
diff --git a/src/Components/Components/src/PersistentStateValueProvider.cs b/src/Components/Components/src/PersistentStateValueProvider.cs
@@ -19,7 +19,7 @@ internal sealed class PersistentStateValueProvider(PersistentComponentState stat
 {
     private static readonly ConcurrentDictionary<(string, string, string), byte[]> _keyCache = new();
     private static readonly ConcurrentDictionary<(Type, string), PropertyGetter> _propertyGetterCache = new();
-    private readonly ConcurrentDictionary<Type, IPersistentComponentStateSerializer?> _serializerCache = new();
+    private static readonly ConcurrentDictionary<Type, IPersistentComponentStateSerializer?> _serializerCache = new();
 
     private readonly Dictionary<ComponentState, PersistingComponentStateSubscription> _subscriptions = [];
 
diff --git a/src/Components/Endpoints/src/Forms/EndpointAntiforgeryStateProvider.cs b/src/Components/Endpoints/src/Forms/EndpointAntiforgeryStateProvider.cs
@@ -10,10 +10,12 @@ namespace Microsoft.AspNetCore.Components.Endpoints.Forms;
 internal class EndpointAntiforgeryStateProvider(IAntiforgery antiforgery) : DefaultAntiforgeryStateProvider()
 {
     private HttpContext? _context;
+    private bool _canGenerateToken;
 
     internal void SetRequestContext(HttpContext context)
     {
         _context = context;
+        _canGenerateToken = true;
     }
 
     public override AntiforgeryRequestToken? GetAntiforgeryToken()
@@ -24,17 +26,23 @@ internal void SetRequestContext(HttpContext context)
             return _currentToken;
         }
 
-        // We already have a callback setup to generate the token when the response starts if needed.
-        // If we need the tokens before we start streaming the response, we'll generate and store them;
-        // otherwise we'll just retrieve them.
-        // In case there are no tokens available, we are going to return null and no-op.
-        var tokens = !_context.Response.HasStarted ? antiforgery.GetAndStoreTokens(_context) : antiforgery.GetTokens(_context);
-        if (tokens.RequestToken is null)
+        if (_currentToken == null && _canGenerateToken)
         {
-            return null;
+            // We already have a callback setup to generate the token when the response starts if needed.
+            // If we need the tokens before we start streaming the response, we'll generate and store them;
+            // otherwise we'll just retrieve them.
+            // In case there are no tokens available, we are going to return null and no-op.
+            var tokens = !_context.Response.HasStarted ? antiforgery.GetAndStoreTokens(_context) : antiforgery.GetTokens(_context);
+            if (tokens.RequestToken is null)
+            {
+                return null;
+            }
+
+            _currentToken = new AntiforgeryRequestToken(tokens.RequestToken, tokens.FormFieldName);
         }
 
-        _currentToken = new AntiforgeryRequestToken(tokens.RequestToken, tokens.FormFieldName);
         return _currentToken;
     }
+
+    internal void DisableTokenGeneration() => _canGenerateToken = false;
 }
diff --git a/src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs b/src/Components/Endpoints/src/RazorComponentEndpointInvoker.cs
@@ -6,7 +6,9 @@
 using System.Text;
 using System.Text.Encodings.Web;
 using Microsoft.AspNetCore.Antiforgery;
+using Microsoft.AspNetCore.Components.Endpoints.Forms;
 using Microsoft.AspNetCore.Components.Endpoints.Rendering;
+using Microsoft.AspNetCore.Components.Forms;
 using Microsoft.AspNetCore.Components.Infrastructure;
 using Microsoft.AspNetCore.Diagnostics;
 using Microsoft.AspNetCore.Http;
@@ -76,14 +78,6 @@ private async Task RenderComponentCore(HttpContext context)
             return;
         }
 
-        context.Response.OnStarting(() =>
-        {
-            // Generate the antiforgery tokens before we start streaming the response, as it needs
-            // to set the cookie header.
-            antiforgery!.GetAndStoreTokens(context);
-            return Task.CompletedTask;
-        });
-
         if (httpActivityContext != default)
         {
             _activityLinkStore.SetActivityContext(ComponentsActivityLinkStore.Http, httpActivityContext, null);
@@ -143,8 +137,17 @@ await _renderer.InitializeStandardComponentServicesAsync(
             var bufferingFeature = context.Features.GetRequiredFeature<IHttpResponseBodyFeature>();
             bufferingFeature.DisableBuffering();
 
+            // Store the tokens if not emitted already in case we stream a form in the response.
+            antiforgery!.GetAndStoreTokens(context);
+
             context.Response.Headers.ContentEncoding = "identity";
         }
+        else if (endpoint.Metadata.GetMetadata<ConfiguredRenderModesMetadata>()?.ConfiguredRenderModes.Length == 0)
+        {
+            // Disable token generation on EndpointAntiforgeryStateProvider if we are not streaming.
+            var provider = (EndpointAntiforgeryStateProvider)context.RequestServices.GetRequiredService<AntiforgeryStateProvider>();
+            provider.DisableTokenGeneration();
+        }
 
         // Importantly, we must not yield this thread (which holds exclusive access to the renderer sync context)
         // in between the first call to htmlContent.WriteTo and the point where we start listening for subsequent
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Columns/GridSort.cs b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Columns/GridSort.cs
@@ -135,7 +135,16 @@ private List<SortedProperty> BuildPropertyList(bool ascending)
     // Not sure we really want this level of complexity, but it converts expressions like @(c => c.Medals.Gold) to "Medals.Gold"
     private static string ToPropertyName(LambdaExpression expression)
     {
-        if (expression.Body is not MemberExpression body)
+        var expressionBody = expression.Body;
+
+        // Handle UnaryExpressions that can occur due to implicit conversions, such as nullable value types
+        if (expressionBody.NodeType == ExpressionType.Convert ||
+            expressionBody.NodeType == ExpressionType.ConvertChecked)
+        {
+            expressionBody = ((UnaryExpression)expressionBody).Operand;
+        }
+
+        if (expressionBody is not MemberExpression body)
         {
             throw new ArgumentException(ExpressionNotRepresentableMessage);
         }
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Microsoft.AspNetCore.Components.QuickGrid.csproj b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/src/Microsoft.AspNetCore.Components.QuickGrid.csproj
@@ -23,4 +23,8 @@
     <Reference Include="Microsoft.AspNetCore.Components.Web" />
   </ItemGroup>
 
+  <ItemGroup>
+    <InternalsVisibleTo Include="Microsoft.AspNetCore.Components.QuickGrid.Tests" />
+  </ItemGroup>
+
 </Project>
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/GridSortTest.cs b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/GridSortTest.cs
@@ -0,0 +1,182 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+using System.Globalization;
+using System.Linq.Expressions;
+
+namespace Microsoft.AspNetCore.Components.QuickGrid.Tests;
+
+public class GridSortTest
+{
+    // Test model classes
+    private class TestEntity
+    {
+        public string Name { get; set; } = string.Empty;
+        public int Age { get; set; }
+        public DateTime? NullableDate { get; set; }
+        public int? NullableInt { get; set; }
+        public TestChild Child { get; set; } = new();
+    }
+
+    private class TestChild
+    {
+        public string ChildName { get; set; } = string.Empty;
+        public DateTime? ChildNullableDate { get; set; }
+    }
+
+    [Fact]
+    public void ToPropertyName_SimpleProperty_ReturnsPropertyName()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> expression = x => x.Name;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("Name", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Ascending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_NullableProperty_ReturnsPropertyName()
+    {
+        // Arrange
+        Expression<Func<TestEntity, DateTime?>> expression = x => x.NullableDate;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("NullableDate", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Ascending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_NullableInt_ReturnsPropertyName()
+    {
+        // Arrange
+        Expression<Func<TestEntity, int?>> expression = x => x.NullableInt;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("NullableInt", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Ascending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_NestedProperty_ReturnsNestedPropertyName()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> expression = x => x.Child.ChildName;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("Child.ChildName", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Ascending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_NestedNullableProperty_ReturnsNestedPropertyName()
+    {
+        // Arrange
+        Expression<Func<TestEntity, DateTime?>> expression = x => x.Child.ChildNullableDate;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("Child.ChildNullableDate", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Ascending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_DescendingSort_ReturnsCorrectDirection()
+    {
+        // Arrange
+        Expression<Func<TestEntity, DateTime?>> expression = x => x.NullableDate;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByDescending(expression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Single(propertyList);
+        Assert.Equal("NullableDate", propertyList.First().PropertyName);
+        Assert.Equal(SortDirection.Descending, propertyList.First().Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_MultipleSort_ReturnsAllProperties()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> firstExpression = x => x.Name;
+        Expression<Func<TestEntity, DateTime?>> secondExpression = x => x.NullableDate;
+
+        // Act
+        var gridSort = GridSort<TestEntity>.ByAscending(firstExpression)
+            .ThenDescending(secondExpression);
+        var propertyList = gridSort.ToPropertyList(ascending: true);
+
+        // Assert
+        Assert.Equal(2, propertyList.Count);
+        
+        var firstProperty = propertyList.First();
+        Assert.Equal("Name", firstProperty.PropertyName);
+        Assert.Equal(SortDirection.Ascending, firstProperty.Direction);
+        
+        var secondProperty = propertyList.Last();
+        Assert.Equal("NullableDate", secondProperty.PropertyName);
+        Assert.Equal(SortDirection.Descending, secondProperty.Direction);
+    }
+
+    [Fact]
+    public void ToPropertyName_InvalidExpression_ThrowsArgumentException()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> invalidExpression = x => x.Name.ToUpper(CultureInfo.InvariantCulture);
+
+        // Act & Assert
+        var gridSort = GridSort<TestEntity>.ByAscending(invalidExpression);
+        var exception = Assert.Throws<ArgumentException>(() => gridSort.ToPropertyList(ascending: true));
+        Assert.Contains("The supplied expression can't be represented as a property name for sorting", exception.Message);
+    }
+
+    [Fact]
+    public void ToPropertyName_MethodCallExpression_ThrowsArgumentException()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> invalidExpression = x => x.Name.Substring(0, 1);
+
+        // Act & Assert
+        var gridSort = GridSort<TestEntity>.ByAscending(invalidExpression);
+        var exception = Assert.Throws<ArgumentException>(() => gridSort.ToPropertyList(ascending: true));
+        Assert.Contains("The supplied expression can't be represented as a property name for sorting", exception.Message);
+    }
+
+    [Fact]
+    public void ToPropertyName_ConstantExpression_ThrowsArgumentException()
+    {
+        // Arrange
+        Expression<Func<TestEntity, string>> invalidExpression = x => "constant";
+
+        // Act & Assert
+        var gridSort = GridSort<TestEntity>.ByAscending(invalidExpression);
+        var exception = Assert.Throws<ArgumentException>(() => gridSort.ToPropertyList(ascending: true));
+        Assert.Contains("The supplied expression can't be represented as a property name for sorting", exception.Message);
+    }
+}
diff --git a/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/Microsoft.AspNetCore.Components.QuickGrid.Tests.csproj b/src/Components/QuickGrid/Microsoft.AspNetCore.Components.QuickGrid/test/Microsoft.AspNetCore.Components.QuickGrid.Tests.csproj
@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <RootNamespace>Microsoft.AspNetCore.Components.QuickGrid.Tests</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Reference Include="Microsoft.AspNetCore.Components.QuickGrid" />
+  </ItemGroup>
+
+
+
+  <ItemGroup>
+    <Using Include="Xunit" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj b/src/Framework/App.Ref/src/Microsoft.AspNetCore.App.Ref.sfxproj
@@ -38,7 +38,6 @@
     <GenerateInstallers Condition="'$(DotNetBuildSourceOnly)' != 'true'">true</GenerateInstallers>
     <BuildDebPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildDebPackage>
     <BuildRpmPackage Condition="'$(RuntimeIdentifier)' == 'linux-x64' or '$(RuntimeIdentifier)' == 'linux-arm64'">true</BuildRpmPackage>
-    <UseArcadeRpmTooling>true</UseArcadeRpmTooling>
     <GenerateVSInsertionPackages>true</GenerateVSInsertionPackages>
   </PropertyGroup>
 
diff --git a/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj b/src/Framework/App.Runtime/src/Microsoft.AspNetCore.App.Runtime.sfxproj

Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ internal sealed class PersistentStateValueProvider(PersistentComponentState stat`
`19`	`19`	`{`
`20`	`20`	`private static readonly ConcurrentDictionary<(string, string, string), byte[]> _keyCache = new();`
`21`	`21`	`private static readonly ConcurrentDictionary<(Type, string), PropertyGetter> _propertyGetterCache = new();`
`22`		`- private readonly ConcurrentDictionary<Type, IPersistentComponentStateSerializer?> _serializerCache = new();`
	`22`	`+ private static readonly ConcurrentDictionary<Type, IPersistentComponentStateSerializer?> _serializerCache = new();`
`23`	`23`
`24`	`24`	`private readonly Dictionary<ComponentState, PersistingComponentStateSubscription> _subscriptions = [];`
`25`	`25`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,12 @@ namespace Microsoft.AspNetCore.Components.Endpoints.Forms;`
`10`	`10`	`internal class EndpointAntiforgeryStateProvider(IAntiforgery antiforgery) : DefaultAntiforgeryStateProvider()`
`11`	`11`	`{`
`12`	`12`	`private HttpContext? _context;`
	`13`	`+ private bool _canGenerateToken;`
`13`	`14`
`14`	`15`	`internal void SetRequestContext(HttpContext context)`
`15`	`16`	`{`
`16`	`17`	`_context = context;`
	`18`	`+ _canGenerateToken = true;`
`17`	`19`	`}`
`18`	`20`
`19`	`21`	`public override AntiforgeryRequestToken? GetAntiforgeryToken()`
`@@ -24,17 +26,23 @@ internal void SetRequestContext(HttpContext context)`
`24`	`26`	`return _currentToken;`
`25`	`27`	`}`
`26`	`28`
`27`		`- // We already have a callback setup to generate the token when the response starts if needed.`
`28`		`- // If we need the tokens before we start streaming the response, we'll generate and store them;`
`29`		`- // otherwise we'll just retrieve them.`
`30`		`- // In case there are no tokens available, we are going to return null and no-op.`
`31`		`- var tokens = !_context.Response.HasStarted ? antiforgery.GetAndStoreTokens(_context) : antiforgery.GetTokens(_context);`
`32`		`- if (tokens.RequestToken is null)`
	`29`	`+ if (_currentToken == null && _canGenerateToken)`
`33`	`30`	`{`
`34`		`- return null;`
	`31`	`+ // We already have a callback setup to generate the token when the response starts if needed.`
	`32`	`+ // If we need the tokens before we start streaming the response, we'll generate and store them;`
	`33`	`+ // otherwise we'll just retrieve them.`
	`34`	`+ // In case there are no tokens available, we are going to return null and no-op.`
	`35`	`+ var tokens = !_context.Response.HasStarted ? antiforgery.GetAndStoreTokens(_context) : antiforgery.GetTokens(_context);`
	`36`	`+ if (tokens.RequestToken is null)`
	`37`	`+ {`
	`38`	`+ return null;`
	`39`	`+ }`
	`40`	`+`
	`41`	`+ _currentToken = new AntiforgeryRequestToken(tokens.RequestToken, tokens.FormFieldName);`
`35`	`42`	`}`
`36`	`43`
`37`		`- _currentToken = new AntiforgeryRequestToken(tokens.RequestToken, tokens.FormFieldName);`
`38`	`44`	`return _currentToken;`
`39`	`45`	`}`
	`46`	`+`
	`47`	`+ internal void DisableTokenGeneration() => _canGenerateToken = false;`
`40`	`48`	`}`
Original file line number	Diff line number	Diff line change
`@@ -135,7 +135,16 @@ private List<SortedProperty> BuildPropertyList(bool ascending)`
`135`	`135`	`// Not sure we really want this level of complexity, but it converts expressions like @(c => c.Medals.Gold) to "Medals.Gold"`
`136`	`136`	`private static string ToPropertyName(LambdaExpression expression)`
`137`	`137`	`{`
`138`		`- if (expression.Body is not MemberExpression body)`
	`138`	`+ var expressionBody = expression.Body;`
	`139`	`+`
	`140`	`+ // Handle UnaryExpressions that can occur due to implicit conversions, such as nullable value types`
	`141`	`+ if (expressionBody.NodeType == ExpressionType.Convert \|\|`
	`142`	`+ expressionBody.NodeType == ExpressionType.ConvertChecked)`
	`143`	`+ {`
	`144`	`+ expressionBody = ((UnaryExpression)expressionBody).Operand;`
	`145`	`+ }`
	`146`	`+`
	`147`	`+ if (expressionBody is not MemberExpression body)`
`139`	`148`	`{`
`140`	`149`	`throw new ArgumentException(ExpressionNotRepresentableMessage);`
`141`	`150`	`}`