[pull] main from dotnet:main

eng/Version.Details.props

@@ -6,24 +6,24 @@ This file should be imported by eng/Versions.props
 <Project>
   <PropertyGroup>
     <!-- dotnet/dotnet dependencies -->
-    <MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25480.105</MicrosoftDotNetArcadeSdkPackageVersion>
-    <MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25480.105</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
-    <MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25480.105</MicrosoftDotNetHelixSdkPackageVersion>
-    <MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25480.105</MicrosoftExtensionsCachingMemoryPackageVersion>
-    <MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25480.105</MicrosoftExtensionsConfigurationPackageVersion>
-    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25480.105</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
-    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25480.105</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
-    <MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25480.105</MicrosoftExtensionsConfigurationJsonPackageVersion>
-    <MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25480.105</MicrosoftExtensionsDependencyInjectionPackageVersion>
-    <MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25480.105</MicrosoftExtensionsDependencyModelPackageVersion>
-    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25480.105</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
-    <MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25480.105</MicrosoftExtensionsLoggingPackageVersion>
-    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25480.105</MicrosoftNETCoreAppRefPackageVersion>
-    <MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25480.105</MicrosoftNETCorePlatformsPackageVersion>
-    <SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25480.105</SystemFormatsAsn1PackageVersion>
-    <SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25480.105</SystemRuntimeCachingPackageVersion>
-    <SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25480.105</SystemTextEncodingsWebPackageVersion>
-    <SystemTextJsonPackageVersion>10.0.0-rc.1.25480.105</SystemTextJsonPackageVersion>
+    <MicrosoftDotNetArcadeSdkPackageVersion>11.0.0-beta.25502.108</MicrosoftDotNetArcadeSdkPackageVersion>
+    <MicrosoftDotNetBuildTasksTemplatingPackageVersion>11.0.0-beta.25502.108</MicrosoftDotNetBuildTasksTemplatingPackageVersion>
+    <MicrosoftDotNetHelixSdkPackageVersion>11.0.0-beta.25502.108</MicrosoftDotNetHelixSdkPackageVersion>
+    <MicrosoftExtensionsCachingMemoryPackageVersion>10.0.0-rc.1.25502.108</MicrosoftExtensionsCachingMemoryPackageVersion>
+    <MicrosoftExtensionsConfigurationPackageVersion>10.0.0-rc.1.25502.108</MicrosoftExtensionsConfigurationPackageVersion>
+    <MicrosoftExtensionsConfigurationAbstractionsPackageVersion>10.0.0-rc.1.25502.108</MicrosoftExtensionsConfigurationAbstractionsPackageVersion>
+    <MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>10.0.0-rc.1.25502.108</MicrosoftExtensionsConfigurationEnvironmentVariablesPackageVersion>
+    <MicrosoftExtensionsConfigurationJsonPackageVersion>10.0.0-rc.1.25502.108</MicrosoftExtensionsConfigurationJsonPackageVersion>
+    <MicrosoftExtensionsDependencyInjectionPackageVersion>10.0.0-rc.1.25502.108</MicrosoftExtensionsDependencyInjectionPackageVersion>
+    <MicrosoftExtensionsDependencyModelPackageVersion>10.0.0-rc.1.25502.108</MicrosoftExtensionsDependencyModelPackageVersion>
+    <MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>10.0.0-rc.1.25502.108</MicrosoftExtensionsHostFactoryResolverSourcesPackageVersion>
+    <MicrosoftExtensionsLoggingPackageVersion>10.0.0-rc.1.25502.108</MicrosoftExtensionsLoggingPackageVersion>
+    <MicrosoftNETCoreAppRefPackageVersion>10.0.0-rc.1.25502.108</MicrosoftNETCoreAppRefPackageVersion>
+    <MicrosoftNETCorePlatformsPackageVersion>10.0.0-rc.1.25502.108</MicrosoftNETCorePlatformsPackageVersion>
+    <SystemFormatsAsn1PackageVersion>10.0.0-rc.1.25502.108</SystemFormatsAsn1PackageVersion>
+    <SystemRuntimeCachingPackageVersion>10.0.0-rc.1.25502.108</SystemRuntimeCachingPackageVersion>
+    <SystemTextEncodingsWebPackageVersion>10.0.0-rc.1.25502.108</SystemTextEncodingsWebPackageVersion>
+    <SystemTextJsonPackageVersion>10.0.0-rc.1.25502.108</SystemTextJsonPackageVersion>
   </PropertyGroup>
   <!--Property group for alternate package version names-->
   <PropertyGroup>

eng/Version.Details.xml

@@ -1,80 +1,80 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Dependencies>
-  <Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="1be39deac0ebffe1635a70f2b24f454e850f7638" BarId="285219" />
+  <Source Uri="https://github.com/dotnet/dotnet" Mapping="efcore" Sha="fe6b307fbb764027be9a10b978063bd742763982" BarId="285582" />
   <ProductDependencies>
