[main] Update dependencies from dotnet/efcore dotnet/runtime

.azure/pipelines/helix-matrix.yml

@@ -40,7 +40,7 @@ jobs:
       displayName: Restore interop projects
     - script: .\eng\build.cmd -ci -nobl -noBuildRepoTasks -NoRestore -test -all -noBuildNative -projects eng\helix\helix.proj
               /p:IsHelixDaily=true /p:IsRequiredCheck=true /p:IsHelixJob=true /p:BuildInteropProjects=true
-              /p:RunTemplateTests=true /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
+              /p:RunTemplateTests=false /p:CrossgenOutput=false /p:ASPNETCORE_TEST_LOG_DIR=artifacts/log
       displayName: Run build.cmd helix target
       env:
         HelixApiAccessToken: $(HelixApiAccessToken) # Needed for internal queues

eng/Workarounds.targets

@@ -59,4 +59,12 @@
       <RazorReferencePath Include="@(ReferencePathWithRefAssemblies)" />
     </ItemGroup>
   </Target>
+
+  <!-- Work around https://github.com/dotnet/aspnetcore/issues/34048 -->
+  <Target Name="_RemoveDuplicateLoggingSourceGenerator" AfterTargets="ResolvePackageAssets" Condition="'$(TargetFramework)' == '$(DefaultNetCoreTargetFramework)'">
+    <ItemGroup>
+      <ResolvedAnalyzers Remove="@(ResolvedAnalyzers)" Condition="'%(ResolvedAnalyzers.NuGetPackageId)' == 'Microsoft.Extensions.Logging.Abstractions'" />
+      <ResolvedAnalyzers Remove="@(ResolvedAnalyzers)" Condition="'%(ResolvedAnalyzers.NuGetPackageId)' == 'System.Text.Json'" />
+    </ItemGroup>
+  </Target>
 </Project>

global.json

