Upgrade to EF Core 7.0.0 (#1717)

* Fix `SelectMany_subquery_with_custom_projection` test of `ComplexNavigationsQueryMySqlTest` and `ComplexNavigationsSharedTypeQueryMySqlTest` classes. (#1694) * Add support for AddMySql() method. (#1693) Improve support for null connection strings. * Update branding to 7.0.0-alpha.1. * Update dependencies to .NET 7.0.0 and EFCore 7.0.0. * Make EfCore.MySql compile. * Make EFCore.MySql.IntegrationTests compile. * Make EFCore.MySql.FunctionalTests compile. * Make EFCore.MySql.Tests compile. * Fix integration tests. * Add support for descending indexes (currently supported by MySQL 8.0.1+). * Move MySqlValueGenerationStrategy related methods closer to common implementation. * INSERT...RETURNING was implemented in MariaDB 10.5.0. * Fix MySqlUpdateSqlGenerator and tests. * Fix MySqlMigrationsSqlGenerator and tests. * Fix functional tests. * Update tools. * Fix existing tests. * Add new tests. * Implement bulk updates and deletes. * Implement stored procedure support for INSERT, UPDATE and DELETE statements. * Implement StoreValueGenerationMySqlTest class. * Fix CI pipeline. * Adjust tests for CI. * Add scaffolding support for sequences. * Complete migration support for sequences and implement tests. * Fix DELETE SQL statement generation for MariaDB. * Fix tests for MariaDB 10.9. * DELETE...RETURNING was implemented in MariaDB 10.0.0. For simplicity, we currently use it only for MariaDB 10.5+. * Fix tests for MariaDB 10.3. * Fix tests for MySQL 5.7. * We only support EF Core 7.*. Better than using [7.0.0, 8.0.0), because that allows 8.0.0-rc.1. * Fix dodgy tests.
PomeloFoundation · Nov 15, 2022 · 147559f · 147559f
1 parent 01c6941
commit 147559f
Show file tree

Hide file tree

Showing 163 changed files with 34,514 additions and 2,663 deletions.
diff --git a/.editorconfig b/.editorconfig
@@ -232,14 +232,6 @@ dotnet_naming_rule.const_field_naming.symbols = const_field_symbol
 dotnet_naming_rule.const_field_naming.style = pascal_case_style
 dotnet_naming_rule.const_field_naming.severity = suggestion
 
-# Private Fields
-dotnet_naming_symbols.private_field_symbol.applicable_kinds = field
-dotnet_naming_symbols.private_field_symbol.applicable_accessibilities = private
-
-dotnet_naming_rule.private_field_naming.symbols = private_field_symbol
-dotnet_naming_rule.private_field_naming.style = _camelCase
-dotnet_naming_rule.private_field_naming.severity = suggestion
-
 # Parameters
 dotnet_naming_symbols.parameter_symbol.applicable_kinds = parameter
 dotnet_naming_symbols.parameter_symbol.applicable_accessibilities = *

diff --git a/Dependencies.targets b/Dependencies.targets
@@ -1,9 +1,7 @@
 <Project>
   <PropertyGroup Label="Common Versions">
-    <DotnetRuntimeVersion>6.0.2</DotnetRuntimeVersion>
-    <EFCoreVersion>[$(DotnetRuntimeVersion), 7.0.0)</EFCoreVersion>
-    <DependencyPreviewVersion>$(DotnetRuntimeVersion)</DependencyPreviewVersion>
-    <AspNetCoreVersion>$(DotnetRuntimeVersion)</AspNetCoreVersion>
+    <EFCoreVersion>7.*</EFCoreVersion>
+    <AspNetCoreVersion>7.0.0</AspNetCoreVersion>
   </PropertyGroup>
 
   <ItemGroup Label="Dependencies">
@@ -12,41 +10,40 @@
     <PackageReference Update="Microsoft.EntityFrameworkCore.Relational" Version="$(EFCoreVersion)" />
     <PackageReference Update="Microsoft.EntityFrameworkCore" Version="$(EFCoreVersion)" />
 
-    <PackageReference Update="MySqlConnector" Version="2.1.2" />
+    <PackageReference Update="MySqlConnector" Version="2.2.0" />
 
-    <PackageReference Update="NetTopologySuite" Version="2.3.0" />
-    <PackageReference Update="System.Text.Json" Version="6.0.2" />
+    <PackageReference Update="NetTopologySuite" Version="2.5.0" />
+    <PackageReference Update="System.Text.Json" Version="7.0.0" />
     <PackageReference Update="Newtonsoft.Json" Version="13.0.1" />
 
-    <PackageReference Update="Castle.Core" Version="4.4.1" />
+    <PackageReference Update="Castle.Core" Version="5.1.0" />
     <PackageReference Update="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="$(AspNetCoreVersion)" />
     <PackageReference Update="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="$(AspNetCoreVersion)" />
-    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="6.0.0" />
+    <PackageReference Update="Microsoft.Bcl.AsyncInterfaces" Version="7.0.0" />
     <PackageReference Update="Microsoft.Bcl.HashCode" Version="1.1.1" />
-    <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.0.1" />
-    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="6.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="6.0.1" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="6.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Configuration" Version="6.0.0" />
-    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
-    <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="6.0.0" />
-    <PackageReference Update="Microsoft.Extensions.Logging" Version="6.0.0" />
-    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.0.0" />
+    <PackageReference Update="Microsoft.CodeAnalysis.CSharp" Version="4.3.1" />
+    <PackageReference Update="Microsoft.Extensions.Caching.Memory" Version="7.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Binder" Version="7.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="7.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.FileExtensions" Version="7.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration.Json" Version="7.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Configuration" Version="7.0.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyInjection" Version="7.0.0" />
+    <PackageReference Update="Microsoft.Extensions.DependencyModel" Version="7.0.0" />
+    <PackageReference Update="Microsoft.Extensions.Logging" Version="7.0.0" />
+    <PackageReference Update="Microsoft.NET.Test.Sdk" Version="17.4.0" />
     <PackageReference Update="Microsoft.SourceLink.GitHub" Version="1.1.1" />
-    <PackageReference Update="Moq" Version="4.16.1" />
-    <PackageReference Update="System.Collections.Immutable" Version="6.0.0" />
+    <PackageReference Update="Moq" Version="4.18.2" />
+    <PackageReference Update="System.Collections.Immutable" Version="7.0.0" />
     <PackageReference Update="System.ComponentModel.TypeConverter" Version="4.3.0" />
-    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="6.0.0" />
-    <PackageReference Update="xunit.assert" Version="2.4.1" />
-    <PackageReference Update="xunit.core" Version="2.4.1" />
-    <PackageReference Update="xunit.runner.console" Version="2.4.1" />
-    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.3" />
+    <PackageReference Update="System.Diagnostics.DiagnosticSource" Version="7.0.0" />
+    <PackageReference Update="xunit.assert" Version="2.4.2" />
+    <PackageReference Update="xunit.core" Version="2.4.2" />
+    <PackageReference Update="xunit.runner.console" Version="2.4.2" />
+    <PackageReference Update="xunit.runner.visualstudio" Version="2.4.5" />
 
     <!-- Keep at the same level that the EF Core projects use. -->
-    <PackageReference Update="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0" />
     <PackageReference Update="DotNetAnalyzers.DocumentationAnalyzers" Version="1.0.0-beta.59" />
-    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" />
+    <PackageReference Update="StyleCop.Analyzers" Version="1.1.118" PrivateAssets="All" />
   </ItemGroup>
 </Project>
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -22,7 +22,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <DefaultNetCoreTargetFramework>net6.0</DefaultNetCoreTargetFramework>
+    <PomeloTargetFrameworks>net6.0;net7.0</PomeloTargetFrameworks>
+    <PomeloTestTargetFramework>net7.0</PomeloTestTargetFramework>
+    <EfCoreTargetFramework>net6.0</EfCoreTargetFramework>
+    <EfCoreTestTargetFramework>net7.0</EfCoreTestTargetFramework>
   </PropertyGroup>
 
   <PropertyGroup>

diff --git a/Version.props b/Version.props
@@ -4,16 +4,16 @@
       Use the following values for the different release types:
           - "alpha"     - EF Core release independent, code quality unstable,         major changes
           - "beta"      - EF Core release independent, code quality stable,           can introduce breaking changes
-          - "silver"    - EF Core release independent, code quality stable,           can introduce breaking changes
+          - "silver"    - EF Core release independent, code quality stable,           only minor changes are expected
 
           - "preview"   - EF Core release targeted,    code quality stable,           can introduce breaking changes
           - "rc"        - EF Core release targeted,    code quality production ready, only minor changes are expected
 
           - "rtm"       - EF Core release independent, code quality production ready, major release
           - "servicing" - EF Core release independent, code quality production ready, mainly bugfixes
     -->
-    <VersionPrefix>6.0.2</VersionPrefix>
-    <PreReleaseVersionLabel>servicing</PreReleaseVersionLabel>
+    <VersionPrefix>7.0.0</VersionPrefix>
+    <PreReleaseVersionLabel>alpha</PreReleaseVersionLabel>
     <PreReleaseVersionIteration>1</PreReleaseVersionIteration>
 
     <!--

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -30,43 +30,61 @@ jobs:
         MySQL 8.0 (Windows):
           vmImageName: 'windows-latest'
           databaseServerType: 'mysql'
-          databaseServerVersion: '8.0.27'
+          databaseServerVersion: '8.0.31'
           sqlMode: $(mysqlCurrentSqlMode)
           skipTests: $(skipWindowsTests)
         MySQL 8.0 (Linux):
           vmImageName: 'ubuntu-latest'
           databaseServerType: 'mysql'
-          databaseServerVersion: '8.0.27'
+          databaseServerVersion: '8.0.31'
           sqlMode: $(mysqlCurrentSqlMode)
           skipTests: false
         MySQL 5.7 (Linux):
           vmImageName: 'ubuntu-latest'
           databaseServerType: 'mysql'
-          databaseServerVersion: '5.7.36'
+          databaseServerVersion: '5.7.40'
           sqlMode: $(mysqlLegacySqlMode)
           skipTests: false
+        MariaDB 10.9 (Linux):
+          vmImageName: 'ubuntu-latest'
+          databaseServerType: 'mariadb'
+          databaseServerVersion: '10.9.4'
+          sqlMode: $(mariadbSqlMode)
+          skipTests: false
+        MariaDB 10.8 (Linux):
+          vmImageName: 'ubuntu-latest'
+          databaseServerType: 'mariadb'
+          databaseServerVersion: '10.8.6'
+          sqlMode: $(mariadbSqlMode)
+          skipTests: false
+        MariaDB 10.7 (Linux):
+          vmImageName: 'ubuntu-latest'
+          databaseServerType: 'mariadb'
+          databaseServerVersion: '10.7.7'
+          sqlMode: $(mariadbSqlMode)
+          skipTests: false
         MariaDB 10.6 (Linux):
           vmImageName: 'ubuntu-latest'
           databaseServerType: 'mariadb'
-          databaseServerVersion: '10.6.5'
+          databaseServerVersion: '10.6.11'
           sqlMode: $(mariadbSqlMode)
           skipTests: false
         MariaDB 10.5 (Linux):
           vmImageName: 'ubuntu-latest'
           databaseServerType: 'mariadb'
-          databaseServerVersion: '10.5.13'
+          databaseServerVersion: '10.5.18'
           sqlMode: $(mariadbSqlMode)
           skipTests: false
         MariaDB 10.4 (Linux):
           vmImageName: 'ubuntu-latest'
           databaseServerType: 'mariadb'
-          databaseServerVersion: '10.4.22'
+          databaseServerVersion: '10.4.27'
           sqlMode: $(mariadbSqlMode)
           skipTests: false
         MariaDB 10.3 (Linux):
           vmImageName: 'ubuntu-latest'
           databaseServerType: 'mariadb'
-          databaseServerVersion: '10.3.32'
+          databaseServerVersion: '10.3.37'
           sqlMode: $(mariadbSqlMode)
           skipTests: false
     pool:

diff --git a/dotnet-tools.json b/dotnet-tools.json
@@ -3,7 +3,7 @@
   "isRoot": true,
   "tools": {
     "dotnet-ef": {
-      "version": "6.0.0",
+      "version": "7.0.0",
       "commands": [
         "dotnet-ef"
       ]

diff --git a/global.json b/global.json
@@ -1,6 +1,6 @@
 {
   "sdk": {
-    "version": "6.0.100",
+    "version": "7.0.100",
     "allowPrerelease": false,
     "rollForward": "latestFeature"
   }

diff --git a/src/Directory.Build.props b/src/Directory.Build.props
@@ -9,7 +9,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" PrivateAssets="All" />
     <PackageReference Include="DotNetAnalyzers.DocumentationAnalyzers" PrivateAssets="All" />
   </ItemGroup>
 

diff --git a/src/EFCore.MySql.Json.Microsoft/EFCore.MySql.Json.Microsoft.csproj b/src/EFCore.MySql.Json.Microsoft/EFCore.MySql.Json.Microsoft.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>JSON support using System.Text.Json for Pomelo's MySQL provider for Entity Framework Core.</Description>
-    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <TargetFrameworks>$(PomeloTargetFrameworks)</TargetFrameworks>
     <MinClientVersion>3.6</MinClientVersion>
     <AssemblyName>Pomelo.EntityFrameworkCore.MySql.Json.Microsoft</AssemblyName>
     <RootNamespace>Pomelo.EntityFrameworkCore.MySql.Json.Microsoft</RootNamespace>
@@ -55,16 +55,16 @@
   <!-- TODO: Check, whether the following references are really all in use. -->
   <ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
     <Reference Include="Microsoft.EntityFrameworkCore">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Analyzers">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Relational">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
     </Reference>
 
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />

diff --git a/src/EFCore.MySql.Json.Newtonsoft/EFCore.MySql.Json.Newtonsoft.csproj b/src/EFCore.MySql.Json.Newtonsoft/EFCore.MySql.Json.Newtonsoft.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>JSON support using Newtonsoft.Json (JSON.NET) for Pomelo's MySQL provider for Entity Framework Core.</Description>
-    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <TargetFrameworks>$(PomeloTargetFrameworks)</TargetFrameworks>
     <MinClientVersion>3.6</MinClientVersion>
     <AssemblyName>Pomelo.EntityFrameworkCore.MySql.Json.Newtonsoft</AssemblyName>
     <RootNamespace>Pomelo.EntityFrameworkCore.MySql.Json.Newtonsoft</RootNamespace>
@@ -57,16 +57,16 @@
   <!-- TODO: Check, whether the following references are really all in use. -->
   <ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
     <Reference Include="Microsoft.EntityFrameworkCore">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Analyzers">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Relational">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
     </Reference>
 
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />

diff --git a/src/EFCore.MySql.NTS/EFCore.MySql.NTS.csproj b/src/EFCore.MySql.NTS/EFCore.MySql.NTS.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>NetTopologySuite support for Pomelo's MySQL provider for Entity Framework Core.</Description>
-    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <TargetFrameworks>$(PomeloTargetFrameworks)</TargetFrameworks>
     <MinClientVersion>3.6</MinClientVersion>
     <AssemblyName>Pomelo.EntityFrameworkCore.MySql.NetTopologySuite</AssemblyName>
     <RootNamespace>Pomelo.EntityFrameworkCore.MySql</RootNamespace>
@@ -57,16 +57,16 @@
   <!-- TODO: Check, whether the following references are really all in use. -->
   <ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
     <Reference Include="Microsoft.EntityFrameworkCore">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Analyzers">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Relational">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
     </Reference>
 
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" />

diff --git a/src/EFCore.MySql/EFCore.MySql.csproj b/src/EFCore.MySql/EFCore.MySql.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>Pomelo's MySQL database provider for Entity Framework Core.</Description>
-    <TargetFramework>$(DefaultNetCoreTargetFramework)</TargetFramework>
+    <TargetFrameworks>$(PomeloTargetFrameworks)</TargetFrameworks>
     <MinClientVersion>3.6</MinClientVersion>
     <AssemblyName>Pomelo.EntityFrameworkCore.MySql</AssemblyName>
     <RootNamespace>Pomelo.EntityFrameworkCore.MySql</RootNamespace>
@@ -30,16 +30,16 @@
 
   <ItemGroup Condition="'$(LocalEFCoreRepository)' != ''">
     <Reference Include="Microsoft.EntityFrameworkCore">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Abstractions">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Abstractions.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Analyzers">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Analyzers.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.EntityFrameworkCore.Relational">
-      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(TargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
+      <HintPath>$(LocalEFCoreRepository)\artifacts\bin\EFCore.Relational\Debug\$(EfCoreTargetFramework)\Microsoft.EntityFrameworkCore.Relational.dll</HintPath>
     </Reference>
 
     <PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" />
@@ -60,7 +60,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.DependencyInjection" />
     <PackageReference Include="StyleCop.Analyzers" PrivateAssets="All" />
   </ItemGroup>