-    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="Microsoft.Extensions.Caching.Memory" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="Microsoft.Extensions.Configuration.Abstractions" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="Microsoft.Extensions.Configuration" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="Microsoft.Extensions.DependencyInjection" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="Microsoft.Extensions.DependencyModel" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="Microsoft.Extensions.HostFactoryResolver.Sources" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="Microsoft.Extensions.Logging" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="Microsoft.NETCore.App.Ref" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="Microsoft.NETCore.Platforms" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="System.Text.Json" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="System.Text.Encodings.Web" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="System.Formats.Asn1" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25480.105">
+    <Dependency Name="System.Runtime.Caching" Version="10.0.0-rc.1.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
   </ProductDependencies>
   <ToolsetDependencies>
-    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25480.105">
+    <Dependency Name="Microsoft.DotNet.Arcade.Sdk" Version="11.0.0-beta.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25480.105">
+    <Dependency Name="Microsoft.DotNet.Build.Tasks.Templating" Version="11.0.0-beta.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
-    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25480.105">
+    <Dependency Name="Microsoft.DotNet.Helix.Sdk" Version="11.0.0-beta.25502.108">
       <Uri>https://github.com/dotnet/dotnet</Uri>
-      <Sha>1be39deac0ebffe1635a70f2b24f454e850f7638</Sha>
+      <Sha>fe6b307fbb764027be9a10b978063bd742763982</Sha>
     </Dependency>
   </ToolsetDependencies>
 </Dependencies>

global.json

@@ -18,7 +18,7 @@
     }
   },
   "msbuild-sdks": {
-    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25480.105",
-    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25480.105"
+    "Microsoft.DotNet.Arcade.Sdk": "11.0.0-beta.25502.108",
+    "Microsoft.DotNet.Helix.Sdk": "11.0.0-beta.25502.108"
   }
 }

src/EFCore.Relational/Extensions/RelationalDatabaseFacadeExtensions.cs

