upgrade to EF Core 10 rc-1

PawelGerr · PawelGerr · commit eec1a1139b4d · 2025-10-09T23:03:00.000+02:00
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Copyright>(c) $([System.DateTime]::Now.Year), Pawel Gerr. All rights reserved.</Copyright>
-    <VersionPrefix>9.2.1</VersionPrefix>
+    <VersionPrefix>10.0.0</VersionPrefix>
     <Authors>Pawel Gerr</Authors>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <PackageProjectUrl>https://dev.azure.com/pawelgerr/Thinktecture.EntityFrameworkCore</PackageProjectUrl>
@@ -12,8 +12,8 @@
     <RepositoryUrl>https://pawelgerr@dev.azure.com/pawelgerr/Thinktecture.EntityFrameworkCore/_git/Thinktecture.EntityFrameworkCore</RepositoryUrl>
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
     <RootNamespace>Thinktecture</RootNamespace>
-    <TargetFrameworks>net8.0;net9.0;</TargetFrameworks>
-    <LangVersion>13.0</LangVersion>
+    <TargetFrameworks>net10.0;</TargetFrameworks>
+    <LangVersion>14.0</LangVersion>
     <Nullable>enable</Nullable>
     <NoWarn>$(NoWarn);CA1303;MSB3884;</NoWarn>
     <ImplicitUsings>enable</ImplicitUsings>
diff --git a/Directory.Packages.props b/Directory.Packages.props
@@ -2,16 +2,16 @@
   <ItemGroup>
     <PackageVersion Include="BenchmarkDotNet" Version="0.15.4" />
     <PackageVersion Include="AwesomeAssertions" Version="9.2.0" />
-    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.3" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="9.0.9" />
-    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="9.0.9" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.2" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.0-rc.1.25451.107" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Relational" Version="10.0.0-rc.1.25451.107" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.Sqlite" Version="10.0.0-rc.1.25451.107" />
+    <PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0-rc.1.25451.107" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="10.0.0-rc.1.25451.107" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="10.0.0-rc.1.25451.107" />
+    <PackageVersion Include="Microsoft.Extensions.Configuration.UserSecrets" Version="10.0.0-rc.1.25451.107" />
+    <PackageVersion Include="Microsoft.Extensions.Logging.Console" Version="10.0.0-rc.1.25451.107" />
+    <PackageVersion Include="Microsoft.Extensions.ObjectPool" Version="10.0.0-rc.1.25451.107" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.0" />
     <PackageVersion Include="Microsoft.SourceLink.AzureRepos.Git" Version="8.0.0" PrivateAssets="all" />
     <PackageVersion Include="NSubstitute" Version="5.3.0" />
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -16,21 +16,13 @@ pool:
 steps:
       
 - task: UseDotNet@2
-  displayName: 'use .NET 8.0 SDK'
+  displayName: 'use .NET 10.0 SDK'
   inputs:
     packageType: sdk
-    version: 8.0.x
-    includePreviewVersions: false
+    version: 10.0.x
+    includePreviewVersions: true
     installationPath: $(Agent.ToolsDirectory)/dotnet
-
-- task: UseDotNet@2
-  displayName: 'use .NET 9.0 SDK'
-  inputs:
-    packageType: sdk
-    version: 9.0.x
-    includePreviewVersions: false
-    installationPath: $(Agent.ToolsDirectory)/dotnet
-      
+   
 - script: |
     echo dotnet --version
     dotnet --version
@@ -70,6 +62,12 @@ steps:
   inputs:
     artifactName: 'NugetPackages'
 
+- script: |
+    sudo apt-get update
+    sudo apt-get install -y mono-complete
+  displayName: 'install mono'
+  condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
+
 - task: NuGetCommand@2
   displayName: 'push to nuget.org'
   condition: startsWith(variables['Build.SourceBranch'], 'refs/tags/')
diff --git a/global.json b/global.json
@@ -1,7 +1,7 @@
 {
   "sdk": {
-    "version": "8.0.0",
+    "version": "10.0.0",
     "rollForward": "latestMajor",
-    "allowPrerelease": false
+    "allowPrerelease": true
   }
 }
