diff --git a/AuthPermissions.AspNetCore/CreateNuGetRelease.nuspec b/AuthPermissions.AspNetCore/CreateNuGetRelease.nuspec
index c872ccb7..265cd5f6 100644
--- a/AuthPermissions.AspNetCore/CreateNuGetRelease.nuspec
+++ b/AuthPermissions.AspNetCore/CreateNuGetRelease.nuspec
@@ -2,46 +2,41 @@
 <package xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>AuthPermissions.AspNetCore</id>
-    <version>6.0.0</version>
+    <version>6.1.0</version>
     <authors>Jon P Smith</authors>
     <product>AuthPermissions.AspNetCore</product>
     <copyright>Copyright (c) 2021 Jon P Smith</copyright>
     <description>Provides extra authorization and multi-tenant features to a ASP.NET Core application.</description>
     <releaseNotes>
-		- Significant changes to code to support sharding multi-tenant applications
-		- BREAKING CHANGES: Replaced the old services for handling sharding entries due to a limitation
-		- Improvement: The ability to define a sharding-only mode - see Configuring sharding &gt; sharding-only mode
-		- Fix: The Sign up for a new tenant, with versioning now works with sharding-only tenants.
-		- Improvement: New service to simplify the create / delete of sharding-only tenants.
-    </releaseNotes>
+		- New version to support NET 8 - now supports NET 6, 7, and 8
+	</releaseNotes>
     <license type="expression">MIT</license>
     <projectUrl>https://github.com/JonPSmith/AuthPermissions.AspNetCore</projectUrl>
     <icon>images\AuthPermissionsAspNetCoreNuGetIcon.png</icon>
     <tags>ASP.NET Core, Entity Framework Core</tags>
     <dependencies>
-      <group targetFramework="net6.0">
+      <group targetFramework="net8.0">
         <dependency id="GenericServices.StatusGeneric" version="1.2.0" />
-        <dependency id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" version="6.0.11" />
-        <dependency id="Microsoft.Data.Sqlite.Core" version="6.0.11" />
-        <dependency id="Microsoft.EntityFrameworkCore" version="6.0.11" />
-        <dependency id="Microsoft.EntityFrameworkCore.InMemory" version="6.0.11" />
-        <dependency id="Microsoft.EntityFrameworkCore.Sqlite" version="6.0.11" />
-        <dependency id="Microsoft.EntityFrameworkCore.SqlServer" version="6.0.11" />
-        <dependency id="Microsoft.EntityFrameworkCore.Tools" version="6.0.11" />
-        <dependency id="Microsoft.Extensions.Hosting" version="6.0.1" />
+        <dependency id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" version="8.0.0" />
+        <dependency id="Microsoft.Data.Sqlite.Core" version="8.0.0" />
+        <dependency id="Microsoft.EntityFrameworkCore" version="8.0.0" />
+        <dependency id="Microsoft.EntityFrameworkCore.InMemory" version="8.0.0" />
+        <dependency id="Microsoft.EntityFrameworkCore.Sqlite" version="8.0.0" />
+        <dependency id="Microsoft.EntityFrameworkCore.SqlServer" version="8.0.0" />
+        <dependency id="Microsoft.EntityFrameworkCore.Tools" version="8.0.0" />
+        <dependency id="Microsoft.Extensions.Hosting" version="8.0.0" />
         <dependency id="Net.RunMethodsSequentially" version="2.0.0" />