@@ -403,7 +403,7 @@ public static int ExecuteSqlRaw(
     public static IQueryable<TResult> SqlQueryRaw<TResult>(
         this DatabaseFacade databaseFacade,
         [NotParameterized] string sql,
-        params object[] parameters)
+        params object?[] parameters)
     {
         Check.NotNull(sql);
         Check.NotNull(parameters);
@@ -561,7 +561,7 @@ public static Task<int> ExecuteSqlRawAsync(
         this DatabaseFacade databaseFacade,
         string sql,
         CancellationToken cancellationToken = default)
-        => ExecuteSqlRawAsync(databaseFacade, sql, [], cancellationToken);
+        => ExecuteSqlRawAsync(databaseFacade, sql, parameters: [], cancellationToken);
 
     /// <summary>
     ///     Executes the given SQL against the database and returns the number of rows affected.
@@ -601,7 +601,7 @@ public static Task<int> ExecuteSqlRawAsync(
     public static Task<int> ExecuteSqlRawAsync(
         this DatabaseFacade databaseFacade,
         string sql,
-        params object[] parameters)
+        params object?[] parameters)
         => ExecuteSqlRawAsync(databaseFacade, sql, (IEnumerable<object>)parameters);
 
     /// <summary>
@@ -644,7 +644,7 @@ public static Task<int> ExecuteSqlRawAsync(
     public static async Task<int> ExecuteSqlRawAsync(
         this DatabaseFacade databaseFacade,
         string sql,
-        IEnumerable<object> parameters,
+        IEnumerable<object?> parameters,
         CancellationToken cancellationToken = default)
     {
         Check.NotNull(sql);

src/EFCore/Metadata/Conventions/NonNullableConventionBase.cs

@@ -12,19 +12,12 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions;
 /// <remarks>
 ///     See <see href="https://aka.ms/efcore-docs-conventions">Model building conventions</see> for more information and examples.
 /// </remarks>
-public abstract class NonNullableConventionBase
+public abstract class NonNullableConventionBase(ProviderConventionSetBuilderDependencies dependencies)
 {
-    /// <summary>
-    ///     Creates a new instance of <see cref="NonNullableConventionBase" />.
-    /// </summary>
-    /// <param name="dependencies">Parameter object containing dependencies for this convention.</param>
-    protected NonNullableConventionBase(ProviderConventionSetBuilderDependencies dependencies)
-        => Dependencies = dependencies;
-
     /// <summary>
     ///     Dependencies for this service.
     /// </summary>
-    protected virtual ProviderConventionSetBuilderDependencies Dependencies { get; }
+    protected virtual ProviderConventionSetBuilderDependencies Dependencies { get; } = dependencies;
 
     /// <summary>
     ///     Returns a value indicating whether the member type is a non-nullable reference type.

src/EFCore/Metadata/Conventions/NonNullableNavigationConvention.cs

@@ -11,20 +11,11 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions;
 /// <remarks>
 ///     See <see href="https://aka.ms/efcore-docs-conventions">Model building conventions</see> for more information and examples.
 /// </remarks>
-public class NonNullableNavigationConvention :
-    NonNullableConventionBase,
+public class NonNullableNavigationConvention(ProviderConventionSetBuilderDependencies dependencies) :
+    NonNullableConventionBase(dependencies),
     INavigationAddedConvention,
     IForeignKeyPrincipalEndChangedConvention
 {
-    /// <summary>
-    ///     Creates a new instance of <see cref="NonNullableNavigationConvention" />.
-    /// </summary>
-    /// <param name="dependencies">Parameter object containing dependencies for this convention.</param>
-    public NonNullableNavigationConvention(ProviderConventionSetBuilderDependencies dependencies)
-        : base(dependencies)
-    {
-    }
-
     /// <inheritdoc />
     public virtual void ProcessNavigationAdded(
         IConventionNavigationBuilder navigationBuilder,

src/EFCore/Metadata/Conventions/NonNullableReferencePropertyConvention.cs

@@ -11,22 +11,14 @@ namespace Microsoft.EntityFrameworkCore.Metadata.Conventions;
 /// <remarks>
 ///     See <see href="https://aka.ms/efcore-docs-conventions">Model building conventions</see> for more information and examples.
 /// </remarks>
-public class NonNullableReferencePropertyConvention : NonNullableConventionBase,
+public class NonNullableReferencePropertyConvention(ProviderConventionSetBuilderDependencies dependencies)
+    : NonNullableConventionBase(dependencies),
     IPropertyAddedConvention,
     IPropertyFieldChangedConvention,
     IPropertyElementTypeChangedConvention,
     IComplexPropertyAddedConvention,
     IComplexPropertyFieldChangedConvention
 {
-    /// <summary>
-    ///     Creates a new instance of <see cref="NonNullableReferencePropertyConvention" />.
-    /// </summary>
-    /// <param name="dependencies">Parameter object containing dependencies for this convention.</param>
-    public NonNullableReferencePropertyConvention(ProviderConventionSetBuilderDependencies dependencies)
-        : base(dependencies)
-    {
-    }
-
     private void Process(IConventionPropertyBuilder propertyBuilder)
     {
         if (propertyBuilder.Metadata.GetIdentifyingMemberInfo() is { } memberInfo

src/EFCore/Storage/Json/JsonConvertedValueReaderWriter.cs

@@ -55,5 +55,9 @@ public override Expression ConstructorExpression
         => Expression.New(
             _constructorInfo,
             ((ICompositeJsonValueReaderWriter)this).InnerReaderWriter.ConstructorExpression,
-            ((IJsonConvertedValueReaderWriter)this).Converter.ConstructorExpression);
+            // We shouldn't quote converters, because it will create a new instance every time and
+            // it will have to compile the expression again and
+            // it will have a negative performance impact. See #36856 for more info.
+            // This means this is currently unsupported scenario for precompilation.
+            Expression.Constant(((IJsonConvertedValueReaderWriter)this).Converter));
 }

test/Directory.Packages.props

@@ -15,16 +15,10 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration" Version="$(MicrosoftExtensionsConfigurationVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="$(MicrosoftExtensionsConfigurationEnvironmentVariablesVersion)" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsConfigurationJsonVersion)" />
-    <PackageVersion Include="IdentityServer4.EntityFramework" Version="4.1.2" />
     <PackageVersion Include="Grpc.AspNetCore" Version="2.71.0" />
     <PackageVersion Include="NetTopologySuite.IO.GeoJSON" Version="4.0.0" />
     <PackageVersion Include="OpenTelemetry.Exporter.InMemory" Version="$(OpenTelemetryExporterInMemoryVersion)" />
     <PackageVersion Include="SQLitePCLRaw.provider.sqlite3" Version="$(SQLitePCLRawVersion)" />
     <PackageVersion Include="SQLitePCLRaw.provider.winsqlite3" Version="$(SQLitePCLRawVersion)" />
-
-    <!-- Pinned versions for Component Governance/NuGetAudit - Remove when root dependencies are updated -->
-    <!--Workaround for IdentityServer4.EntityFramework v4.1.2-->
-    <PackageVersion Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.16" />
-    <PackageVersion Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
   </ItemGroup>
 </Project>

test/EFCore.AspNet.InMemory.FunctionalTests/AppServiceProviderFactoryTest.cs

@@ -3,6 +3,7 @@
 
 using Microsoft.EntityFrameworkCore.Design.Internal;
 using Microsoft.EntityFrameworkCore.Internal;
+using Microsoft.EntityFrameworkCore.TestUtilities.Xunit;
 
 namespace Microsoft.EntityFrameworkCore;
 
@@ -57,6 +58,7 @@ public static TestWebHostBuilder CreateHostBuilder(string[] args)
     }
 
     [ConditionalFact]
+    [PlatformSkipCondition(TestUtilities.Xunit.TestPlatform.Mac)]
     public void Create_with_no_builder_method()
     {
         var factory = new TestAppServiceProviderFactory(