diff --git a/samples/Directory.Build.props b/samples/Directory.Build.props
@@ -7,8 +7,4 @@
 
     <Import Condition="exists('$(ParentPropsFile)') " Project="$(ParentPropsFile)"/>
 
-    <PropertyGroup>
-        <TargetFramework>net9.0</TargetFramework>
-    </PropertyGroup>
-
 </Project>
diff --git a/src/Thinktecture.EntityFrameworkCore.Relational/EntityFrameworkCore/Query/ThinktectureRelationalQueryContextFactory.cs b/src/Thinktecture.EntityFrameworkCore.Relational/EntityFrameworkCore/Query/ThinktectureRelationalQueryContextFactory.cs
@@ -1,6 +1,5 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.Query;
-using Microsoft.EntityFrameworkCore.Query.Internal;
 using Thinktecture.EntityFrameworkCore.Infrastructure;
 
 namespace Thinktecture.EntityFrameworkCore.Query;
@@ -47,9 +46,9 @@ public QueryContext Create()
    /// </summary>
    /// <param name="ctx">Query context.</param>
    [SuppressMessage("Usage", "EF1001", MessageId = "Internal EF Core API usage.")]
-   private void AddTenantParameter(IParameterValues ctx)
+   private void AddTenantParameter(QueryContext ctx)
    {
       var tenantDatabaseProvider = _tenantDatabaseProviderFactory.Create();
-      ctx.AddParameter($"{_TENANT_PARAM_PREFIX}|{tenantDatabaseProvider.Tenant}", null);
+      ctx.Parameters.Add($"{_TENANT_PARAM_PREFIX}|{tenantDatabaseProvider.Tenant}", null);
    }
 }
diff --git a/src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/Query/ThinktectureSqlServerParameterBasedSqlProcessor.cs b/src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/Query/ThinktectureSqlServerParameterBasedSqlProcessor.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using System.Linq.Expressions;
 using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal;
 using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal;
 
 namespace Thinktecture.EntityFrameworkCore.Query;
@@ -9,20 +10,24 @@ namespace Thinktecture.EntityFrameworkCore.Query;
 [SuppressMessage("Usage", "EF1001", MessageId = "Internal EF Core API usage.")]
 public class ThinktectureSqlServerParameterBasedSqlProcessor : SqlServerParameterBasedSqlProcessor
 {
+   private readonly ISqlServerSingletonOptions _sqlServerSingletonOptions;
+
    /// <inheritdoc />
    public ThinktectureSqlServerParameterBasedSqlProcessor(
       RelationalParameterBasedSqlProcessorDependencies dependencies,
-      RelationalParameterBasedSqlProcessorParameters parameters)
-      : base(dependencies, parameters)
+      RelationalParameterBasedSqlProcessorParameters parameters,
+      ISqlServerSingletonOptions sqlServerSingletonOptions)
+      : base(dependencies, parameters, sqlServerSingletonOptions)
    {
+      _sqlServerSingletonOptions = sqlServerSingletonOptions;
    }
 
    /// <inheritdoc />
-   protected override Expression ProcessSqlNullability(Expression selectExpression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)
+   protected override Expression ProcessSqlNullability(Expression selectExpression, ParametersCacheDecorator decorator)
    {
       ArgumentNullException.ThrowIfNull(selectExpression);
-      ArgumentNullException.ThrowIfNull(parametersValues);
+      ArgumentNullException.ThrowIfNull(decorator);
 
-      return new ThinktectureSqlServerSqlNullabilityProcessor(Dependencies, Parameters).Process(selectExpression, parametersValues, out canCache);
+      return new ThinktectureSqlServerSqlNullabilityProcessor(Dependencies, Parameters, _sqlServerSingletonOptions).Process(selectExpression, decorator);
    }
 }
diff --git a/src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/Query/ThinktectureSqlServerParameterBasedSqlProcessorFactory.cs b/src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/Query/ThinktectureSqlServerParameterBasedSqlProcessorFactory.cs
@@ -1,25 +1,32 @@
+using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.Query;
+using Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal;
 
 namespace Thinktecture.EntityFrameworkCore.Query;
 
 /// <inheritdoc />