@@ -1,9 +1,9 @@
 {
   "sdk": {
-    "version": "6.0.100-preview.7.21359.3"
+    "version": "6.0.100-preview.7.21360.1"
   },
   "tools": {
-    "dotnet": "6.0.100-preview.7.21359.3",
+    "dotnet": "6.0.100-preview.7.21360.1",
     "runtimes": {
       "dotnet/x64": [
         "2.1.27",

src/Components/Components/src/BindConverter.cs

@@ -1438,7 +1438,7 @@ private static class FormatterDelegateCache
 
                 return FormatWithTypeConverter;
 
-                string FormatWithTypeConverter(T value, CultureInfo? culture)
+                string? FormatWithTypeConverter(T value, CultureInfo? culture)
                 {
                     // We intentionally close-over the TypeConverter to cache it. The TypeDescriptor infrastructure is slow.
                     return typeConverter.ConvertToString(context: null, culture ?? CultureInfo.CurrentCulture, value);
@@ -1619,6 +1619,11 @@ bool ConvertToArray(object? obj, CultureInfo? culture, out T[]? value)
                 bool ConvertWithTypeConverter(object? obj, CultureInfo? culture, out T value)
                 {
                     // We intentionally close-over the TypeConverter to cache it. The TypeDescriptor infrastructure is slow.
+                    if (obj == null)
+                    {
+                        value = default!;
+                        return true;
+                    }
                     var converted = typeConverter.ConvertFrom(context: null, culture ?? CultureInfo.CurrentCulture, obj);
                     if (converted == null)
                     {

src/Components/Components/src/RenderTree/Renderer.Log.cs

@@ -13,17 +13,19 @@ public abstract partial class Renderer
     {
         internal static class Log
         {
+            private static readonly LogDefineOptions SkipEnabledCheckLogOptions = new() { SkipEnabledCheck = true };
+
             private static readonly Action<ILogger, int, Type, int, Type, Exception> _initializingChildComponent =
-                LoggerMessage.Define<int, Type, int, Type>(LogLevel.Debug, new EventId(1, "InitializingChildComponent"), "Initializing component {ComponentId} ({ComponentType}) as child of {ParentComponentId} ({ParentComponentId})", skipEnabledCheck: true);
+                LoggerMessage.Define<int, Type, int, Type>(LogLevel.Debug, new EventId(1, "InitializingChildComponent"), "Initializing component {ComponentId} ({ComponentType}) as child of {ParentComponentId} ({ParentComponentId})", SkipEnabledCheckLogOptions);
 
             private static readonly Action<ILogger, int, Type, Exception> _initializingRootComponent =
-                LoggerMessage.Define<int, Type>(LogLevel.Debug, new EventId(2, "InitializingRootComponent"), "Initializing root component {ComponentId} ({ComponentType})", skipEnabledCheck: true);
+                LoggerMessage.Define<int, Type>(LogLevel.Debug, new EventId(2, "InitializingRootComponent"), "Initializing root component {ComponentId} ({ComponentType})", SkipEnabledCheckLogOptions);
 
             private static readonly Action<ILogger, int, Type, Exception> _renderingComponent =
-                LoggerMessage.Define<int, Type>(LogLevel.Debug, new EventId(3, "RenderingComponent"), "Rendering component {ComponentId} of type {ComponentType}", skipEnabledCheck: true);
+                LoggerMessage.Define<int, Type>(LogLevel.Debug, new EventId(3, "RenderingComponent"), "Rendering component {ComponentId} of type {ComponentType}", SkipEnabledCheckLogOptions);
 
             private static readonly Action<ILogger, int, Type, Exception> _disposingComponent =
-                LoggerMessage.Define<int, Type>(LogLevel.Debug, new EventId(4, "DisposingComponent"), "Disposing component {ComponentId} of type {ComponentType}", skipEnabledCheck: true);
+                LoggerMessage.Define<int, Type>(LogLevel.Debug, new EventId(4, "DisposingComponent"), "Disposing component {ComponentId} of type {ComponentType}", SkipEnabledCheckLogOptions);
 
             private static readonly Action<ILogger, ulong, string, Exception> _handlingEvent =
                 LoggerMessage.Define<ulong, string>(LogLevel.Debug, new EventId(5, "HandlingEvent"), "Handling event {EventId} of type '{EventType}'");

src/Components/benchmarkapps/Wasm.Performance/TestApp/Wasm.Performance.TestApp.csproj

@@ -12,6 +12,5 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Components.WebAssembly" />
-    <Reference Include="System.Text.Json" />
   </ItemGroup>
 </Project>

src/Http/Authentication.Abstractions/src/Microsoft.AspNetCore.Authentication.Abstractions.csproj

@@ -11,7 +11,6 @@
 
   <ItemGroup>
     <Reference Include="Microsoft.AspNetCore.Http.Abstractions" />
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.Options" />
   </ItemGroup>
 

src/Http/Http.Abstractions/src/PathString.cs

@@ -474,18 +474,25 @@ internal static PathString ConvertFromString(string? s)
 
     internal sealed class PathStringConverter : TypeConverter
     {
-        public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)
+        public override bool CanConvertFrom(ITypeDescriptorContext? context, Type sourceType)
             => sourceType == typeof(string) || base.CanConvertFrom(context, sourceType);
 
-        public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)
+        public override object? ConvertFrom(ITypeDescriptorContext? context, CultureInfo? culture, object value)
             => value is string @string
             ? PathString.ConvertFromString(@string)
             : base.ConvertFrom(context, culture, value);
 
-        public override object ConvertTo(ITypeDescriptorContext context,
-           CultureInfo culture, object value, Type destinationType)
-            => destinationType == typeof(string)
-            ? value.ToString() ?? string.Empty
-            : base.ConvertTo(context, culture, value, destinationType);
+        public override object? ConvertTo(ITypeDescriptorContext? context,
+           CultureInfo? culture, object? value, Type destinationType)
+        {
+            if (destinationType == null)
+            {
+                throw new ArgumentNullException(nameof(destinationType));
+            }
+
+            return destinationType == typeof(string)
+                ? value?.ToString() ?? string.Empty
+                : base.ConvertTo(context, culture, value, destinationType);
+        }
     }
 }

src/Http/Http.Abstractions/test/PathStringTests.cs

@@ -220,7 +220,7 @@ public void ToUriComponentEscapeCorrectly(string input, string expected)
         public void PathStringConvertsOnlyToAndFromString()
         {
             var converter = TypeDescriptor.GetConverter(typeof(PathString));
-            PathString result = (PathString)converter.ConvertFromInvariantString("/foo");
+            PathString result = (PathString)converter.ConvertFromInvariantString("/foo")!;
             Assert.Equal("/foo", result.ToString());
             Assert.Equal("/foo", converter.ConvertTo(result, typeof(string)));
             Assert.True(converter.CanConvertFrom(typeof(string)));

src/Http/Http.Results/src/Microsoft.AspNetCore.Http.Results.csproj

@@ -24,7 +24,6 @@
     <Reference Include="Microsoft.AspNetCore.Hosting.Abstractions" />
     <Reference Include="Microsoft.AspNetCore.Http.Extensions" />
     <Reference Include="Microsoft.AspNetCore.Routing" />
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
 
     <InternalsVisibleTo Include="Microsoft.AspNetCore.Http.Results.Tests" />
   </ItemGroup>

src/Http/Routing/src/Microsoft.AspNetCore.Routing.csproj

@@ -30,7 +30,6 @@ Microsoft.AspNetCore.Routing.RouteCollection</Description>
     <Reference Include="Microsoft.AspNetCore.Authorization" />
     <Reference Include="Microsoft.AspNetCore.Http.Extensions" />
     <Reference Include="Microsoft.AspNetCore.Routing.Abstractions" />
-    <Reference Include="Microsoft.Extensions.Logging.Abstractions" />
     <Reference Include="Microsoft.Extensions.ObjectPool" />
     <Reference Include="Microsoft.Extensions.Options" />
 

src/Middleware/HostFiltering/src/LoggerExtensions.cs

@@ -8,11 +8,13 @@ namespace Microsoft.AspNetCore.HostFiltering
 {
     internal static class LoggerExtensions
     {
+        private static readonly LogDefineOptions SkipEnabledCheckLogOptions = new() { SkipEnabledCheck = true };
+
         private static readonly Action<ILogger, Exception?> _wildcardDetected =
             LoggerMessage.Define(LogLevel.Debug, new EventId(0, "WildcardDetected"), "Wildcard detected, all requests with hosts will be allowed.");
 
         private static readonly Action<ILogger, string, Exception?> _allowedHosts =
-            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(1, "AllowedHosts"), "Allowed hosts: {Hosts}", skipEnabledCheck: true);
+            LoggerMessage.Define<string>(LogLevel.Debug, new EventId(1, "AllowedHosts"), "Allowed hosts: {Hosts}", SkipEnabledCheckLogOptions);
 
         private static readonly Action<ILogger, Exception?> _allHostsAllowed =
             LoggerMessage.Define(LogLevel.Trace, new EventId(2, "AllHostsAllowed"), "All hosts are allowed.");

src/Middleware/Session/src/LoggingExtensions.cs

@@ -21,6 +21,8 @@ internal static class LoggingExtensions
         private static readonly Action<ILogger, Exception?> _sessionRefreshCanceled;
         private static readonly Action<ILogger, Exception?> _sessionNotAvailable;
 
+        private static readonly LogDefineOptions SkipEnabledCheckLogOptions = new() { SkipEnabledCheck = true };
+
         static LoggingExtensions()
         {
             _errorClosingTheSession = LoggerMessage.Define(
@@ -32,24 +34,24 @@ static LoggingExtensions()
                 logLevel: LogLevel.Information,
                 formatString: "Accessing expired session, Key:{sessionKey}");
             _sessionStarted = LoggerMessage.Define<string, string>(
-                eventId: new EventId(3, "SessionStarted"),
                 logLevel: LogLevel.Information,
+                eventId: new EventId(3, "SessionStarted"),
                 formatString: "Session started; Key:{sessionKey}, Id:{sessionId}",
-                skipEnabledCheck: true);
+                SkipEnabledCheckLogOptions);
             _sessionLoaded = LoggerMessage.Define<string, string, int>(
-                eventId: new EventId(4, "SessionLoaded"),
                 logLevel: LogLevel.Debug,
+                eventId: new EventId(4, "SessionLoaded"),
                 formatString: "Session loaded; Key:{sessionKey}, Id:{sessionId}, Count:{count}",
-                skipEnabledCheck: true);
+                SkipEnabledCheckLogOptions);
             _sessionStored = LoggerMessage.Define<string, string, int>(
                 eventId: new EventId(5, "SessionStored"),
                 logLevel: LogLevel.Debug,
                 formatString: "Session stored; Key:{sessionKey}, Id:{sessionId}, Count:{count}");
             _sessionCacheReadException = LoggerMessage.Define<string>(
-                eventId: new EventId(6, "SessionCacheReadException"),
                 logLevel: LogLevel.Error,
+                eventId: new EventId(6, "SessionCacheReadException"),
                 formatString: "Session cache read exception, Key:{sessionKey}",
-                skipEnabledCheck: true);
+                SkipEnabledCheckLogOptions);
             _errorUnprotectingCookie = LoggerMessage.Define(
                 eventId: new EventId(7, "ErrorUnprotectingCookie"),
                 logLevel: LogLevel.Warning,

src/Mvc/Mvc.Core/src/Infrastructure/SystemTextJsonResultExecutor.cs

@@ -137,11 +137,13 @@ private JsonSerializerOptions GetSerializerOptions(JsonResult result)
 
         private static class Log
         {
+            private static readonly LogDefineOptions SkipEnabledCheckLogOptions = new() { SkipEnabledCheck = true };
+
             private static readonly Action<ILogger, string?, Exception?> _jsonResultExecuting = LoggerMessage.Define<string?>(
                 LogLevel.Information,
                 new EventId(1, "JsonResultExecuting"),
                 "Executing JsonResult, writing value of type '{Type}'.",
-                skipEnabledCheck: true);
+                SkipEnabledCheckLogOptions);
 
             // EventId 2 BufferingAsyncEnumerable