Merge branch 'main' into fix-62672

Author: ilonatommy

src/Components/Web.JS/src/Boot.Server.Common.ts

@@ -121,7 +121,7 @@ async function startServerCore(components: RootComponentManager<ServerComponentD
 
   Blazor.disconnect = cleanup;
 
-  window.addEventListener('unload', cleanup, { capture: false, once: true });
+  window.addEventListener('pagehide', cleanup, { capture: false, once: true });
 
   logger.log(LogLevel.Information, 'Blazor server-side application started.');
 

src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/all.cmd

@@ -1,2 +1,3 @@
 call %1 -host_arch=x64 -arch=arm64 -no_logo
 call build.cmd %2 %3 %4
+exit /b 0

src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.cmd

@@ -8,12 +8,12 @@ cl /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_x64.obj empty.cpp
 link /lib /nologo /machine:arm64 /def:aspnetcorev2_arm64.def /out:%objDir%\aspnetcorev2_arm64.lib
 link /lib /nologo /machine:x64 /def:aspnetcorev2_x64.def /out:%objDir%\aspnetcorev2_x64.lib
 
-link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj %objDir%\..\AspNetCoreModuleShim\x64\%configuration%\aspnetcoremodule.res /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib
+link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_arm64.def /def:aspnetcorev2_x64.def %objDir%\aspnetcorev2_arm64.obj %objDir%\aspnetcorev2_x64.obj %objDir%\..\AspNetCoreModuleShim\x64\%configuration%\aspnetcoremodule.res /out:%binDir%\aspnetcorev2.dll %objDir%\aspnetcorev2_arm64.lib %objDir%\aspnetcorev2_x64.lib /FORCE:UNRESOLVED
 
 cl /nologo /nologo /c /Fo%objDir%\aspnetcorev2_outofprocess_arm64.obj empty.cpp
 cl /nologo /nologo /c /arm64EC /Fo%objDir%\aspnetcorev2_outofprocess_x64.obj empty.cpp
 
 link /lib /nologo /machine:arm64 /def:aspnetcorev2_outofprocess_arm64.def /out:%objDir%\aspnetcorev2_outofprocess_arm64.lib
 link /lib /nologo /machine:x64 /def:aspnetcorev2_outofprocess_x64.def /out:%objDir%\aspnetcorev2_outofprocess_x64.lib
 
-link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib
+link /dll /nologo /noentry /machine:arm64x /defArm64Native:aspnetcorev2_outofprocess_arm64.def /def:aspnetcorev2_outofprocess_x64.def %objDir%\aspnetcorev2_outofprocess_arm64.obj %objDir%\aspnetcorev2_outofprocess_x64.obj %objDir%\..\OutOfProcessRequestHandler\x64\%configuration%\outofprocessrequesthandler.res /out:%binDir%\aspnetcorev2_outofprocess.dll %objDir%\aspnetcorev2_outofprocess_arm64.lib %objDir%\aspnetcorev2_outofprocess_x64.lib /FORCE:UNRESOLVED

src/Installers/Windows/AspNetCoreModule-Setup/Forwarders/build.proj

@@ -16,6 +16,8 @@
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
   <Target Name="Build" DependsOnTargets="SetBuildDefaultEnvironmentVariables">
     <MakeDir Directories="$(ObjDir);$(BinDir)" />
-    <Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir) $(Configuration)" />
+     <!-- Ignore link.exe ARM64X pure forwarder bug -->
+     <!-- Revert once https://developercommunity.visualstudio.com/t/LINK-:-error-LNK2001:-unresolved-extern/10932429 is fixed -->
+    <Exec Command="all.cmd $(Prompt) $(ObjDir) $(BinDir) $(Configuration)" ContinueOnError="true" IgnoreStandardErrorWarningFormat="true" />
   </Target>
 </Project>

src/Mvc/Mvc.Abstractions/src/Filters/IAsyncResultFilter.cs

@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters;
 /// <para>
 /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> instances are not executed in cases where
 /// an authorization filter or resource filter short-circuits the request to prevent execution of the action.
-/// <see cref="IResultFilter"/>. <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
+/// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
 /// are also not executed in cases where an exception filter handles an exception by producing an action result.
 /// </para>
 /// <para>

src/Mvc/Mvc.Abstractions/src/Filters/IResultFilter.cs

@@ -14,7 +14,7 @@ namespace Microsoft.AspNetCore.Mvc.Filters;
 /// <para>
 /// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> instances are not executed in cases where
 /// an authorization filter or resource filter short-circuits the request to prevent execution of the action.
-/// <see cref="IResultFilter"/>. <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
+/// <see cref="IResultFilter"/> and <see cref="IAsyncResultFilter"/> implementations
 /// are also not executed in cases where an exception filter handles an exception by producing an action result.
 /// </para>
 /// <para>

src/OpenApi/sample/Controllers/TestController.cs

@@ -32,6 +32,13 @@ public IActionResult PostForm([FromForm] MvcTodo todo)
         return Ok(todo);
     }
 
+    [HttpGet]
+    [Route("/getcultureinvariant")]
+    public Ok<CurrentWeather> GetCurrentWeather()
+    {
+        return TypedResults.Ok(new CurrentWeather(1.0f));
+    }
+
     public class RouteParamsContainer
     {
         [FromRoute]
@@ -44,4 +51,6 @@ public class RouteParamsContainer
     }
 
     public record MvcTodo(string Title, string Description, bool IsCompleted);
