diff --git a/.github/workflows/dotnet-core.yml b/.github/workflows/dotnet.yml
similarity index 53%
rename from .github/workflows/dotnet-core.yml
rename to .github/workflows/dotnet.yml
index 37e1f77..31607fa 100644
--- a/.github/workflows/dotnet-core.yml
+++ b/.github/workflows/dotnet.yml
@@ -1,4 +1,4 @@
-name: .NET Core
+name: .NET
 
 on:
   push:
@@ -13,13 +13,13 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-    - name: Setup .NET Core
+    - name: Setup .NET
       uses: actions/setup-dotnet@v1
       with:
-        dotnet-version: 5.0.100-rc.2.20479.15
-    - name: Install dependencies
+        dotnet-version: 6.0.x
+    - name: Restore dependencies
       run: dotnet restore
     - name: Build
-      run: dotnet build --configuration Release --no-restore
+      run: dotnet build --no-restore
     - name: Test
-      run: dotnet test --no-restore --verbosity normal
+      run: dotnet test --no-build --verbosity normal
diff --git a/EFCore.ConfigurationManager.Tests/EFCore.ConfigurationManager.Tests.csproj b/EFCore.ConfigurationManager.Tests/EFCore.ConfigurationManager.Tests.csproj
index 48e0565..cf2162d 100644
--- a/EFCore.ConfigurationManager.Tests/EFCore.ConfigurationManager.Tests.csproj
+++ b/EFCore.ConfigurationManager.Tests/EFCore.ConfigurationManager.Tests.csproj
@@ -2,23 +2,20 @@
   <Import Project="Sdk.props" Sdk="Microsoft.NET.Sdk" />
 
   <PropertyGroup>
-    <TargetFramework>net5.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <RootNamespace>EntityFrameworkCore.ConfigurationManager</RootNamespace>
     <AssemblyName>EntityFrameworkCore.ConfigurationManager.Tests</AssemblyName>
     <IsPackable>false</IsPackable>
-    <LangVersion>8.0</LangVersion>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="5.0.0-rc.2.20475.5" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0-rc.2.20475.6">
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="6.0.0">
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="5.0.0-rc.2.20475.6" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="5.0.0-rc.2.20475.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.7.1" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="6.0.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.0.0" />
     <PackageReference Include="xunit" Version="2.4.1" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/EFCore.ConfigurationManager/ConfigurationManagerDbContextOptionsExtension.cs b/EFCore.ConfigurationManager/ConfigurationManagerDbContextOptionsExtension.cs
index 7349549..02c869c 100644
--- a/EFCore.ConfigurationManager/ConfigurationManagerDbContextOptionsExtension.cs
+++ b/EFCore.ConfigurationManager/ConfigurationManagerDbContextOptionsExtension.cs
@@ -46,11 +46,14 @@ public override bool IsDatabaseProvider
             public override string LogFragment
                 => "using ConfigurationManager ";
 
-            public override long GetServiceProviderHashCode()
+            public override int GetServiceProviderHashCode()
                 => 0;
 
             public override void PopulateDebugInfo(IDictionary<string, string> debugInfo)
                 => debugInfo["ConfigurationManager"] = "1";
+
+            public override bool ShouldUseSameServiceProvider(DbContextOptionsExtensionInfo other)
+                => other is ExtensionInfo;
         }
     }
 }
diff --git a/EFCore.ConfigurationManager/ConfigurationManagerServiceCollectionExtensions.cs b/EFCore.ConfigurationManager/ConfigurationManagerServiceCollectionExtensions.cs
index 4690c01..66b6dc3 100644
--- a/EFCore.ConfigurationManager/ConfigurationManagerServiceCollectionExtensions.cs
+++ b/EFCore.ConfigurationManager/ConfigurationManagerServiceCollectionExtensions.cs
@@ -19,8 +19,7 @@ public static class ConfigurationManagerServiceCollectionExtensions
         public static IServiceCollection AddEntityFrameworkConfigurationManager(this IServiceCollection serviceCollection)
         {
             new EntityFrameworkRelationalServicesBuilder(serviceCollection)
-                .TryAddProviderSpecificServices(
-                    x => x.TryAddScoped<INamedConnectionStringResolver, ConfigrationManagerConnectionStringResolver>());
+                .TryAdd<INamedConnectionStringResolver, ConfigrationManagerConnectionStringResolver>();
 
             return serviceCollection;
         }
diff --git a/EFCore.ConfigurationManager/EFCore.ConfigurationManager.csproj b/EFCore.ConfigurationManager/EFCore.ConfigurationManager.csproj
index 18747d7..e5a018b 100644
--- a/EFCore.ConfigurationManager/EFCore.ConfigurationManager.csproj
+++ b/EFCore.ConfigurationManager/EFCore.ConfigurationManager.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFramework>netstandard2.0</TargetFramework>
+    <TargetFramework>net6.0</TargetFramework>
     <AssemblyName>EntityFrameworkCore.ConfigurationManager</AssemblyName>
     <RootNamespace>EntityFrameworkCore.ConfigurationManager</RootNamespace>
     <Authors>Brice Lambson</Authors>
@@ -10,19 +10,19 @@
     <PackageTags>EFCore;Config</PackageTags>
     <RepositoryUrl>https://github.com/efcore/EFCore.ConfigurationManager.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
-    <Copyright>© 2020 Brice Lambson. All rights reserved.</Copyright>
+    <Copyright>© 2021 Brice Lambson. All rights reserved.</Copyright>
     <SignAssembly>true</SignAssembly>
     <AssemblyOriginatorKeyFile>..\key.snk</AssemblyOriginatorKeyFile>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
-    <LangVersion>8.0</LangVersion>
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageReleaseNotes>https://github.com/efcore/EFCore.ConfigurationManager/releases</PackageReleaseNotes>
+    <Version>2.0.0</Version>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="3.1.9" />
-    <PackageReference Include="System.Configuration.ConfigurationManager" Version="4.7.0" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Relational" Version="6.0.0" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" Version="6.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/README.md b/README.md
index 6751127..3627f3c 100644
--- a/README.md
+++ b/README.md
@@ -14,6 +14,17 @@ The latest stable version is available on [NuGet](https://www.nuget.org/packages
 dotnet add package EntityFrameworkCore.ConfigurationManager
 ```
 
+Compatibility
+-------------
+
+The following table shows which version of this library to use with which version of EF Core.
+
+EF Core | Version to use
+------- | --------------
+6.0     | 2.x
+5.0     | 1.x
+3.1     | 1.x
+
 Usage
 -----