-        <dependency id="Npgsql.EntityFrameworkCore.PostgreSQL" version="6.0.7" />
-        <dependency id="Net.LocalizeMessagesAndErrors" version="1.0.0" />
-        <dependency id="Microsoft.AspNetCore.Authentication.OpenIdConnect" version="6.0.11" />
-        <dependency id="Microsoft.AspNetCore.Authorization" version="6.0.11" />
+        <dependency id="Npgsql.EntityFrameworkCore.PostgreSQL" version="8.0.0" />
+        <dependency id="Net.LocalizeMessagesAndErrors" version="2.0.0" />
+        <dependency id="Microsoft.AspNetCore.Authentication.OpenIdConnect" version="8.0.0" />
+        <dependency id="Microsoft.AspNetCore.Authorization" version="8.0.0" />
         <dependency id="Microsoft.AspNetCore.Http" version="2.2.2" />
         <dependency id="Net.DistributedFileStoreCache" version="2.0.0" />
         <dependency id="EntityFrameworkCore.Exceptions.PostgreSQL" version="6.0.3" />
         <dependency id="EntityFrameworkCore.Exceptions.Sqlite" version="6.0.3" />
         <dependency id="EntityFrameworkCore.Exceptions.SqlServer" version="6.0.3.1" />
-        <dependency id="Microsoft.Extensions.Localization.Abstractions" version="6.0.11" />
+        <dependency id="Microsoft.Extensions.Localization.Abstractions" version="8.0.0" />
         <dependency id="DistributedLock" version="2.3.2" />
-        <dependency id="EfCore.TestSupport" version="6.0.0" />
         <dependency id="Microsoft.AspNetCore.Hosting" version="2.2.7" />
         <dependency id="Microsoft.Graph" version="4.37.0" />
       </group>
@@ -57,7 +52,7 @@
         <dependency id="Microsoft.Extensions.Hosting" version="7.0.0" />
         <dependency id="Net.RunMethodsSequentially" version="2.0.0" />
         <dependency id="Npgsql.EntityFrameworkCore.PostgreSQL" version="7.0.0" />
-        <dependency id="Net.LocalizeMessagesAndErrors" version="1.0.0" />
+        <dependency id="Net.LocalizeMessagesAndErrors" version="2.0.0" />
         <dependency id="Microsoft.AspNetCore.Authentication.OpenIdConnect" version="7.0.0" />
         <dependency id="Microsoft.AspNetCore.Authorization" version="7.0.0" />
         <dependency id="Microsoft.AspNetCore.Http" version="2.2.2" />
@@ -67,47 +62,88 @@
         <dependency id="EntityFrameworkCore.Exceptions.SqlServer" version="6.0.3.1" />
         <dependency id="Microsoft.Extensions.Localization.Abstractions" version="7.0.0" />
         <dependency id="DistributedLock" version="2.3.2" />
-        <dependency id="EfCore.TestSupport" version="6.0.0" />
+        <dependency id="Microsoft.AspNetCore.Hosting" version="2.2.7" />
+        <dependency id="Microsoft.Graph" version="4.37.0" />
+      </group>
+      <group targetFramework="net6.0">
+        <dependency id="GenericServices.StatusGeneric" version="1.2.0" />
+        <dependency id="Microsoft.AspNetCore.Identity.EntityFrameworkCore" version="6.0.11" />
+        <dependency id="Microsoft.Data.Sqlite.Core" version="6.0.11" />
+        <dependency id="Microsoft.EntityFrameworkCore" version="6.0.11" />
+        <dependency id="Microsoft.EntityFrameworkCore.InMemory" version="6.0.11" />
+        <dependency id="Microsoft.EntityFrameworkCore.Sqlite" version="6.0.11" />
+        <dependency id="Microsoft.EntityFrameworkCore.SqlServer" version="6.0.11" />
+        <dependency id="Microsoft.EntityFrameworkCore.Tools" version="6.0.11" />
+        <dependency id="Microsoft.Extensions.Hosting" version="6.0.1" />
+        <dependency id="Net.RunMethodsSequentially" version="2.0.0" />
+        <dependency id="Npgsql.EntityFrameworkCore.PostgreSQL" version="6.0.7" />
+        <dependency id="Net.LocalizeMessagesAndErrors" version="2.0.0" />
+        <dependency id="Microsoft.AspNetCore.Authentication.OpenIdConnect" version="6.0.11" />
+        <dependency id="Microsoft.AspNetCore.Authorization" version="6.0.11" />
+        <dependency id="Microsoft.AspNetCore.Http" version="2.2.2" />
+        <dependency id="Net.DistributedFileStoreCache" version="2.0.0" />
+        <dependency id="EntityFrameworkCore.Exceptions.PostgreSQL" version="6.0.3" />
+        <dependency id="EntityFrameworkCore.Exceptions.Sqlite" version="6.0.3" />
+        <dependency id="EntityFrameworkCore.Exceptions.SqlServer" version="6.0.3.1" />
+        <dependency id="Microsoft.Extensions.Localization.Abstractions" version="6.0.11" />
+        <dependency id="DistributedLock" version="2.3.2" />
         <dependency id="Microsoft.AspNetCore.Hosting" version="2.2.7" />
         <dependency id="Microsoft.Graph" version="4.37.0" />
       </group>
     </dependencies>
   </metadata>
   <files>