+
+    public record CurrentWeather([property: Range(-100.5f, 100.5f)] float Temperature = 0.1f);
 }

src/OpenApi/sample/Program.cs

@@ -1,6 +1,7 @@
 // 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.Text.Json.Serialization;
 using Sample.Transformers;
 
@@ -23,11 +24,13 @@
     options.AddHeader("X-Version", "1.0");
     options.AddDocumentTransformer<BearerSecuritySchemeTransformer>();
 });
-builder.Services.AddOpenApi("v2", options => {
+builder.Services.AddOpenApi("v2", options =>
+{
     options.AddSchemaTransformer<AddExternalDocsTransformer>();
     options.AddOperationTransformer<AddExternalDocsTransformer>();
     options.AddDocumentTransformer(new AddContactTransformer());
-    options.AddDocumentTransformer((document, context, token) => {
+    options.AddDocumentTransformer((document, context, token) =>
+    {
         document.Info.License = new OpenApiLicense { Name = "MIT" };
         return Task.CompletedTask;
     });
@@ -37,6 +40,15 @@
 builder.Services.AddOpenApi("forms");
 builder.Services.AddOpenApi("schemas-by-ref");
 builder.Services.AddOpenApi("xml");
+builder.Services.AddOpenApi("localized", options =>
+{
+    options.ShouldInclude = _ => true;
+    options.AddDocumentTransformer((document, context, token) =>
+    {
+        document.Info.Description = $"This is a localized OpenAPI document for {CultureInfo.CurrentUICulture.NativeName}.";
+        return Task.CompletedTask;
+    });
+});
 
 var app = builder.Build();
 

src/OpenApi/src/Extensions/JsonNodeSchemaExtensions.cs

@@ -90,22 +90,42 @@ internal static void ApplyValidationAttributes(this JsonNode schema, IEnumerable
             }
             else if (attribute is RangeAttribute rangeAttribute)
             {
-                // Use InvariantCulture if explicitly requested or if the range has been set via the
-                // RangeAttribute(double, double) or RangeAttribute(int, int) constructors.
-                var targetCulture = rangeAttribute.ParseLimitsInInvariantCulture || rangeAttribute.Minimum is double || rangeAttribute.Maximum is int
-                    ? CultureInfo.InvariantCulture
-                    : CultureInfo.CurrentCulture;
+                decimal? minDecimal = null;
+                decimal? maxDecimal = null;
 
-                var minString = rangeAttribute.Minimum.ToString();
-                var maxString = rangeAttribute.Maximum.ToString();
+                if (rangeAttribute.Minimum is int minimumInteger)
+                {
+                    // The range was set with the RangeAttribute(int, int) constructor.
+                    minDecimal = minimumInteger;
+                    maxDecimal = (int)rangeAttribute.Maximum;
+                }
+                else
+                {
+                    // Use InvariantCulture if explicitly requested or if the range has been set via the RangeAttribute(double, double) constructor.
+                    var targetCulture = rangeAttribute.ParseLimitsInInvariantCulture || rangeAttribute.Minimum is double
+                        ? CultureInfo.InvariantCulture
+                        : CultureInfo.CurrentCulture;
+
+                    var minString = Convert.ToString(rangeAttribute.Minimum, targetCulture);
+                    var maxString = Convert.ToString(rangeAttribute.Maximum, targetCulture);
+
+                    if (decimal.TryParse(minString, NumberStyles.Any, targetCulture, out var value))
+                    {
+                        minDecimal = value;
+                    }
+                    if (decimal.TryParse(maxString, NumberStyles.Any, targetCulture, out value))
+                    {
+                        maxDecimal = value;
+                    }
+                }
 
-                if (decimal.TryParse(minString, NumberStyles.Any, targetCulture, out var minDecimal))
+                if (minDecimal is { } minValue)
                 {
-                    schema[OpenApiSchemaKeywords.MinimumKeyword] = minDecimal;
+                    schema[rangeAttribute.MinimumIsExclusive ? OpenApiSchemaKeywords.ExclusiveMinimum : OpenApiSchemaKeywords.MinimumKeyword] = minValue;
                 }
-                if (decimal.TryParse(maxString, NumberStyles.Any, targetCulture, out var maxDecimal))
+                if (maxDecimal is { } maxValue)
                 {
-                    schema[OpenApiSchemaKeywords.MaximumKeyword] = maxDecimal;
+                    schema[rangeAttribute.MaximumIsExclusive ? OpenApiSchemaKeywords.ExclusiveMaximum : OpenApiSchemaKeywords.MaximumKeyword] = maxValue;
                 }
             }
             else if (attribute is RegularExpressionAttribute regularExpressionAttribute)

src/OpenApi/src/Extensions/OpenApiEndpointRouteBuilderExtensions.cs

@@ -52,7 +52,7 @@ public static IEndpointConventionBuilder MapOpenApi(this IEndpointRouteBuilder e
                     var document = await documentService.GetOpenApiDocumentAsync(context.RequestServices, context.Request, context.RequestAborted);
                     var documentOptions = options.Get(lowercasedDocumentName);
 
-                    using var textWriter = new Utf8BufferTextWriter();
+                    using var textWriter = new Utf8BufferTextWriter(System.Globalization.CultureInfo.InvariantCulture);
                     textWriter.SetWriter(context.Response.BodyWriter);
 
                     string contentType;