Merge pull request #8673 from dotnet-maestro-bot/merge/release/2.2-to-master

[automated] Merge branch 'release/2.2' => 'master'

Author: pranavkm

benchmarks/Microsoft.AspNetCore.Mvc.Performance/ActionSelectorBenchmark.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using System.Threading.Tasks;
 using BenchmarkDotNet.Attributes;
@@ -123,8 +124,8 @@ private static IReadOnlyList<ActionDescriptor> NaiveSelectCandidates(ActionDescr
                 var isMatch = true;
                 foreach (var kvp in action.RouteValues)
                 {
-                    var routeValue = Convert.ToString(routeValues[kvp.Key]) ?? string.Empty;
-
+                    var routeValue = Convert.ToString(routeValues[kvp.Key], CultureInfo.InvariantCulture) ??
+                        string.Empty;
                     if (string.IsNullOrEmpty(kvp.Value) && string.IsNullOrEmpty(routeValue))
                     {
                         // Match
@@ -156,7 +157,7 @@ private static ActionDescriptor CreateActionDescriptor(object obj)
             var routeValues = new Dictionary<string, string>(StringComparer.OrdinalIgnoreCase);
             foreach (var kvp in new RouteValueDictionary(obj))
             {
-                routeValues.Add(kvp.Key, Convert.ToString(kvp.Value) ?? string.Empty);
+                routeValues.Add(kvp.Key, Convert.ToString(kvp.Value, CultureInfo.InvariantCulture) ?? string.Empty);
             }
 
             return new ActionDescriptor()

src/Microsoft.AspNetCore.Mvc.Core/ApplicationModels/InferParameterBindingInfoConvention.cs

@@ -59,7 +59,10 @@ public void Apply(ControllerModel controller)
 
         internal void InferParameterBindingSources(ActionModel action)
         {
-            var inferredBindingSources = new BindingSource[action.Parameters.Count];
+            if (SuppressInferBindingSourcesForParameters)
+            {
+                return;
+            }
 
             for (var i = 0; i < action.Parameters.Count; i++)
             {

src/Microsoft.AspNetCore.Mvc.Core/Formatters/FormatFilter.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Globalization;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.ApiExplorer;
 using Microsoft.AspNetCore.Mvc.Filters;
@@ -59,7 +60,7 @@ public virtual string GetFormat(ActionContext context)
             if (context.RouteData.Values.TryGetValue("format", out var obj))
             {
                 // null and string.Empty are equivalent for route values.
-                var routeValue = obj?.ToString();
+                var routeValue = Convert.ToString(obj, CultureInfo.InvariantCulture);
                 return string.IsNullOrEmpty(routeValue) ? null : routeValue;
             }
 
@@ -166,8 +167,7 @@ public void OnResultExecuting(ResultExecutingContext context)
                 return;
             }
 
-            var objectResult = context.Result as ObjectResult;
-            if (objectResult == null)
+            if (!(context.Result is ObjectResult objectResult))
             {
                 return;
             }

src/Microsoft.AspNetCore.Mvc.Core/Internal/ActionSelector.cs

@@ -4,6 +4,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Linq;
 using System.Threading;
 using Microsoft.AspNetCore.Mvc.Abstractions;
@@ -81,11 +82,10 @@ public IReadOnlyList<ActionDescriptor> SelectCandidates(RouteContext context)
             var values = new string[keys.Length];
             for (var i = 0; i < keys.Length; i++)
             {
-                context.RouteData.Values.TryGetValue(keys[i], out object value);
-
+                context.RouteData.Values.TryGetValue(keys[i], out var value);
                 if (value != null)
                 {
-                    values[i] = value as string ?? Convert.ToString(value);
+                    values[i] = value as string ?? Convert.ToString(value, CultureInfo.InvariantCulture);
                 }
             }
 
@@ -220,9 +220,11 @@ private IReadOnlyList<ActionSelectorCandidate> EvaluateActionConstraintsCore(
             var actionsWithConstraint = new List<ActionSelectorCandidate>();
             var actionsWithoutConstraint = new List<ActionSelectorCandidate>();
 
-            var constraintContext = new ActionConstraintContext();
-            constraintContext.Candidates = candidates;
-            constraintContext.RouteContext = context;
+            var constraintContext = new ActionConstraintContext
+            {
+                Candidates = candidates,
+                RouteContext = context
+            };
 
             // Perf: Avoid allocations
             for (var i = 0; i < candidates.Count; i++)
@@ -294,7 +296,7 @@ private IReadOnlyList<ActionSelectorCandidate> EvaluateActionConstraintsCore(
         // canonical entries. When you don't hit a case-sensitive match it will try the case-insensitive dictionary
         // so you still get correct behaviors.
         //
-        // The difference here is because while MVC is case-insensitive, doing a case-sensitive comparison is much 
+        // The difference here is because while MVC is case-insensitive, doing a case-sensitive comparison is much
         // faster. We also expect that most of the URLs we process are canonically-cased because they were generated
         // by Url.Action or another routing api.
         //
@@ -316,7 +318,7 @@ public Cache(ActionDescriptorCollection actions)
                 OrdinalEntries = new Dictionary<string[], List<ActionDescriptor>>(StringArrayComparer.Ordinal);
                 OrdinalIgnoreCaseEntries = new Dictionary<string[], List<ActionDescriptor>>(StringArrayComparer.OrdinalIgnoreCase);
 
-                // We need to first identify of the keys that action selection will look at (in route data). 
+                // We need to first identify of the keys that action selection will look at (in route data).
                 // We want to only consider conventionally routed actions here.
                 var routeKeys = new HashSet<string>(StringComparer.OrdinalIgnoreCase);
                 for (var i = 0; i < actions.Items.Count; i++)

src/Microsoft.AspNetCore.Mvc.Core/Internal/NormalizedRouteValue.cs

@@ -2,6 +2,7 @@
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
 using System;
+using System.Globalization;
 
 namespace Microsoft.AspNetCore.Mvc.Internal
 {
@@ -45,7 +46,7 @@ public static string GetNormalizedRouteValue(ActionContext context, string key)
                 normalizedValue = value;
             }
 
-            var stringRouteValue = routeValue?.ToString();
+            var stringRouteValue = Convert.ToString(routeValue, CultureInfo.InvariantCulture);
             if (string.Equals(normalizedValue, stringRouteValue, StringComparison.OrdinalIgnoreCase))
             {
                 return normalizedValue;

src/Microsoft.AspNetCore.Mvc.Core/ModelBinding/RouteValueProvider.cs

@@ -88,10 +88,9 @@ public override ValueProviderResult GetValue(string key)
                 throw new ArgumentNullException(nameof(key));
             }
 
-            object value;
-            if (_values.TryGetValue(key, out value))
+            if (_values.TryGetValue(key, out var value))
             {
-                var stringValue = value as string ?? value?.ToString() ?? string.Empty;
+                var stringValue = value as string ?? Convert.ToString(value, Culture) ?? string.Empty;
                 return new ValueProviderResult(stringValue, Culture);
             }
             else

src/Microsoft.AspNetCore.Mvc.Core/Routing/KnownRouteValueConstraint.cs

@@ -3,6 +3,7 @@
 
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.Linq;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc.Core;
@@ -51,10 +52,9 @@ public bool Match(
                 throw new ArgumentNullException(nameof(values));
             }
 
-            object obj;
-            if (values.TryGetValue(routeKey, out obj))
+            if (values.TryGetValue(routeKey, out var obj))
             {
-                var value = obj as string;
+                var value = Convert.ToString(obj, CultureInfo.InvariantCulture);
                 if (value != null)
                 {
                     var actionDescriptors = GetAndValidateActionDescriptors(httpContext);

src/Microsoft.AspNetCore.Mvc.Core/Routing/PageLinkGeneratorExtensions.cs

@@ -1,10 +1,10 @@
 // Copyright (c) .NET Foundation. All rights reserved.
 // Licensed under the Apache License, Version 2.0. See License.txt in the project root for license information.
 
+using System;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Http.Features;
 using Microsoft.AspNetCore.Mvc.Routing;
-using System;
 
 namespace Microsoft.AspNetCore.Routing
 {
@@ -104,7 +104,7 @@ public static string GetPathByPage(
             }
 
             var address = CreateAddress(httpContext: null, page, handler, values);
-            return generator.GetPathByAddress<RouteValuesAddress>(address, address.ExplicitValues, pathBase, fragment, options);
+            return generator.GetPathByAddress(address, address.ExplicitValues, pathBase, fragment, options);
         }
 
         /// <summary>
@@ -230,4 +230,4 @@ private static RouteValueDictionary GetAmbientValues(HttpContext httpContext)
             return httpContext?.Features.Get<IRouteValuesFeature>()?.RouteValues;
         }
     }
-}
+}

src/Microsoft.AspNetCore.Mvc.Core/Routing/UrlHelperBase.cs

@@ -4,9 +4,9 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.Text;
 using Microsoft.AspNetCore.Http;
-using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.Core;
 using Microsoft.AspNetCore.Mvc.Internal;
 using Microsoft.AspNetCore.Routing;
@@ -162,8 +162,8 @@ protected string GenerateUrl(string protocol, string host, string virtualPath, s
 
             // Perf: In most of the common cases, GenerateUrl is called with a null protocol, host and fragment.
             // In such cases, we might not need to build any URL as the url generated is mostly same as the virtual path available in pathData.
-            // For such common cases, this FastGenerateUrl method saves a string allocation per GenerateUrl call.            
-            if (TryFastGenerateUrl(protocol, host, virtualPath, fragment, out string url))
+            // For such common cases, this FastGenerateUrl method saves a string allocation per GenerateUrl call.
+            if (TryFastGenerateUrl(protocol, host, virtualPath, fragment, out var url))
             {
                 return url;
             }
@@ -226,8 +226,7 @@ protected string GenerateUrl(string protocol, string host, string path)
             // Perf: In most of the common cases, GenerateUrl is called with a null protocol, host and fragment.
             // In such cases, we might not need to build any URL as the url generated is mostly same as the virtual path available in pathData.
             // For such common cases, this FastGenerateUrl method saves a string allocation per GenerateUrl call.
-            string url;
-            if (TryFastGenerateUrl(protocol, host, path, fragment: null, out url))
+            if (TryFastGenerateUrl(protocol, host, path, fragment: null, out var url))
             {
                 return url;
             }
@@ -350,7 +349,7 @@ private static object CalculatePageName(ActionContext context, RouteValueDiction
                 }
                 else if (ambientValues != null)
                 {
-                    currentPagePath = ambientValues["page"]?.ToString();
+                    currentPagePath = Convert.ToString(ambientValues["page"], CultureInfo.InvariantCulture);
                 }
                 else
                 {

src/Microsoft.AspNetCore.Mvc.RazorPages/ApplicationModels/PageRouteModel.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Linq;
 using Microsoft.AspNetCore.Mvc.Abstractions;
-using Microsoft.AspNetCore.Mvc.RazorPages;
 using Microsoft.AspNetCore.Routing;
 
 namespace Microsoft.AspNetCore.Mvc.ApplicationModels
@@ -96,7 +95,7 @@ public PageRouteModel(PageRouteModel other)
         public IList<SelectorModel> Selectors { get; }
 
         /// <summary>
-        /// Gets a collection of route values that must be present in the <see cref="RouteData.Values"/> 
+        /// Gets a collection of route values that must be present in the <see cref="RouteData.Values"/>
         /// for the corresponding page to be selected.
         /// </summary>
         /// <remarks>