-    <file src="..\AuthPermissions\bin\Release\net6.0\AuthPermissions.dll" target="lib\net6.0" />
-    <file src="..\AuthPermissions\bin\Release\net6.0\AuthPermissions.xml" target="lib\net6.0" />
-    <file src="..\AuthPermissions\bin\Release\net6.0\AuthPermissions.pdb" target="lib\net6.0" />
+    <file src="..\AuthPermissions\bin\Release\net8.0\AuthPermissions.dll" target="lib\net8.0" />
+    <file src="..\AuthPermissions\bin\Release\net8.0\AuthPermissions.xml" target="lib\net8.0" />
+    <file src="..\AuthPermissions\bin\Release\net8.0\AuthPermissions.pdb" target="lib\net8.0" />
     <file src="..\AuthPermissions\bin\Release\net7.0\AuthPermissions.dll" target="lib\net7.0" />
     <file src="..\AuthPermissions\bin\Release\net7.0\AuthPermissions.xml" target="lib\net7.0" />
     <file src="..\AuthPermissions\bin\Release\net7.0\AuthPermissions.pdb" target="lib\net7.0" />
-    <file src="..\AuthPermissions.AspNetCore\bin\Release\net6.0\AuthPermissions.AspNetCore.dll" target="lib\net6.0" />
-    <file src="..\AuthPermissions.AspNetCore\bin\Release\net6.0\AuthPermissions.AspNetCore.xml" target="lib\net6.0" />
-    <file src="..\AuthPermissions.AspNetCore\bin\Release\net6.0\AuthPermissions.AspNetCore.pdb" target="lib\net6.0" />
+    <file src="..\AuthPermissions\bin\Release\net6.0\AuthPermissions.dll" target="lib\net6.0" />
+    <file src="..\AuthPermissions\bin\Release\net6.0\AuthPermissions.xml" target="lib\net6.0" />
+    <file src="..\AuthPermissions\bin\Release\net6.0\AuthPermissions.pdb" target="lib\net6.0" />
+    <file src="..\AuthPermissions.AspNetCore\bin\Release\net8.0\AuthPermissions.AspNetCore.dll" target="lib\net8.0" />
+    <file src="..\AuthPermissions.AspNetCore\bin\Release\net8.0\AuthPermissions.AspNetCore.xml" target="lib\net8.0" />
+    <file src="..\AuthPermissions.AspNetCore\bin\Release\net8.0\AuthPermissions.AspNetCore.pdb" target="lib\net8.0" />
     <file src="..\AuthPermissions.AspNetCore\bin\Release\net7.0\AuthPermissions.AspNetCore.dll" target="lib\net7.0" />
     <file src="..\AuthPermissions.AspNetCore\bin\Release\net7.0\AuthPermissions.AspNetCore.xml" target="lib\net7.0" />
     <file src="..\AuthPermissions.AspNetCore\bin\Release\net7.0\AuthPermissions.AspNetCore.pdb" target="lib\net7.0" />