+[SuppressMessage("Usage", "EF1001:Internal EF Core API usage.")]
 public class ThinktectureSqlServerParameterBasedSqlProcessorFactory : IRelationalParameterBasedSqlProcessorFactory
 {
    private readonly RelationalParameterBasedSqlProcessorDependencies _dependencies;
+   private readonly ISqlServerSingletonOptions _sqlServerSingletonOptions;
 
    /// <summary>
    /// Initializes <see cref="ThinktectureSqlServerParameterBasedSqlProcessorFactory"/>.
    /// </summary>
    /// <param name="dependencies">Dependencies.</param>
+   /// <param name="sqlServerSingletonOptions">Options.</param>
    public ThinktectureSqlServerParameterBasedSqlProcessorFactory(
-      RelationalParameterBasedSqlProcessorDependencies dependencies)
+      RelationalParameterBasedSqlProcessorDependencies dependencies,
+      ISqlServerSingletonOptions sqlServerSingletonOptions)
    {
       _dependencies = dependencies;
+      _sqlServerSingletonOptions = sqlServerSingletonOptions;
    }
 
    /// <inheritdoc />
    public RelationalParameterBasedSqlProcessor Create(RelationalParameterBasedSqlProcessorParameters parameters)
    {
-      return new ThinktectureSqlServerParameterBasedSqlProcessor(_dependencies, parameters);
+      return new ThinktectureSqlServerParameterBasedSqlProcessor(_dependencies, parameters, _sqlServerSingletonOptions);
    }
 }
diff --git a/src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/Query/ThinktectureSqlServerSqlNullabilityProcessor.cs b/src/Thinktecture.EntityFrameworkCore.SqlServer/EntityFrameworkCore/Query/ThinktectureSqlServerSqlNullabilityProcessor.cs
@@ -1,6 +1,7 @@
 using System.Diagnostics.CodeAnalysis;
 using Microsoft.EntityFrameworkCore.Query;
 using Microsoft.EntityFrameworkCore.Query.SqlExpressions;
+using Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal;
 using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal;
 using Thinktecture.EntityFrameworkCore.Query.SqlExpressions;
 
@@ -15,8 +16,9 @@ public class ThinktectureSqlServerSqlNullabilityProcessor : SqlServerSqlNullabil
    /// <inheritdoc />
    public ThinktectureSqlServerSqlNullabilityProcessor(
       RelationalParameterBasedSqlProcessorDependencies dependencies,
-      RelationalParameterBasedSqlProcessorParameters parameters)
-      : base(dependencies, parameters)
+      RelationalParameterBasedSqlProcessorParameters parameters,
+      ISqlServerSingletonOptions sqlServerSingletonOptions)
+      : base(dependencies, parameters, sqlServerSingletonOptions)
    {
    }
 
diff --git a/src/Thinktecture.EntityFrameworkCore.Sqlite/EntityFrameworkCore/Query/ThinktectureRelationalParameterBasedSqlProcessor.cs b/src/Thinktecture.EntityFrameworkCore.Sqlite/EntityFrameworkCore/Query/ThinktectureRelationalParameterBasedSqlProcessor.cs
@@ -20,11 +20,11 @@ public ThinktectureSqliteParameterBasedSqlProcessor(
    }
 
    /// <inheritdoc />
-   protected override Expression ProcessSqlNullability(Expression expression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)
+   protected override Expression ProcessSqlNullability(Expression selectExpression, ParametersCacheDecorator decorator)
    {
-      ArgumentNullException.ThrowIfNull(expression);
-      ArgumentNullException.ThrowIfNull(parametersValues);
+      ArgumentNullException.ThrowIfNull(selectExpression);
+      ArgumentNullException.ThrowIfNull(decorator);
 
-      return new ThinktectureSqlNullabilityProcessor(Dependencies, Parameters).Process(expression, parametersValues, out canCache);
+      return new ThinktectureSqlNullabilityProcessor(Dependencies, Parameters).Process(selectExpression, decorator);
    }
 }

