Merge branch 'release/2.2' -> 'master'

dougbu · dougbu · commit dfae19ee7c3e · 2019-04-19T18:53:15.000-07:00
diff --git a/eng/PatchConfig.props b/eng/PatchConfig.props
@@ -43,7 +43,13 @@ Later on, this will be checked using this condition:
     <PackagesInPatch>
       Microsoft.AspNetCore.AspNetCoreModule;
       Microsoft.AspNetCore.AspNetCoreModuleV2;
+      Microsoft.AspNetCore.Identity.UI;
       java:signalr;
+      Microsoft.AspNetCore.Mvc.Core;
+      Microsoft.AspNetCore.Mvc.RazorPages;
+      Microsoft.AspNetCore.AzureAppServicesIntegration;
+      Microsoft.AspNetCore.AzureAppServices.HostingStartup;
+      Microsoft.AspNetCore.AzureAppServices.SiteExtension;
     </PackagesInPatch>
   </PropertyGroup>
 
diff --git a/src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs b/src/Mvc/Mvc.Core/src/MvcCoreLoggerExtensions.cs
@@ -31,6 +31,7 @@ internal static class MvcCoreLoggerExtensions
         private static readonly double TimestampToTicks = TimeSpan.TicksPerSecond / (double)Stopwatch.Frequency;
 
         private static readonly Action<ILogger, string, string, Exception> _actionExecuting;
+        private static readonly Action<ILogger, string, MethodInfo, string, string, Exception> _controllerActionExecuting;
         private static readonly Action<ILogger, string, double, Exception> _actionExecuted;
 
         private static readonly Action<ILogger, string, string, Exception> _pageExecuting;
@@ -41,7 +42,7 @@ internal static class MvcCoreLoggerExtensions
         private static readonly Action<ILogger, string, Exception> _contentResultExecuting;
 
         private static readonly Action<ILogger, string, ModelValidationState, Exception> _actionMethodExecuting;
-        private static readonly Action<ILogger, string, string[], ModelValidationState, Exception> _actionMethodExecutingWithArguments;
+        private static readonly Action<ILogger, string, string[], Exception> _actionMethodExecutingWithArguments;
         private static readonly Action<ILogger, string, string, double, Exception> _actionMethodExecuted;
 
         private static readonly Action<ILogger, string, string[], Exception> _logFilterExecutionPlan;
@@ -159,6 +160,11 @@ static MvcCoreLoggerExtensions()
                 new EventId(1, "ActionExecuting"),
                 "Route matched with {RouteData}. Executing action {ActionName}");
 
+            _controllerActionExecuting = LoggerMessage.Define<string, MethodInfo, string, string>(
+                LogLevel.Information,
+                new EventId(3, "ControllerActionExecuting"),
+                "Route matched with {RouteData}. Executing controller action with signature {MethodInfo} on controller {Controller} ({AssemblyName}).");
+
             _actionExecuted = LoggerMessage.Define<string, double>(
                 LogLevel.Information,
                 new EventId(2, "ActionExecuted"),
@@ -189,10 +195,10 @@ static MvcCoreLoggerExtensions()
                 new EventId(1, "ActionMethodExecuting"),
                 "Executing action method {ActionName} - Validation state: {ValidationState}");
 
-            _actionMethodExecutingWithArguments = LoggerMessage.Define<string, string[], ModelValidationState>(
-                LogLevel.Information,
+            _actionMethodExecutingWithArguments = LoggerMessage.Define<string, string[]>(
+                LogLevel.Trace,
                 new EventId(1, "ActionMethodExecutingWithArguments"),
-                "Executing action method {ActionName} with arguments ({Arguments}) - Validation state: {ValidationState}");
+                "Executing action method {ActionName} with arguments ({Arguments})");
 
             _actionMethodExecuted = LoggerMessage.Define<string, string, double>(
                 LogLevel.Information,
@@ -713,13 +719,29 @@ public static void ExecutingAction(this ILogger logger, ActionDescriptor action)
                         stringBuilder.Append($"{routeKeys[i]} = \"{routeValues[i]}\", ");
                     }
                 }