-    <file src="..\AuthPermissions.BaseCode\bin\Release\net6.0\AuthPermissions.BaseCode.dll" target="lib\net6.0" />
-    <file src="..\AuthPermissions.BaseCode\bin\Release\net6.0\AuthPermissions.BaseCode.xml" target="lib\net6.0" />
-    <file src="..\AuthPermissions.BaseCode\bin\Release\net6.0\AuthPermissions.BaseCode.pdb" target="lib\net6.0" />
+    <file src="..\AuthPermissions.AspNetCore\bin\Release\net6.0\AuthPermissions.AspNetCore.dll" target="lib\net6.0" />
+    <file src="..\AuthPermissions.AspNetCore\bin\Release\net6.0\AuthPermissions.AspNetCore.xml" target="lib\net6.0" />
+    <file src="..\AuthPermissions.AspNetCore\bin\Release\net6.0\AuthPermissions.AspNetCore.pdb" target="lib\net6.0" />
+    <file src="..\AuthPermissions.BaseCode\bin\Release\net8.0\AuthPermissions.BaseCode.dll" target="lib\net8.0" />
+    <file src="..\AuthPermissions.BaseCode\bin\Release\net8.0\AuthPermissions.BaseCode.xml" target="lib\net8.0" />
+    <file src="..\AuthPermissions.BaseCode\bin\Release\net8.0\AuthPermissions.BaseCode.pdb" target="lib\net8.0" />
     <file src="..\AuthPermissions.BaseCode\bin\Release\net7.0\AuthPermissions.BaseCode.dll" target="lib\net7.0" />
     <file src="..\AuthPermissions.BaseCode\bin\Release\net7.0\AuthPermissions.BaseCode.xml" target="lib\net7.0" />
     <file src="..\AuthPermissions.BaseCode\bin\Release\net7.0\AuthPermissions.BaseCode.pdb" target="lib\net7.0" />
-    <file src="..\AuthPermissions.PostgreSql\bin\Release\net6.0\AuthPermissions.PostgreSql.dll" target="lib\net6.0" />
-    <file src="..\AuthPermissions.PostgreSql\bin\Release\net6.0\AuthPermissions.PostgreSql.xml" target="lib\net6.0" />
-    <file src="..\AuthPermissions.PostgreSql\bin\Release\net6.0\AuthPermissions.PostgreSql.pdb" target="lib\net6.0" />
+    <file src="..\AuthPermissions.BaseCode\bin\Release\net6.0\AuthPermissions.BaseCode.dll" target="lib\net6.0" />
+    <file src="..\AuthPermissions.BaseCode\bin\Release\net6.0\AuthPermissions.BaseCode.xml" target="lib\net6.0" />
+    <file src="..\AuthPermissions.BaseCode\bin\Release\net6.0\AuthPermissions.BaseCode.pdb" target="lib\net6.0" />
+    <file src="..\AuthPermissions.PostgreSql\bin\Release\net8.0\AuthPermissions.PostgreSql.dll" target="lib\net8.0" />
+    <file src="..\AuthPermissions.PostgreSql\bin\Release\net8.0\AuthPermissions.PostgreSql.xml" target="lib\net8.0" />
+    <file src="..\AuthPermissions.PostgreSql\bin\Release\net8.0\AuthPermissions.PostgreSql.pdb" target="lib\net8.0" />
     <file src="..\AuthPermissions.PostgreSql\bin\Release\net7.0\AuthPermissions.PostgreSql.dll" target="lib\net7.0" />
     <file src="..\AuthPermissions.PostgreSql\bin\Release\net7.0\AuthPermissions.PostgreSql.xml" target="lib\net7.0" />
     <file src="..\AuthPermissions.PostgreSql\bin\Release\net7.0\AuthPermissions.PostgreSql.pdb" target="lib\net7.0" />