Original file line number	Diff line number	Diff line change
`@@ -1,7 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"sdk": {`
`3`		`- "version": "8.0.0",`
	`3`	`+ "version": "10.0.0",`
`4`	`4`	`"rollForward": "latestMajor",`
`5`		`- "allowPrerelease": false`
	`5`	`+ "allowPrerelease": true`
`6`	`6`	`}`
`7`	`7`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,5 @@`
`1`	`1`	`using System.Diagnostics.CodeAnalysis;`
`2`	`2`	`using Microsoft.EntityFrameworkCore.Query;`
`3`		`-using Microsoft.EntityFrameworkCore.Query.Internal;`
`4`	`3`	`using Thinktecture.EntityFrameworkCore.Infrastructure;`
`5`	`4`
`6`	`5`	`namespace Thinktecture.EntityFrameworkCore.Query;`
`@@ -47,9 +46,9 @@ public QueryContext Create()`
`47`	`46`	`/// </summary>`
`48`	`47`	`/// <param name="ctx">Query context.</param>`
`49`	`48`	`[SuppressMessage("Usage", "EF1001", MessageId = "Internal EF Core API usage.")]`
`50`		`- private void AddTenantParameter(IParameterValues ctx)`
	`49`	`+ private void AddTenantParameter(QueryContext ctx)`
`51`	`50`	`{`
`52`	`51`	`var tenantDatabaseProvider = _tenantDatabaseProviderFactory.Create();`
`53`		`- ctx.AddParameter($"{_TENANT_PARAM_PREFIX}\|{tenantDatabaseProvider.Tenant}", null);`
	`52`	`+ ctx.Parameters.Add($"{_TENANT_PARAM_PREFIX}\|{tenantDatabaseProvider.Tenant}", null);`