+
                 if (action.RouteValues.TryGetValue("page", out var page) && page != null)
                 {
                     _pageExecuting(logger, stringBuilder.ToString(), action.DisplayName, null);
                 }
                 else
                 {
-                    _actionExecuting(logger, stringBuilder.ToString(), action.DisplayName, null);
+                    if (action is ControllerActionDescriptor controllerActionDescriptor)
+                    {
+                        var controllerType = controllerActionDescriptor.ControllerTypeInfo.AsType();
+                        var controllerName = TypeNameHelper.GetTypeDisplayName(controllerType);
+                        _controllerActionExecuting(
+                            logger,
+                            stringBuilder.ToString(),
+                            controllerActionDescriptor.MethodInfo,
+                            controllerName,
+                            controllerType.Assembly.GetName().Name,
+                            null);
+                    }
+                    else
+                    {
+                        _actionExecuting(logger, stringBuilder.ToString(), action.DisplayName, null);
+                    }
                 }
             }
         }
@@ -858,21 +880,17 @@ public static void ActionMethodExecuting(this ILogger logger, ControllerContext
                 var actionName = context.ActionDescriptor.DisplayName;
 
                 var validationState = context.ModelState.ValidationState;
+                _actionMethodExecuting(logger, actionName, validationState, null);
 
-                string[] convertedArguments;
-                if (arguments == null)
-                {
-                    _actionMethodExecuting(logger, actionName, validationState, null);
-                }
-                else
+                if (arguments != null && logger.IsEnabled(LogLevel.Trace))
                 {
-                    convertedArguments = new string[arguments.Length];
+                    var convertedArguments = new string[arguments.Length];
                     for (var i = 0; i < arguments.Length; i++)
                     {
                         convertedArguments[i] = Convert.ToString(arguments[i]);
                     }
 
-                    _actionMethodExecutingWithArguments(logger, actionName, convertedArguments, validationState, null);
+                    _actionMethodExecutingWithArguments(logger, actionName, convertedArguments, null);
                 }
             }
         }