-    <file src="..\AuthPermissions.SqlServer\bin\Release\net6.0\AuthPermissions.SqlServer.dll" target="lib\net6.0" />
-    <file src="..\AuthPermissions.SqlServer\bin\Release\net6.0\AuthPermissions.SqlServer.pdb" target="lib\net6.0" />
+    <file src="..\AuthPermissions.PostgreSql\bin\Release\net6.0\AuthPermissions.PostgreSql.dll" target="lib\net6.0" />
+    <file src="..\AuthPermissions.PostgreSql\bin\Release\net6.0\AuthPermissions.PostgreSql.xml" target="lib\net6.0" />
+    <file src="..\AuthPermissions.PostgreSql\bin\Release\net6.0\AuthPermissions.PostgreSql.pdb" target="lib\net6.0" />
+    <file src="..\AuthPermissions.SqlServer\bin\Release\net8.0\AuthPermissions.SqlServer.dll" target="lib\net8.0" />
+    <file src="..\AuthPermissions.SqlServer\bin\Release\net8.0\AuthPermissions.SqlServer.pdb" target="lib\net8.0" />
     <file src="..\AuthPermissions.SqlServer\bin\Release\net7.0\AuthPermissions.SqlServer.dll" target="lib\net7.0" />
     <file src="..\AuthPermissions.SqlServer\bin\Release\net7.0\AuthPermissions.SqlServer.pdb" target="lib\net7.0" />
-    <file src="..\AuthPermissions.SupportCode\bin\Release\net6.0\AuthPermissions.SupportCode.dll" target="lib\net6.0" />
-    <file src="..\AuthPermissions.SupportCode\bin\Release\net6.0\AuthPermissions.SupportCode.xml" target="lib\net6.0" />
-    <file src="..\AuthPermissions.SupportCode\bin\Release\net6.0\AuthPermissions.SupportCode.pdb" target="lib\net6.0" />
+    <file src="..\AuthPermissions.SqlServer\bin\Release\net6.0\AuthPermissions.SqlServer.dll" target="lib\net6.0" />
+    <file src="..\AuthPermissions.SqlServer\bin\Release\net6.0\AuthPermissions.SqlServer.pdb" target="lib\net6.0" />
+    <file src="..\AuthPermissions.SupportCode\bin\Release\net8.0\AuthPermissions.SupportCode.dll" target="lib\net8.0" />
+    <file src="..\AuthPermissions.SupportCode\bin\Release\net8.0\AuthPermissions.SupportCode.xml" target="lib\net8.0" />
+    <file src="..\AuthPermissions.SupportCode\bin\Release\net8.0\AuthPermissions.SupportCode.pdb" target="lib\net8.0" />
     <file src="..\AuthPermissions.SupportCode\bin\Release\net7.0\AuthPermissions.SupportCode.dll" target="lib\net7.0" />
     <file src="..\AuthPermissions.SupportCode\bin\Release\net7.0\AuthPermissions.SupportCode.xml" target="lib\net7.0" />
     <file src="..\AuthPermissions.SupportCode\bin\Release\net7.0\AuthPermissions.SupportCode.pdb" target="lib\net7.0" />
+    <file src="..\AuthPermissions.SupportCode\bin\Release\net6.0\AuthPermissions.SupportCode.dll" target="lib\net6.0" />
+    <file src="..\AuthPermissions.SupportCode\bin\Release\net6.0\AuthPermissions.SupportCode.xml" target="lib\net6.0" />
+    <file src="..\AuthPermissions.SupportCode\bin\Release\net6.0\AuthPermissions.SupportCode.pdb" target="lib\net6.0" />
     <file src="..\AuthPermissions.AspNetCore\images\AuthPermissionsAspNetCoreNuGetIcon.png" target="images\" />
   </files>
 </package>
\ No newline at end of file
diff --git a/AuthPermissions.BaseCode/AuthPermissions.BaseCode.csproj b/AuthPermissions.BaseCode/AuthPermissions.BaseCode.csproj
index a71deef9..9233e06e 100644
--- a/AuthPermissions.BaseCode/AuthPermissions.BaseCode.csproj
+++ b/AuthPermissions.BaseCode/AuthPermissions.BaseCode.csproj
@@ -44,7 +44,7 @@
 
 
 	<ItemGroup>
-		<PackageReference Include="Net.LocalizeMessagesAndErrors" Version="1.0.0" />
+		<PackageReference Include="Net.LocalizeMessagesAndErrors" Version="2.0.0" />
 	</ItemGroup>
 
 </Project>
\ No newline at end of file