`54`	`53`	`}`
`55`	`54`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using System.Diagnostics.CodeAnalysis;`
`2`	`2`	`using System.Linq.Expressions;`
`3`	`3`	`using Microsoft.EntityFrameworkCore.Query;`
	`4`	`+using Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal;`
`4`	`5`	`using Microsoft.EntityFrameworkCore.SqlServer.Query.Internal;`
`5`	`6`
`6`	`7`	`namespace Thinktecture.EntityFrameworkCore.Query;`
`@@ -9,20 +10,24 @@ namespace Thinktecture.EntityFrameworkCore.Query;`
`9`	`10`	`[SuppressMessage("Usage", "EF1001", MessageId = "Internal EF Core API usage.")]`
`10`	`11`	`public class ThinktectureSqlServerParameterBasedSqlProcessor : SqlServerParameterBasedSqlProcessor`
`11`	`12`	`{`
	`13`	`+ private readonly ISqlServerSingletonOptions _sqlServerSingletonOptions;`
	`14`	`+`
`12`	`15`	`/// <inheritdoc />`
`13`	`16`	`public ThinktectureSqlServerParameterBasedSqlProcessor(`
`14`	`17`	`RelationalParameterBasedSqlProcessorDependencies dependencies,`
`15`		`- RelationalParameterBasedSqlProcessorParameters parameters)`
`16`		`- : base(dependencies, parameters)`
	`18`	`+ RelationalParameterBasedSqlProcessorParameters parameters,`
	`19`	`+ ISqlServerSingletonOptions sqlServerSingletonOptions)`
	`20`	`+ : base(dependencies, parameters, sqlServerSingletonOptions)`
`17`	`21`	`{`
	`22`	`+ _sqlServerSingletonOptions = sqlServerSingletonOptions;`
`18`	`23`	`}`
`19`	`24`
`20`	`25`	`/// <inheritdoc />`
`21`		`- protected override Expression ProcessSqlNullability(Expression selectExpression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)`
	`26`	`+ protected override Expression ProcessSqlNullability(Expression selectExpression, ParametersCacheDecorator decorator)`
`22`	`27`	`{`
`23`	`28`	`ArgumentNullException.ThrowIfNull(selectExpression);`
`24`		`- ArgumentNullException.ThrowIfNull(parametersValues);`
	`29`	`+ ArgumentNullException.ThrowIfNull(decorator);`
`25`	`30`
`26`		`- return new ThinktectureSqlServerSqlNullabilityProcessor(Dependencies, Parameters).Process(selectExpression, parametersValues, out canCache);`
	`31`	`+ return new ThinktectureSqlServerSqlNullabilityProcessor(Dependencies, Parameters, _sqlServerSingletonOptions).Process(selectExpression, decorator);`
`27`	`32`	`}`
`28`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,25 +1,32 @@`
	`1`	`+using System.Diagnostics.CodeAnalysis;`
`1`	`2`	`using Microsoft.EntityFrameworkCore.Query;`
	`3`	`+using Microsoft.EntityFrameworkCore.SqlServer.Infrastructure.Internal;`
`2`	`4`
`3`	`5`	`namespace Thinktecture.EntityFrameworkCore.Query;`
`4`	`6`
`5`	`7`	`/// <inheritdoc />`
	`8`	`+[SuppressMessage("Usage", "EF1001:Internal EF Core API usage.")]`
`6`	`9`	`public class ThinktectureSqlServerParameterBasedSqlProcessorFactory : IRelationalParameterBasedSqlProcessorFactory`
`7`	`10`	`{`
`8`	`11`	`private readonly RelationalParameterBasedSqlProcessorDependencies _dependencies;`
	`12`	`+ private readonly ISqlServerSingletonOptions _sqlServerSingletonOptions;`
`9`	`13`
`10`	`14`	`/// <summary>`
`11`	`15`	`/// Initializes <see cref="ThinktectureSqlServerParameterBasedSqlProcessorFactory"/>.`
`12`	`16`	`/// </summary>`
`13`	`17`	`/// <param name="dependencies">Dependencies.</param>`
	`18`	`+ /// <param name="sqlServerSingletonOptions">Options.</param>`
`14`	`19`	`public ThinktectureSqlServerParameterBasedSqlProcessorFactory(`
`15`		`- RelationalParameterBasedSqlProcessorDependencies dependencies)`
	`20`	`+ RelationalParameterBasedSqlProcessorDependencies dependencies,`
	`21`	`+ ISqlServerSingletonOptions sqlServerSingletonOptions)`
`16`	`22`	`{`
`17`	`23`	`_dependencies = dependencies;`
	`24`	`+ _sqlServerSingletonOptions = sqlServerSingletonOptions;`
`18`	`25`	`}`
`19`	`26`
`20`	`27`	`/// <inheritdoc />`
`21`	`28`	`public RelationalParameterBasedSqlProcessor Create(RelationalParameterBasedSqlProcessorParameters parameters)`
`22`	`29`	`{`
`23`		`- return new ThinktectureSqlServerParameterBasedSqlProcessor(_dependencies, parameters);`
	`30`	`+ return new ThinktectureSqlServerParameterBasedSqlProcessor(_dependencies, parameters, _sqlServerSingletonOptions);`
`24`	`31`	`}`
`25`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -20,11 +20,11 @@ public ThinktectureSqliteParameterBasedSqlProcessor(`
`20`	`20`	`}`
`21`	`21`
`22`	`22`	`/// <inheritdoc />`
`23`		`- protected override Expression ProcessSqlNullability(Expression expression, IReadOnlyDictionary<string, object?> parametersValues, out bool canCache)`
	`23`	`+ protected override Expression ProcessSqlNullability(Expression selectExpression, ParametersCacheDecorator decorator)`
`24`	`24`	`{`
`25`		`- ArgumentNullException.ThrowIfNull(expression);`
`26`		`- ArgumentNullException.ThrowIfNull(parametersValues);`
	`25`	`+ ArgumentNullException.ThrowIfNull(selectExpression);`
	`26`	`+ ArgumentNullException.ThrowIfNull(decorator);`
`27`	`27`
`28`		`- return new ThinktectureSqlNullabilityProcessor(Dependencies, Parameters).Process(expression, parametersValues, out canCache);`
	`28`	`+ return new ThinktectureSqlNullabilityProcessor(Dependencies, Parameters).Process(selectExpression, decorator);`
`29`	`29`	`}`
`30`	`30`	`}`