diff --git a/src/Mvc/Mvc.RazorPages/src/PageLoggerExtensions.cs b/src/Mvc/Mvc.RazorPages/src/PageLoggerExtensions.cs
@@ -13,8 +13,9 @@ internal static class PageLoggerExtensions
     {
         public const string PageFilter = "Page Filter";
 
-        private static readonly Action<ILogger, string, string[], ModelValidationState, Exception> _handlerMethodExecuting;
+        private static readonly Action<ILogger, string, ModelValidationState, Exception> _handlerMethodExecuting;
         private static readonly Action<ILogger, ModelValidationState, Exception> _implicitHandlerMethodExecuting;
+        private static readonly Action<ILogger, string, string[], Exception> _handlerMethodExecutingWithArguments;
         private static readonly Action<ILogger, string, string, Exception> _handlerMethodExecuted;
         private static readonly Action<ILogger, string, Exception> _implicitHandlerMethodExecuted;
         private static readonly Action<ILogger, object, Exception> _pageFilterShortCircuit;
@@ -26,10 +27,15 @@ static PageLoggerExtensions()
         {
             // These numbers start at 101 intentionally to avoid conflict with the IDs used by ResourceInvoker.
 
-            _handlerMethodExecuting = LoggerMessage.Define<string, string[], ModelValidationState>(
+            _handlerMethodExecuting = LoggerMessage.Define<string, ModelValidationState>(
                 LogLevel.Information,
                 new EventId(101, "ExecutingHandlerMethod"),
-                "Executing handler method {HandlerName} with arguments ({Arguments}) - ModelState is {ValidationState}");
+                "Executing handler method {HandlerName} - ModelState is {ValidationState}");
+
+            _handlerMethodExecutingWithArguments = LoggerMessage.Define<string, string[]>(
+                LogLevel.Trace,
+                new EventId(103, "HandlerMethodExecutingWithArguments"),
+                "Executing handler method {HandlerName} with arguments ({Arguments})");
 
             _handlerMethodExecuted = LoggerMessage.Define<string, string>(
                 LogLevel.Information,
@@ -73,23 +79,19 @@ public static void ExecutingHandlerMethod(this ILogger logger, PageContext conte
             {
                 var handlerName = handler.MethodInfo.DeclaringType.FullName + "." + handler.MethodInfo.Name;
 
-                string[] convertedArguments;
-                if (arguments == null)
-                {
-                    convertedArguments = null;
-                }
-                else
+                var validationState = context.ModelState.ValidationState;
+                _handlerMethodExecuting(logger, handlerName, validationState, null);
+
+                if (arguments != null && logger.IsEnabled(LogLevel.Trace))
                 {
-                    convertedArguments = new string[arguments.Length];
+                    var convertedArguments = new string[arguments.Length];
                     for (var i = 0; i < arguments.Length; i++)
                     {
                         convertedArguments[i] = Convert.ToString(arguments[i]);
                     }
-                }
 
-                var validationState = context.ModelState.ValidationState;
-
-                _handlerMethodExecuting(logger, handlerName, convertedArguments, validationState, null);
+                    _handlerMethodExecutingWithArguments(logger, handlerName, convertedArguments, null);
+                }
             }
         }
 
diff --git a/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj b/src/Mvc/benchmarkapps/BasicViews/BasicViews.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <TargetFrameworks>netcoreapp3.0</TargetFrameworks>
     <TargetFrameworks Condition="'$(BenchmarksTargetFramework)' != ''">$(BenchmarksTargetFramework)</TargetFrameworks>
diff --git a/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj b/src/Mvc/shared/Mvc.Views.TestCommon/Microsoft.AspNetCore.Mvc.Views.TestCommon.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+﻿<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
diff --git a/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj b/src/Mvc/test/WebSites/ApplicationModelWebSite/ApplicationModelWebSite.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -7,7 +7,6 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc" />
-
     <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
diff --git a/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj b/src/Mvc/test/WebSites/RazorBuildWebSite/RazorBuildWebSite.csproj
@@ -19,7 +19,6 @@
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
     <Reference Include="Microsoft.AspNetCore.Diagnostics" />
-
   </ItemGroup>
 
 </Project>
diff --git a/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj b/src/Mvc/test/WebSites/RazorPagesWebSite/RazorPagesWebSite.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
diff --git a/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj b/src/Mvc/test/WebSites/TagHelpersWebSite/TagHelpersWebSite.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+﻿<Project Sdk="Microsoft.NET.Sdk.Web">
 
   <PropertyGroup>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -8,7 +8,6 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Mvc" />
-
     <Reference Include="Microsoft.AspNetCore.Server.IISIntegration" />
     <Reference Include="Microsoft.AspNetCore.Server.Kestrel" />
     <Reference Include="Microsoft.AspNetCore.StaticFiles" />
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.10.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.1.10.txt
diff --git a/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.4.txt b/src/PackageArchive/Archive.CiServer.Patch.Compat/ArchiveBaseline.2.2.4.txt
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.10.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.1.10.txt
diff --git a/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.4.txt b/src/PackageArchive/Archive.CiServer.Patch/ArchiveBaseline.2.2.4.txt

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk.Web">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk.Web">`
`2`	`2`	`<PropertyGroup>`
`3`	`3`	`<TargetFrameworks>netcoreapp3.0</TargetFrameworks>`
`4`	`4`	`<TargetFrameworks Condition="'$(BenchmarksTargetFramework)' != ''">$(BenchmarksTargetFramework)</TargetFrameworks>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-<Project Sdk="Microsoft.NET.Sdk">`
	`1`	`+<Project Sdk="Microsoft.NET.Sdk">`
`2`	`2`
`3`	`3`	`<PropertyGroup>`
`4`	`4`	`<TargetFramework>netcoreapp3.0</TargetFramework>`