diff --git a/.github/workflows/CI.yml b/.github/workflows/CI.yml
index 84e46250..616414c3 100644
--- a/.github/workflows/CI.yml
+++ b/.github/workflows/CI.yml
@@ -65,8 +65,8 @@ jobs:
       with:
         dotnet-version: |
             6.0.x
-            7.0.x
             8.0.x
+            9.0.x
 
     # Tools
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a20787a4..3d98da48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,17 @@
 
 Represents the **NuGet** versions.
 
+## v5.18.0
+- *Enhancement:* Added `net9.0` support.
+- *Enhancement:* Deprecated `net7.0` support; no longer supported by [Microsoft](https://dotnet.microsoft.com/en-us/platform/support/policy).
+- *Enhancement:* Updated dependencies to latest; including transitive where applicable.
+- *Enhancement:* Integrated `UnitTestEx` version `5.0.0` to enable the latest capabilities and improvements.
+  - `CoreEx.UnitTesting.NUnit` given changes is no longer required and has been deprecated, the `UnitTestEx.NUnit` (or other) must be explicitly referenced as per testing framework being used.
+  - `CoreEx.UnitTesting` package updated to include only standard .NET core capabilities to follow new `UnitTestEx` pattern; new packages created to house specific as follows:
+    - `CoreEx.UnitTesting.Azure.Functions` created to house Azure Functions specific capabilities;
+    - `CoreEx.UnitTesting.Azure.ServiceBus` created to house Azure Service Bus specific capabilities.
+  - Existing usage will require references to the new packages as required. There should be limited need to update existing tests to use beyond the requirement for the root `UnitTestEx` namespace. The updated default within `UnitTestEx` is to expose the key capabilities from the root namespace. For example, `using UnitTestEx.NUnit`, should be replaced with `using UnitTestEx`.
+
 ## v5.17.1
 - *Fixed:* The database console `Script` command execution has been updated to output to the correct directory path.
 - *Fixed:* The `Agent` code-generation artefacts have been further simplified/improved.
diff --git a/Common.targets b/Common.targets
index 15e9c25a..9a2cf690 100644
--- a/Common.targets
+++ b/Common.targets
@@ -1,6 +1,6 @@
 <Project>
 	<PropertyGroup>
-		<Version>5.17.1</Version>
+		<Version>5.18.0</Version>
 		<LangVersion>preview</LangVersion>
 		<Authors>Avanade</Authors>
 		<Company>Avanade</Company>
diff --git a/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj b/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj
index bd88762f..607621a8 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj
+++ b/samples/Cdr.Banking/Cdr.Banking.Api/Cdr.Banking.Api.csproj
@@ -5,8 +5,8 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.9.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Cdr.Banking.Business\Cdr.Banking.Business.csproj" />
diff --git a/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj b/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj
index f5ee3356..70a647fd 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj
+++ b/samples/Cdr.Banking/Cdr.Banking.Business/Cdr.Banking.Business.csproj
@@ -12,8 +12,8 @@
     <Folder Include="DataSvc\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Cosmos" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.27.3" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Cosmos" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.30.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj b/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj
index d1ff3b43..608f1143 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj
+++ b/samples/Cdr.Banking/Cdr.Banking.Common/Cdr.Banking.Common.csproj
@@ -10,6 +10,6 @@
     <Folder Include="Entities\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/AccountTest.cs b/samples/Cdr.Banking/Cdr.Banking.Test/AccountTest.cs
index f5fd2610..4d93952c 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Test/AccountTest.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Test/AccountTest.cs
@@ -8,7 +8,6 @@
 using System.Net;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Cdr.Banking.Test
 {
diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj b/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj
index be08da64..c0fdd93a 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj
+++ b/samples/Cdr.Banking/Cdr.Banking.Test/Cdr.Banking.Test.csproj
@@ -34,12 +34,13 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.27.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="CoreEx.UnitTesting" Version="3.30.0" />
+    <PackageReference Include="UnitTestEx.NUnit" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/FixtureSetup.cs b/samples/Cdr.Banking/Cdr.Banking.Test/FixtureSetup.cs
index 46ab9ee1..fae54a69 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Test/FixtureSetup.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Test/FixtureSetup.cs
@@ -7,7 +7,6 @@
 using NUnit.Framework;
 using System.Threading.Tasks;
 using UnitTestEx;
-using UnitTestEx.NUnit;
 using Cosmos = Microsoft.Azure.Cosmos;
 
 namespace Cdr.Banking.Test
diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/TransactionArgsTest.cs b/samples/Cdr.Banking/Cdr.Banking.Test/TransactionArgsTest.cs
index 4e312bad..15e27b0a 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Test/TransactionArgsTest.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Test/TransactionArgsTest.cs
@@ -6,7 +6,6 @@
 using System.Threading.Tasks;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Cdr.Banking.Test
 {
diff --git a/samples/Cdr.Banking/Cdr.Banking.Test/TransactionTest.cs b/samples/Cdr.Banking/Cdr.Banking.Test/TransactionTest.cs
index 4248121f..2e1d969c 100644
--- a/samples/Cdr.Banking/Cdr.Banking.Test/TransactionTest.cs
+++ b/samples/Cdr.Banking/Cdr.Banking.Test/TransactionTest.cs
@@ -7,7 +7,6 @@
 using System.Net;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Cdr.Banking.Test
 {
diff --git a/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj b/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj
index ecbe0025..70663282 100644
--- a/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj
+++ b/samples/Demo/Beef.Demo.Api/Beef.Demo.Api.csproj
@@ -12,9 +12,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.9.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="7.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj b/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj
index 1887a2ba..e2e56850 100644
--- a/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj
+++ b/samples/Demo/Beef.Demo.Business/Beef.Demo.Business.csproj
@@ -16,14 +16,14 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Cosmos" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Database" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.27.3" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.27.3" />
-    <PackageReference Include="CoreEx.FluentValidation" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Cosmos" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Database" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.30.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.30.0" />
+    <PackageReference Include="CoreEx.FluentValidation" Version="3.30.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.20" />
   </ItemGroup>
 
diff --git a/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj b/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj
index 7f084664..a24738b2 100644
--- a/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj
+++ b/samples/Demo/Beef.Demo.Common/Beef.Demo.Common.csproj
@@ -9,7 +9,7 @@
     <Folder Include="Agents\" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
     <PackageReference Include="Grpc.Tools" Version="2.67.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj b/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj
index 46061949..4fda6926 100644
--- a/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj
+++ b/samples/Demo/Beef.Demo.Test/Beef.Demo.Test.csproj
@@ -52,8 +52,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.UnitTesting" Version="3.27.3" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+    <PackageReference Include="CoreEx.UnitTesting" Version="3.30.0" />
+    <PackageReference Include="UnitTestEx.NUnit" Version="5.0.0" />
+    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -61,7 +62,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/Demo/Beef.Demo.Test/ContactTest.cs b/samples/Demo/Beef.Demo.Test/ContactTest.cs
index 1802c644..1bfbe080 100644
--- a/samples/Demo/Beef.Demo.Test/ContactTest.cs
+++ b/samples/Demo/Beef.Demo.Test/ContactTest.cs
@@ -10,7 +10,6 @@
 using System.Net;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {
diff --git a/samples/Demo/Beef.Demo.Test/EventOutboxTest.cs b/samples/Demo/Beef.Demo.Test/EventOutboxTest.cs
index 27b00cf3..eddfaa27 100644
--- a/samples/Demo/Beef.Demo.Test/EventOutboxTest.cs
+++ b/samples/Demo/Beef.Demo.Test/EventOutboxTest.cs
@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Threading.Tasks;
 using UnitTestEx;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {
diff --git a/samples/Demo/Beef.Demo.Test/FixtureSetup.cs b/samples/Demo/Beef.Demo.Test/FixtureSetup.cs
index 108e06d8..1d381319 100644
--- a/samples/Demo/Beef.Demo.Test/FixtureSetup.cs
+++ b/samples/Demo/Beef.Demo.Test/FixtureSetup.cs
@@ -6,7 +6,6 @@
 using Microsoft.Extensions.DependencyInjection;
 using NUnit.Framework;
 using UnitTestEx;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {
diff --git a/samples/Demo/Beef.Demo.Test/GenderTest.cs b/samples/Demo/Beef.Demo.Test/GenderTest.cs
index d58c1e87..2f0c959a 100644
--- a/samples/Demo/Beef.Demo.Test/GenderTest.cs
+++ b/samples/Demo/Beef.Demo.Test/GenderTest.cs
@@ -7,7 +7,6 @@
 using System.Net;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {
diff --git a/samples/Demo/Beef.Demo.Test/PostalInfoTest.cs b/samples/Demo/Beef.Demo.Test/PostalInfoTest.cs
index 5421ed6f..ac03515b 100644
--- a/samples/Demo/Beef.Demo.Test/PostalInfoTest.cs
+++ b/samples/Demo/Beef.Demo.Test/PostalInfoTest.cs
@@ -9,7 +9,7 @@
 using System.Net;
 using System.Net.Http;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
+using UnitTestEx;
 
 namespace Beef.Demo.Test
 {
diff --git a/samples/Demo/Beef.Demo.Test/ReferenceDataTest.cs b/samples/Demo/Beef.Demo.Test/ReferenceDataTest.cs
index 63ec42be..8ba847dc 100644
--- a/samples/Demo/Beef.Demo.Test/ReferenceDataTest.cs
+++ b/samples/Demo/Beef.Demo.Test/ReferenceDataTest.cs
@@ -13,7 +13,6 @@
 using System.Threading.Tasks;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {
diff --git a/samples/Demo/Beef.Demo.Test/RobotTest.cs b/samples/Demo/Beef.Demo.Test/RobotTest.cs
index 81c210c1..65d7f15e 100644
--- a/samples/Demo/Beef.Demo.Test/RobotTest.cs
+++ b/samples/Demo/Beef.Demo.Test/RobotTest.cs
@@ -17,7 +17,6 @@
 using System.Threading.Tasks;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 using Cosmos = Microsoft.Azure.Cosmos;
 
 namespace Beef.Demo.Test
diff --git a/samples/Demo/Beef.Demo.Test/XParallelPersonTest.cs b/samples/Demo/Beef.Demo.Test/XParallelPersonTest.cs
index 58052f24..c6bd6909 100644
--- a/samples/Demo/Beef.Demo.Test/XParallelPersonTest.cs
+++ b/samples/Demo/Beef.Demo.Test/XParallelPersonTest.cs
@@ -6,7 +6,6 @@
 using System.Net;
 using UnitTestEx;
 using UnitTestEx.Expectations;
-using UnitTestEx.NUnit;
 
 namespace Beef.Demo.Test
 {
diff --git a/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj b/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj
index b5450bbb..95abdd2d 100644
--- a/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj
+++ b/samples/My.Hr/My.Hr.Api/My.Hr.Api.csproj
@@ -5,9 +5,9 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="6.9.0" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore.Newtonsoft" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\My.Hr.Business\My.Hr.Business.csproj" />
diff --git a/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj b/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj
index 180dc43b..fabe9840 100644
--- a/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj
+++ b/samples/My.Hr/My.Hr.Business/My.Hr.Business.csproj
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.27.3" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.30.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.30.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="6.0.31" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj b/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj
index 0af66a9b..57b3fe3d 100644
--- a/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj
+++ b/samples/My.Hr/My.Hr.Common/My.Hr.Common.csproj
@@ -6,6 +6,6 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/My.Hr/My.Hr.Test/GlobalUsings.cs b/samples/My.Hr/My.Hr.Test/GlobalUsings.cs
index c40577f0..678019a8 100644
--- a/samples/My.Hr/My.Hr.Test/GlobalUsings.cs
+++ b/samples/My.Hr/My.Hr.Test/GlobalUsings.cs
@@ -16,7 +16,6 @@
 global using System.Threading.Tasks;
 global using UnitTestEx;
 global using UnitTestEx.Expectations;
-global using UnitTestEx.NUnit;
 global using My.Hr.Api;
 global using My.Hr.Business;
 global using My.Hr.Business.Data;
diff --git a/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj b/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj
index a745e8cf..a8a9a01d 100644
--- a/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj
+++ b/samples/My.Hr/My.Hr.Test/My.Hr.Test.csproj
@@ -32,17 +32,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.27.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="CoreEx.UnitTesting" Version="3.30.0" />
+    <PackageReference Include="UnitTestEx.NUnit" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj b/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj
index a67e2b5a..83980463 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Api/MyEf.Hr.Api.csproj
@@ -6,12 +6,12 @@
     <GenerateDocumentationFile>True</GenerateDocumentationFile>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.AspNetCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Azure" Version="3.27.3" />
+    <PackageReference Include="CoreEx.AspNetCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Azure" Version="3.30.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
     <PackageReference Include="AspNetCore.HealthChecks.Azure.Storage.Blobs" Version="8.0.1" />
     <PackageReference Include="Azure.Monitor.OpenTelemetry.AspNetCore" Version="1.2.0" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.9.0" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\MyEf.Hr.Business\MyEf.Hr.Business.csproj" />
diff --git a/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj b/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj
index a724b01e..850c916c 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Business/MyEf.Hr.Business.csproj
@@ -6,10 +6,10 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.27.3" />
-    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.30.0" />
+    <PackageReference Include="CoreEx.EntityFrameworkCore" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.30.0" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.10" />
   </ItemGroup>
   <ItemGroup>
diff --git a/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj b/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj
index 5628145b..acc2eb22 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Common/MyEf.Hr.Common.csproj
@@ -7,6 +7,6 @@
     <ImplicitUsings>true</ImplicitUsings>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj b/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj
index 97c6b2f3..0fe6cb6e 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Security.Subscriptions/MyEf.Hr.Security.Subscriptions.csproj
@@ -15,8 +15,8 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="CoreEx.Azure" Version="3.27.3" />
-    <PackageReference Include="CoreEx.Validation" Version="3.27.3" />
+    <PackageReference Include="CoreEx.Azure" Version="3.30.0" />
+    <PackageReference Include="CoreEx.Validation" Version="3.30.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker" Version="1.23.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Extensions.ServiceBus" Version="5.22.0" />
     <PackageReference Include="Microsoft.Azure.Functions.Worker.Sdk" Version="1.18.1" />
diff --git a/samples/MyEf.Hr/MyEf.Hr.Security.Test/GlobalUsings.cs b/samples/MyEf.Hr/MyEf.Hr.Security.Test/GlobalUsings.cs
index 0b26e8fb..8fa48dfa 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Security.Test/GlobalUsings.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Security.Test/GlobalUsings.cs
@@ -7,5 +7,4 @@
 global using NUnit.Framework.Internal;
 global using System.Net;
 global using UnitTestEx;
-global using UnitTestEx.Expectations;
-global using UnitTestEx.NUnit;
\ No newline at end of file
+global using UnitTestEx.Expectations;
\ No newline at end of file
diff --git a/samples/MyEf.Hr/MyEf.Hr.Security.Test/MyEf.Hr.Security.Test.csproj b/samples/MyEf.Hr/MyEf.Hr.Security.Test/MyEf.Hr.Security.Test.csproj
index 722b853c..bfa87ff8 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Security.Test/MyEf.Hr.Security.Test.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Security.Test/MyEf.Hr.Security.Test.csproj
@@ -16,10 +16,10 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NUnit" Version="4.2.2" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
@@ -27,7 +27,9 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.27.3" />
+    <PackageReference Include="CoreEx.UnitTesting.Azure.Functions" Version="3.30.0" />
+    <PackageReference Include="CoreEx.UnitTesting.Azure.ServiceBus" Version="3.30.0" />
+    <PackageReference Include="UnitTestEx.NUnit" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/MyEf.Hr/MyEf.Hr.Test/GlobalUsings.cs b/samples/MyEf.Hr/MyEf.Hr.Test/GlobalUsings.cs
index de084e30..646e470a 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Test/GlobalUsings.cs
+++ b/samples/MyEf.Hr/MyEf.Hr.Test/GlobalUsings.cs
@@ -16,7 +16,6 @@
 global using System.Threading.Tasks;
 global using UnitTestEx;
 global using UnitTestEx.Expectations;
-global using UnitTestEx.NUnit;
 global using MyEf.Hr.Api;
 global using MyEf.Hr.Business;
 global using MyEf.Hr.Business.Data;
diff --git a/samples/MyEf.Hr/MyEf.Hr.Test/MyEf.Hr.Test.csproj b/samples/MyEf.Hr/MyEf.Hr.Test/MyEf.Hr.Test.csproj
index a276dc53..4efab00b 100644
--- a/samples/MyEf.Hr/MyEf.Hr.Test/MyEf.Hr.Test.csproj
+++ b/samples/MyEf.Hr/MyEf.Hr.Test/MyEf.Hr.Test.csproj
@@ -32,17 +32,18 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx" Version="3.27.3" />
+    <PackageReference Include="CoreEx" Version="3.30.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="NUnit.Analyzers" Version="4.3.0">
+    <PackageReference Include="NUnit.Analyzers" Version="4.4.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.27.3" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="CoreEx.UnitTesting" Version="3.30.0" />
+    <PackageReference Include="UnitTestEx.NUnit" Version="5.0.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/samples/MyEf.Hr/docs/10-Service-Bus-Subscribe.md b/samples/MyEf.Hr/docs/10-Service-Bus-Subscribe.md
index 1495468f..51b3b14b 100644
--- a/samples/MyEf.Hr/docs/10-Service-Bus-Subscribe.md
+++ b/samples/MyEf.Hr/docs/10-Service-Bus-Subscribe.md
@@ -357,7 +357,7 @@ From Visual Studio, add a new Project named `MyEf.Hr.Security.Test` (within the
 
 Make the following house cleaning changes to the new project:
 
-1. Add the `UnitTestEx.NUnit` NuGet package as a dependency.
+1. Add the `UnitTestEx.NUnit`, `CoreEx.UnitTesting.Azure.Functions` and `CoreEx.UnitTesting.Azure.ServiceBus` NuGet packages as dependencies.
 2. Add `MyHr.Ef.Security.Subscriptions` as a project reference dependency.
 3. Rename `Usings.cs` to `GlobalUsings.cs` and replace with content from [`GlobalUsings`](../MyEf.Hr.Security.Test/GlobalUsings.cs).
 
diff --git a/templates/Beef.Template.Solution/content/.template.config/template.json b/templates/Beef.Template.Solution/content/.template.config/template.json
index 8d4ab85c..23a720f8 100644
--- a/templates/Beef.Template.Solution/content/.template.config/template.json
+++ b/templates/Beef.Template.Solution/content/.template.config/template.json
@@ -85,7 +85,7 @@
       "type": "generated",
       "generator": "constant",
       "parameters": {
-        "value": "3.27.3"
+        "value": "3.30.0"
       },
       "replaces": "CoreExVersion"
     },
@@ -93,10 +93,18 @@
       "type": "generated",
       "generator": "constant",
       "parameters": {
-        "value": "5.17.1"
+        "value": "5.18.0"
       },
       "replaces": "BeefVersion"
     },
+    "unittestex_version": {
+      "type": "generated",
+      "generator": "constant",
+      "parameters": {
+        "value": "5.0.0"
+      },
+      "replaces": "UnitTestExVersion"
+    },
     "implement_cosmos": {
       "type": "computed",
       "value": "(datasource == \"Cosmos\")"
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Api/Company.AppName.Api.csproj b/templates/Beef.Template.Solution/content/Company.AppName.Api/Company.AppName.Api.csproj
index 07ff689f..b1fdc31e 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Api/Company.AppName.Api.csproj
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Api/Company.AppName.Api.csproj
@@ -13,7 +13,7 @@
     <PackageReference Include="AspNetCore.HealthChecks.Azure.Storage.Blobs" Version="8.0.1" />
     <!--#endif -->
     <PackageReference Include="OpenTelemetry.Instrumentation.EntityFrameworkCore" Version="1.0.0-beta.11" />
-    <PackageReference Include="Swashbuckle.AspNetCore" Version="6.8.1" />
+    <PackageReference Include="Swashbuckle.AspNetCore" Version="7.0.0" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\Company.AppName.Business\Company.AppName.Business.csproj" />
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Business/Company.AppName.Business.csproj b/templates/Beef.Template.Solution/content/Company.AppName.Business/Company.AppName.Business.csproj
index eaff97e1..b4a2e8a0 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Business/Company.AppName.Business.csproj
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Business/Company.AppName.Business.csproj
@@ -30,7 +30,7 @@
     <PackageReference Include="Pomelo.EntityFrameworkCore.MySql" Version="8.0.2" />
     <!--#endif -->
     <!--#if (implement_postgres) -->
-    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="8.0.4" />
+    <PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="9.0.1" />
     <!--#endif -->
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/Company.AppName.Services.Test.csproj b/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/Company.AppName.Services.Test.csproj
index 629064ad..cf55ceaf 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/Company.AppName.Services.Test.csproj
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/Company.AppName.Services.Test.csproj
@@ -33,7 +33,9 @@
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="CoreExVersion" />
+    <PackageReference Include="CoreEx.UnitTesting.Azure.Functions" Version="CoreExVersion" />
+    <PackageReference Include="CoreEx.UnitTesting.Azure.ServiceBus" Version="CoreExVersion" />
+    <PackageReference Include="UnitTestEx.NUnit" Version="UnitTestExVersion" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" >
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/GlobalUsings.cs b/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/GlobalUsings.cs
index 54cdf045..4621e754 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/GlobalUsings.cs
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Services.Test/GlobalUsings.cs
@@ -39,7 +39,6 @@
 global using System.Threading.Tasks;
 global using UnitTestEx;
 global using UnitTestEx.Expectations;
-global using UnitTestEx.NUnit;
 global using Company.AppName.Business;
 global using Company.AppName.Business.Data;
 global using Company.AppName.Business.DataSvc;
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Test/Company.AppName.Test.csproj b/templates/Beef.Template.Solution/content/Company.AppName.Test/Company.AppName.Test.csproj
index 9b943d76..83d06823 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Test/Company.AppName.Test.csproj
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Test/Company.AppName.Test.csproj
@@ -33,7 +33,8 @@
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
     <PackageReference Include="NUnit.Analyzers" Version="4.3.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="CoreExVersion" />
+    <PackageReference Include="UnitTestEx.NUnit" Version="UnitTestExVersion" />
+    <PackageReference Include="CoreEx.UnitTesting" Version="CoreExVersion" />
     <PackageReference Include="coverlet.collector" Version="6.0.2" >
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
diff --git a/templates/Beef.Template.Solution/content/Company.AppName.Test/GlobalUsings.cs b/templates/Beef.Template.Solution/content/Company.AppName.Test/GlobalUsings.cs
index 0b3642e1..35f67f36 100644
--- a/templates/Beef.Template.Solution/content/Company.AppName.Test/GlobalUsings.cs
+++ b/templates/Beef.Template.Solution/content/Company.AppName.Test/GlobalUsings.cs
@@ -38,7 +38,6 @@
 global using System.Threading.Tasks;
 global using UnitTestEx;
 global using UnitTestEx.Expectations;
-global using UnitTestEx.NUnit;
 global using Company.AppName.Api;
 global using Company.AppName.Business;
 global using Company.AppName.Business.Data;
diff --git a/tests/Beef.Template.Solution.UnitTest/Beef.Template.Solution.UnitTest.csproj b/tests/Beef.Template.Solution.UnitTest/Beef.Template.Solution.UnitTest.csproj
index b4dc5e0c..95fd9f25 100644
--- a/tests/Beef.Template.Solution.UnitTest/Beef.Template.Solution.UnitTest.csproj
+++ b/tests/Beef.Template.Solution.UnitTest/Beef.Template.Solution.UnitTest.csproj
@@ -11,7 +11,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
   </ItemGroup>
 
 </Project>
diff --git a/tools/Beef.CodeGen.Core/Beef.CodeGen.Core.csproj b/tools/Beef.CodeGen.Core/Beef.CodeGen.Core.csproj
index c5d50f7d..5108935d 100644
--- a/tools/Beef.CodeGen.Core/Beef.CodeGen.Core.csproj
+++ b/tools/Beef.CodeGen.Core/Beef.CodeGen.Core.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net9.0;net8.0</TargetFrameworks>
     <RootNamespace>Beef.CodeGen</RootNamespace>
     <Product>Beef.CodeGen.Core</Product>
     <Description>Business Entity Execution Framework (Beef) Code Generator tool.</Description>
@@ -32,8 +32,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="OnRamp" Version="2.2.3" />
-    <PackageReference Include="DbEx" Version="2.7.1" />
+    <PackageReference Include="OnRamp" Version="2.2.4" />
+    <PackageReference Include="DbEx" Version="2.8.0" />
     <PackageReference Include="Microsoft.OpenApi.Readers" Version="1.6.22" />
   </ItemGroup>
 
diff --git a/tools/Beef.Database.Core/Beef.Database.Core.csproj b/tools/Beef.Database.Core/Beef.Database.Core.csproj
index 5b4cb38a..a57a9631 100644
--- a/tools/Beef.Database.Core/Beef.Database.Core.csproj
+++ b/tools/Beef.Database.Core/Beef.Database.Core.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net9.0;net8.0</TargetFrameworks>
     <Product>Beef.Database.Core</Product>
     <Description>Business Entity Execution Framework (Beef) Database tool.</Description>
     <PackageTags>beef database dbup migration schema dbex</PackageTags>
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database" Version="3.27.3" />
-    <PackageReference Include="DbEx" Version="2.7.1" />
+    <PackageReference Include="CoreEx.Database" Version="3.30.0" />
+    <PackageReference Include="DbEx" Version="2.8.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/Beef.Database.MySql/Beef.Database.MySql.csproj b/tools/Beef.Database.MySql/Beef.Database.MySql.csproj
index 1057b0d4..6dcdc79f 100644
--- a/tools/Beef.Database.MySql/Beef.Database.MySql.csproj
+++ b/tools/Beef.Database.MySql/Beef.Database.MySql.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net9.0;net8.0</TargetFrameworks>
     <Product>Beef.Database.MySql</Product>
     <Description>Business Entity Execution Framework (Beef) MySQL Database tool.</Description>
     <PackageTags>beef database sql mysql dbup migration schema dbex</PackageTags>
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database.MySql" Version="3.27.3" />
-    <PackageReference Include="DbEx.MySql" Version="2.7.1" />
+    <PackageReference Include="CoreEx.Database.MySql" Version="3.30.0" />
+    <PackageReference Include="DbEx.MySql" Version="2.8.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/Beef.Database.Postgres/Beef.Database.Postgres.csproj b/tools/Beef.Database.Postgres/Beef.Database.Postgres.csproj
index 1962be13..2a6de314 100644
--- a/tools/Beef.Database.Postgres/Beef.Database.Postgres.csproj
+++ b/tools/Beef.Database.Postgres/Beef.Database.Postgres.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net9.0;net8.0</TargetFrameworks>
     <Product>Beef.Database.Postgres</Product>
     <Description>Business Entity Execution Framework (Beef) PostgreSQL Database tool.</Description>
     <PackageTags>beef database sql postgres postgresql dbup migration schema dbex</PackageTags>
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database.Postgres" Version="3.27.3" />
-    <PackageReference Include="DbEx.Postgres" Version="2.7.1" />
+    <PackageReference Include="CoreEx.Database.Postgres" Version="3.30.0" />
+    <PackageReference Include="DbEx.Postgres" Version="2.8.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/Beef.Database.SqlServer/Beef.Database.SqlServer.csproj b/tools/Beef.Database.SqlServer/Beef.Database.SqlServer.csproj
index 5089faa0..e3985c34 100644
--- a/tools/Beef.Database.SqlServer/Beef.Database.SqlServer.csproj
+++ b/tools/Beef.Database.SqlServer/Beef.Database.SqlServer.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0;net7.0;net8.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net9.0;net8.0</TargetFrameworks>
     <Product>Beef.Database.SqlServer</Product>
     <Description>Business Entity Execution Framework (Beef) SQL Server Database tool.</Description>
     <PackageTags>beef database sql sqlserver dbup migration schema dbex</PackageTags>
@@ -14,8 +14,8 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.27.3" />
-    <PackageReference Include="DbEx.SqlServer" Version="2.7.1" />
+    <PackageReference Include="CoreEx.Database.SqlServer" Version="3.30.0" />
+    <PackageReference Include="DbEx.SqlServer" Version="2.8.0" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/tools/Beef.Test.NUnit/AgentTester.cs b/tools/Beef.Test.NUnit/AgentTester.cs
index 3cea4930..79a4fc00 100644
--- a/tools/Beef.Test.NUnit/AgentTester.cs
+++ b/tools/Beef.Test.NUnit/AgentTester.cs
@@ -2,8 +2,8 @@
 
 using Microsoft.Extensions.DependencyInjection;
 using System;
-using UnitTestEx.NUnit;
-using UnitTestEx.NUnit.Internal;
+using UnitTestEx;
+using UnitTestEx.AspNetCore;
 
 namespace Beef.Test.NUnit
 {
diff --git a/tools/Beef.Test.NUnit/AgentTesterT.cs b/tools/Beef.Test.NUnit/AgentTesterT.cs
index 0bfe4ef8..c44405c3 100644
--- a/tools/Beef.Test.NUnit/AgentTesterT.cs
+++ b/tools/Beef.Test.NUnit/AgentTesterT.cs
@@ -5,7 +5,7 @@
 using System;
 using System.Net.Http;
 using UnitTestEx;
-using UnitTestEx.NUnit.Internal;
+using UnitTestEx.AspNetCore;
 
 namespace Beef.Test.NUnit
 {
diff --git a/tools/Beef.Test.NUnit/Beef.Test.NUnit.csproj b/tools/Beef.Test.NUnit/Beef.Test.NUnit.csproj
index 4e901fa9..62265d51 100644
--- a/tools/Beef.Test.NUnit/Beef.Test.NUnit.csproj
+++ b/tools/Beef.Test.NUnit/Beef.Test.NUnit.csproj
@@ -1,14 +1,15 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <TargetFrameworks>net6.0</TargetFrameworks>
+    <TargetFrameworks>net6.0;net8.0;net9.0</TargetFrameworks>
     <Product>Beef.Test.NUnit</Product>
     <Description>Business Entity Execution Framework (Beef) NUnit extensions for testing (Beef v4.x backwards compatibility only).</Description>
     <PackageTags>beef test nunit unnittestex</PackageTags>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="CoreEx.UnitTesting.NUnit" Version="3.27.3" />
+    <PackageReference Include="CoreEx.UnitTesting" Version="3.30.0" />
+    <PackageReference Include="UnitTestEx.NUnit" Version="5.0.0" />
   </ItemGroup>
 
   <Import Project="..\..\Common.targets" />
diff --git a/tools/Beef.Test.NUnit/UsingAgentTesterServer.cs b/tools/Beef.Test.NUnit/UsingAgentTesterServer.cs
index 5fb69461..633c764c 100644
--- a/tools/Beef.Test.NUnit/UsingAgentTesterServer.cs
+++ b/tools/Beef.Test.NUnit/UsingAgentTesterServer.cs
@@ -2,7 +2,7 @@
 
 using CoreEx;
 using System;
-using UnitTestEx.NUnit;
+using UnitTestEx;
 
 namespace Beef.Test.NUnit
 {
@@ -12,7 +12,7 @@ namespace Beef.Test.NUnit
     /// <typeparam name="TEntryPoint">>The API startup <see cref="Type"/>.</typeparam>
     /// <remarks>It is <b>recommended</b> that usage is upgraded to the new as this will eventually be deprecated.
     /// <para>Breaking change is that the <see cref="ExecutionContext.UserName"/> for the <see cref="AgentTester"/> reverts back to previous user post test execution where overridden.</para></remarks>
-    public abstract class UsingAgentTesterServer<TEntryPoint> : UnitTestEx.NUnit.UsingApiTester<TEntryPoint> where TEntryPoint : class
+    public abstract class UsingAgentTesterServer<TEntryPoint> : UnitTestEx.UsingApiTester<TEntryPoint> where TEntryPoint : class
     {
         /// <summary>
         /// Gets the <see cref="AgentTester"/>.