diff --git a/.docfx/Dockerfile.docfx b/.docfx/Dockerfile.docfx
index 95d581e74..b39795bcd 100644
--- a/.docfx/Dockerfile.docfx
+++ b/.docfx/Dockerfile.docfx
@@ -1,4 +1,6 @@
-FROM --platform=$BUILDPLATFORM nginx:1.28.0-alpine AS base
+ARG NGINX_VERSION=1.29.0-alpine
+
+FROM --platform=$BUILDPLATFORM nginx:${NGINX_VERSION} AS base
 RUN rm -rf /usr/share/nginx/html/*
 
 FROM --platform=$BUILDPLATFORM codebeltnet/docfx:2.78.3 AS build
@@ -8,7 +10,7 @@ ADD [".", "docfx"]
 RUN cd docfx; \
     docfx build
 
-FROM nginx:1.28.0-alpine AS final
+FROM nginx:${NGINX_VERSION} AS final
 WORKDIR /usr/share/nginx/html
 COPY --from=build /build/docfx/wwwroot /usr/share/nginx/html
 
diff --git a/.github/workflows/pipelines.yml b/.github/workflows/pipelines.yml
index 8f37efcf3..28a8fbbe9 100644
--- a/.github/workflows/pipelines.yml
+++ b/.github/workflows/pipelines.yml
@@ -84,7 +84,7 @@ jobs:
       restore-cache-key: ${{ needs.prepare_linux.outputs.restore-cache-key }}
 
   test_linux:
-    name: call-test
+    name: call-test-linux
     needs: [build, prepare_test, prepare_linux]
     strategy:
       fail-fast: false
@@ -99,7 +99,7 @@ jobs:
       restore-cache-key: ${{ needs.prepare_linux.outputs.restore-cache-key }}
 
   test_windows:
-    name: call-test
+    name: call-test-windows
     needs: [build, prepare_test]
     strategy:
       fail-fast: false
@@ -178,7 +178,7 @@ jobs:
   sonarcloud:
     name: call-sonarcloud
     needs: [build, test_linux, test_windows, integration_test]
-    uses: codebeltnet/jobs-sonarcloud/.github/workflows/default.yml@v1
+    uses: codebeltnet/jobs-sonarcloud/.github/workflows/default.yml@v2
     with:
       organization: geekle
       projectKey: Cuemon
@@ -198,7 +198,9 @@ jobs:
   codeql:
     name: call-codeql
     needs: [build, test_linux, test_windows, integration_test]
-    uses: codebeltnet/jobs-codeql/.github/workflows/default.yml@v1
+    uses: codebeltnet/jobs-codeql/.github/workflows/default.yml@v2
+    with:
+      timeout-minutes: 30
     permissions:
       security-events: write
 
diff --git a/.nuget/Cuemon.AspNetCore.App/PackageReleaseNotes.txt b/.nuget/Cuemon.AspNetCore.App/PackageReleaseNotes.txt
index e1ad2362e..9bd558736 100644
--- a/.nuget/Cuemon.AspNetCore.App/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.AspNetCore.App/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.AspNetCore.Authentication/PackageReleaseNotes.txt b/.nuget/Cuemon.AspNetCore.Authentication/PackageReleaseNotes.txt
index eaada0588..c13f9218f 100644
--- a/.nuget/Cuemon.AspNetCore.Authentication/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.AspNetCore.Authentication/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.AspNetCore.Mvc/PackageReleaseNotes.txt b/.nuget/Cuemon.AspNetCore.Mvc/PackageReleaseNotes.txt
index c35dfba83..05b014284 100644
--- a/.nuget/Cuemon.AspNetCore.Mvc/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.AspNetCore.Mvc/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.AspNetCore.Razor.TagHelpers/PackageReleaseNotes.txt b/.nuget/Cuemon.AspNetCore.Razor.TagHelpers/PackageReleaseNotes.txt
index a6ad8212b..92d58d3ae 100644
--- a/.nuget/Cuemon.AspNetCore.Razor.TagHelpers/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.AspNetCore.Razor.TagHelpers/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.AspNetCore/PackageReleaseNotes.txt b/.nuget/Cuemon.AspNetCore/PackageReleaseNotes.txt
index 20e66248c..86ca4f376 100644
--- a/.nuget/Cuemon.AspNetCore/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.AspNetCore/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.Core.App/PackageReleaseNotes.txt b/.nuget/Cuemon.Core.App/PackageReleaseNotes.txt
index 88fb051e3..dd6e724e9 100644
--- a/.nuget/Cuemon.Core.App/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Core.App/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Core/PackageReleaseNotes.txt b/.nuget/Cuemon.Core/PackageReleaseNotes.txt
index b93dc9e80..8fa528c34 100644
--- a/.nuget/Cuemon.Core/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Core/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Data.Integrity/PackageReleaseNotes.txt b/.nuget/Cuemon.Data.Integrity/PackageReleaseNotes.txt
index 6a42ca862..aa54819af 100644
--- a/.nuget/Cuemon.Data.Integrity/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Data.Integrity/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Data.SqlClient/PackageReleaseNotes.txt b/.nuget/Cuemon.Data.SqlClient/PackageReleaseNotes.txt
index c633694ba..12d2973e2 100644
--- a/.nuget/Cuemon.Data.SqlClient/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Data.SqlClient/PackageReleaseNotes.txt
@@ -1,4 +1,11 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+- CHANGED System.Data.SqlClient to Microsoft.Data.SqlClient since the former is officially deprecated
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Data/PackageReleaseNotes.txt b/.nuget/Cuemon.Data/PackageReleaseNotes.txt
index bd121f8d8..eb6417a8a 100644
--- a/.nuget/Cuemon.Data/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Data/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Diagnostics/PackageReleaseNotes.txt b/.nuget/Cuemon.Diagnostics/PackageReleaseNotes.txt
index a7febfb58..598c700b4 100644
--- a/.nuget/Cuemon.Diagnostics/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Diagnostics/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.AspNetCore.Authentication/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.AspNetCore.Authentication/PackageReleaseNotes.txt
index 6f5fa2d55..0add5abe4 100644
--- a/.nuget/Cuemon.Extensions.AspNetCore.Authentication/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.AspNetCore.Authentication/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.AspNetCore.Mvc.Formatters.Text.Json/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.AspNetCore.Mvc.Formatters.Text.Json/PackageReleaseNotes.txt
index e1bfde256..f39891b31 100644
--- a/.nuget/Cuemon.Extensions.AspNetCore.Mvc.Formatters.Text.Json/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.AspNetCore.Mvc.Formatters.Text.Json/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.AspNetCore.Mvc.Formatters.Xml/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.AspNetCore.Mvc.Formatters.Xml/PackageReleaseNotes.txt
index 8353fe33b..b8be24631 100644
--- a/.nuget/Cuemon.Extensions.AspNetCore.Mvc.Formatters.Xml/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.AspNetCore.Mvc.Formatters.Xml/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.AspNetCore.Mvc.RazorPages/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.AspNetCore.Mvc.RazorPages/PackageReleaseNotes.txt
index 10af5c271..87f786fa6 100644
--- a/.nuget/Cuemon.Extensions.AspNetCore.Mvc.RazorPages/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.AspNetCore.Mvc.RazorPages/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.AspNetCore.Mvc/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.AspNetCore.Mvc/PackageReleaseNotes.txt
index 908357d5f..afbad72d6 100644
--- a/.nuget/Cuemon.Extensions.AspNetCore.Mvc/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.AspNetCore.Mvc/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.AspNetCore.Text.Json/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.AspNetCore.Text.Json/PackageReleaseNotes.txt
index b373b06b3..01e13045a 100644
--- a/.nuget/Cuemon.Extensions.AspNetCore.Text.Json/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.AspNetCore.Text.Json/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.AspNetCore.Xml/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.AspNetCore.Xml/PackageReleaseNotes.txt
index cea6f06c0..a8ca3dcca 100644
--- a/.nuget/Cuemon.Extensions.AspNetCore.Xml/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.AspNetCore.Xml/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.AspNetCore/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.AspNetCore/PackageReleaseNotes.txt
index f3f5ca1dd..ef423f9fe 100644
--- a/.nuget/Cuemon.Extensions.AspNetCore/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.AspNetCore/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9 and .NET 8
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9 and .NET 8
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Collections.Generic/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Collections.Generic/PackageReleaseNotes.txt
index 6a42ca862..aa54819af 100644
--- a/.nuget/Cuemon.Extensions.Collections.Generic/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Collections.Generic/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Collections.Specialized/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Collections.Specialized/PackageReleaseNotes.txt
index 6a42ca862..aa54819af 100644
--- a/.nuget/Cuemon.Extensions.Collections.Specialized/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Collections.Specialized/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Core/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Core/PackageReleaseNotes.txt
index 5961b6ee4..e2ab49e96 100644
--- a/.nuget/Cuemon.Extensions.Core/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Core/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Data.Integrity/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Data.Integrity/PackageReleaseNotes.txt
index 6a42ca862..aa54819af 100644
--- a/.nuget/Cuemon.Extensions.Data.Integrity/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Data.Integrity/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Data/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Data/PackageReleaseNotes.txt
index 55a5f4a0c..1ff880426 100644
--- a/.nuget/Cuemon.Extensions.Data/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Data/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.DependencyInjection/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.DependencyInjection/PackageReleaseNotes.txt
index 7d0abf069..6472bd881 100644
--- a/.nuget/Cuemon.Extensions.DependencyInjection/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.DependencyInjection/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Diagnostics/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Diagnostics/PackageReleaseNotes.txt
index 1d69c3ee2..26ea6ac5a 100644
--- a/.nuget/Cuemon.Extensions.Diagnostics/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Diagnostics/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Hosting/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Hosting/PackageReleaseNotes.txt
index 67ea82999..80d223777 100644
--- a/.nuget/Cuemon.Extensions.Hosting/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Hosting/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.IO/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.IO/PackageReleaseNotes.txt
index 9ccd2c54e..d3d6c2dd3 100644
--- a/.nuget/Cuemon.Extensions.IO/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.IO/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8, .NET Standard 2.1 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8, .NET Standard 2.1 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Net/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Net/PackageReleaseNotes.txt
index 7a5343f75..5d71d8067 100644
--- a/.nuget/Cuemon.Extensions.Net/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Net/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Reflection/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Reflection/PackageReleaseNotes.txt
index 6a42ca862..aa54819af 100644
--- a/.nuget/Cuemon.Extensions.Reflection/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Reflection/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Runtime.Caching/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Runtime.Caching/PackageReleaseNotes.txt
index 6a42ca862..aa54819af 100644
--- a/.nuget/Cuemon.Extensions.Runtime.Caching/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Runtime.Caching/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Text.Json/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Text.Json/PackageReleaseNotes.txt
index 8548a95fb..e92ffe027 100644
--- a/.nuget/Cuemon.Extensions.Text.Json/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Text.Json/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Text/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Text/PackageReleaseNotes.txt
index 6a42ca862..aa54819af 100644
--- a/.nuget/Cuemon.Extensions.Text/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Text/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Threading/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Threading/PackageReleaseNotes.txt
index 93b7cc5fc..25019868a 100644
--- a/.nuget/Cuemon.Extensions.Threading/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Threading/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Extensions.Xml/PackageReleaseNotes.txt b/.nuget/Cuemon.Extensions.Xml/PackageReleaseNotes.txt
index bcd1d6412..72270e69b 100644
--- a/.nuget/Cuemon.Extensions.Xml/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Extensions.Xml/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.IO/PackageReleaseNotes.txt b/.nuget/Cuemon.IO/PackageReleaseNotes.txt
index 9ccd2c54e..d3d6c2dd3 100644
--- a/.nuget/Cuemon.IO/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.IO/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8, .NET Standard 2.1 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8, .NET Standard 2.1 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Net/PackageReleaseNotes.txt b/.nuget/Cuemon.Net/PackageReleaseNotes.txt
index 6a42ca862..aa54819af 100644
--- a/.nuget/Cuemon.Net/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Net/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Resilience/PackageReleaseNotes.txt b/.nuget/Cuemon.Resilience/PackageReleaseNotes.txt
index b497907e9..d1534a822 100644
--- a/.nuget/Cuemon.Resilience/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Resilience/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Runtime.Caching/PackageReleaseNotes.txt b/.nuget/Cuemon.Runtime.Caching/PackageReleaseNotes.txt
index 9d4048d14..31237f9f0 100644
--- a/.nuget/Cuemon.Runtime.Caching/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Runtime.Caching/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Security.Cryptography/PackageReleaseNotes.txt b/.nuget/Cuemon.Security.Cryptography/PackageReleaseNotes.txt
index 350467c40..67911d923 100644
--- a/.nuget/Cuemon.Security.Cryptography/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Security.Cryptography/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Threading/PackageReleaseNotes.txt b/.nuget/Cuemon.Threading/PackageReleaseNotes.txt
index 2c1a959f0..13a017a09 100644
--- a/.nuget/Cuemon.Threading/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Threading/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/.nuget/Cuemon.Xml/PackageReleaseNotes.txt b/.nuget/Cuemon.Xml/PackageReleaseNotes.txt
index 1d0e66017..17eaef013 100644
--- a/.nuget/Cuemon.Xml/PackageReleaseNotes.txt
+++ b/.nuget/Cuemon.Xml/PackageReleaseNotes.txt
@@ -1,4 +1,10 @@
-Version 9.0.6
+Version 9.0.7
+Availability: .NET 9, .NET 8 and .NET Standard 2.0
+ 
+# ALM
+- CHANGED Dependencies to latest and greatest with respect to TFMs
+ 
+Version 9.0.6
 Availability: .NET 9, .NET 8 and .NET Standard 2.0
  
 # ALM
diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc1636c5a..5afdf7a54 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,14 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/),
 
 For more details, please refer to `PackageReleaseNotes.txt` on a per assembly basis in the `.nuget` folder.
 
+## [9.0.7] - 2025-07-09
+
+This is a service update that focuses on package dependencies and a few bug fixes.
+
+### Changed
+
+- `System.Data.SqlClient` to `Microsoft.Data.SqlClient` since the former is officially deprecated in `Cuemon.Data.SqlClient` assembly
+
 ## [9.0.6] - 2025-06-14
 
 This is a service update that focuses on package dependencies and a minor new handy feature; `Cuemon.Threading.Awaiter.RunUntilSuccessfulOrTimeoutAsync` method.
diff --git a/Directory.Packages.props b/Directory.Packages.props
index 97a21334b..79d4a0a00 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -5,15 +5,14 @@
   <ItemGroup>
     <PackageVersion Include="AutoFixture" Version="4.18.1" />
     <PackageVersion Include="Backport.System.Threading.Lock" Version="3.1.4" />
-    <PackageVersion Include="Codebelt.Extensions.Xunit" Version="10.0.2" />
-    <PackageVersion Include="Codebelt.Extensions.Xunit.Hosting" Version="10.0.2" />
-    <PackageVersion Include="Codebelt.Extensions.Xunit.Hosting.AspNetCore" Version="10.0.2" />
+    <PackageVersion Include="Codebelt.Extensions.Xunit" Version="10.0.3" />
+    <PackageVersion Include="Codebelt.Extensions.Xunit.Hosting" Version="10.0.3" />
+    <PackageVersion Include="Codebelt.Extensions.Xunit.Hosting.AspNetCore" Version="10.0.3" />
     <PackageVersion Include="Meziantou.Xunit.ParallelTestFramework" Version="2.3.0" />
     <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
     <PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.14.1" />
     <PackageVersion Include="MinVer" Version="6.0.0" />
     <PackageVersion Include="NativeLibraryLoader" Version="1.0.13" />
-    <PackageVersion Include="System.Data.SqlClient" Version="4.9.0" />
     <PackageVersion Include="Xunit.Priority" Version="1.1.6" />
     <PackageVersion Include="coverlet.collector" Version="6.0.4" />
     <PackageVersion Include="coverlet.msbuild" Version="6.0.4" />
@@ -32,21 +31,24 @@
     <PackageVersion Include="Microsoft.Extensions.Configuration.FileExtensions" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Configuration.Json" Version="8.0.1" />
     <PackageVersion Include="System.Threading.Tasks.Extensions" Version="4.6.3" />
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="5.2.3" />
+    <PackageVersion Include="System.Text.Json" Version="8.0.6" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('net8')) OR $(TargetFramework.StartsWith('netstandard2'))">
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.17" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="8.0.18" />
     <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Hosting" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Http" Version="8.0.1" />
     <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="8.0.0" />
-    <PackageVersion Include="System.Text.Json" Version="8.0.5" />
   </ItemGroup>
   <ItemGroup Condition="$(TargetFramework.StartsWith('net9'))">
-    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.6" />
-    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.6" />
-    <PackageVersion Include="System.Text.Json" Version="9.0.6" />
+    <PackageVersion Include="Microsoft.Data.Sqlite" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.DependencyInjection" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Hosting" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Http" Version="9.0.7" />
+    <PackageVersion Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="9.0.7" />
+  </ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('net8')) OR $(TargetFramework.StartsWith('net9'))">
+    <PackageVersion Include="Microsoft.Data.SqlClient" Version="6.0.2" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/Cuemon.Data.SqlClient/Cuemon.Data.SqlClient.csproj b/src/Cuemon.Data.SqlClient/Cuemon.Data.SqlClient.csproj
index 7f1b6ce40..f51545cec 100644
--- a/src/Cuemon.Data.SqlClient/Cuemon.Data.SqlClient.csproj
+++ b/src/Cuemon.Data.SqlClient/Cuemon.Data.SqlClient.csproj
@@ -5,7 +5,7 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <Description>The Cuemon.Data.SqlClient namespace contains types that provide ways for developers to work with Microsoft SQL Server integrations. The namespace is an addition to the System.Data.SqlClient namespace.</Description>
+    <Description>The Cuemon.Data.SqlClient namespace contains types that provide ways for developers to work with Microsoft SQL Server integrations. The namespace is an addition to the Microsoft.Data.SqlClient namespace.</Description>
     <PackageTags>sql sql-in-operator sql-query-builder sql-data-manager transient-fault-handling</PackageTags>
   </PropertyGroup>
 
@@ -15,7 +15,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="System.Data.SqlClient" />
+    <PackageReference Include="Microsoft.Data.SqlClient" />
   </ItemGroup>
 
-</Project>
\ No newline at end of file
+</Project>
diff --git a/src/Cuemon.Data.SqlClient/SqlDataManager.cs b/src/Cuemon.Data.SqlClient/SqlDataManager.cs
index ebf6d16b0..680837069 100644
--- a/src/Cuemon.Data.SqlClient/SqlDataManager.cs
+++ b/src/Cuemon.Data.SqlClient/SqlDataManager.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Globalization;
 using System.Linq;
 using System.Reflection;
diff --git a/src/Cuemon.Data.SqlClient/SqlInOperator.cs b/src/Cuemon.Data.SqlClient/SqlInOperator.cs
index 404287b30..52669e7ab 100644
--- a/src/Cuemon.Data.SqlClient/SqlInOperator.cs
+++ b/src/Cuemon.Data.SqlClient/SqlInOperator.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 
 namespace Cuemon.Data.SqlClient
 {
diff --git a/src/Cuemon.Extensions.DependencyInjection/ServiceProviderExtensions.cs b/src/Cuemon.Extensions.DependencyInjection/ServiceProviderExtensions.cs
index e44351a37..a9faf110a 100644
--- a/src/Cuemon.Extensions.DependencyInjection/ServiceProviderExtensions.cs
+++ b/src/Cuemon.Extensions.DependencyInjection/ServiceProviderExtensions.cs
@@ -15,8 +15,7 @@ public static class ServiceProviderExtensions
         /// </summary>
         /// <param name="provider">The <see cref="IServiceProvider"/> to extend.</param>
         /// <returns>An enumeration of ALL <see cref="ServiceDescriptor"/> instances from the specified <paramref name="provider"/>.</returns>
-        /// <exception cref="Cuemon.Validator"></exception>
-        /// <exception cref="System.NotSupportedException">This method does not support {providerType.FullName}.</exception>
+        /// <exception cref="NotSupportedException">This method does not support {providerType.FullName}.</exception>
         public static IEnumerable<ServiceDescriptor> GetServiceDescriptors(this IServiceProvider provider)
         {
             Validator.ThrowIfNull(provider);
diff --git a/src/Cuemon.Extensions.Text.Json/Cuemon.Extensions.Text.Json.csproj b/src/Cuemon.Extensions.Text.Json/Cuemon.Extensions.Text.Json.csproj
index c1c52b3c2..2793ac3db 100644
--- a/src/Cuemon.Extensions.Text.Json/Cuemon.Extensions.Text.Json.csproj
+++ b/src/Cuemon.Extensions.Text.Json/Cuemon.Extensions.Text.Json.csproj
@@ -9,7 +9,7 @@
     <PackageTags>extension-methods extensions json-converter json-formatter dynamic-json-converter write-object write-property-name</PackageTags>
   </PropertyGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition="$(TargetFramework.StartsWith('netstandard2'))">
     <PackageReference Include="System.Text.Json" />
   </ItemGroup>
 
diff --git a/test/Cuemon.Core.Tests/Threading/AwaiterTest.cs b/test/Cuemon.Core.Tests/Threading/AwaiterTest.cs
index d88441da1..dcc434f1b 100644
--- a/test/Cuemon.Core.Tests/Threading/AwaiterTest.cs
+++ b/test/Cuemon.Core.Tests/Threading/AwaiterTest.cs
@@ -99,20 +99,25 @@ public async Task RunUntilSuccessfulOrTimeoutAsync_ShouldReturnUnsuccessfulWithA
         {
             // Arrange
             var exceptions = new List<Exception>
-        {
-            new InvalidOperationException("fail1"),
-            new ArgumentException("fail2")
-        };
+            {
+                new InvalidOperationException("fail1"),
+                new ArgumentException("fail2")
+            };
             var callCount = 0;
             Task<ConditionalValue> Method()
             {
-                throw exceptions[callCount++];
+                if (callCount < exceptions.Count)
+                {
+                    throw exceptions[callCount++];
+                }
+                // After throwing both exceptions, always return unsuccessful
+                return Task.FromResult<ConditionalValue>(new UnsuccessfulValue());
             }
 
             // Act
             var result = await Awaiter.RunUntilSuccessfulOrTimeoutAsync(Method, o =>
             {
-                o.Timeout = TimeSpan.FromMilliseconds(50);
+                o.Timeout = TimeSpan.FromSeconds(5); // Significantly longer to ensure both exceptions are thrown (CI is slow in GHA)
                 o.Delay = TimeSpan.FromMilliseconds(10);
             });
 
diff --git a/test/Cuemon.Data.SqlClient.Tests/SqlDataManagerTest.cs b/test/Cuemon.Data.SqlClient.Tests/SqlDataManagerTest.cs
index fc0853a58..2aafedda8 100644
--- a/test/Cuemon.Data.SqlClient.Tests/SqlDataManagerTest.cs
+++ b/test/Cuemon.Data.SqlClient.Tests/SqlDataManagerTest.cs
@@ -1,6 +1,6 @@
 using System;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Linq;
 using Cuemon.Collections.Generic;
 using Cuemon.Data.SqlClient.Assets;
diff --git a/test/Cuemon.Data.SqlClient.Tests/SqlDatabaseDependencyTest.cs b/test/Cuemon.Data.SqlClient.Tests/SqlDatabaseDependencyTest.cs
index 4e853501d..5c3699717 100644
--- a/test/Cuemon.Data.SqlClient.Tests/SqlDatabaseDependencyTest.cs
+++ b/test/Cuemon.Data.SqlClient.Tests/SqlDatabaseDependencyTest.cs
@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Data.SqlClient;
+using Microsoft.Data.SqlClient;
 using System.Threading;
 using System.Threading.Tasks;
 using Cuemon.Collections.Generic;
diff --git a/testenvironments.json b/testenvironments.json
index 7e9293b07..781f15fd7 100644
--- a/testenvironments.json
+++ b/testenvironments.json
@@ -9,7 +9,7 @@
         {
             "name": "Docker-Ubuntu",
             "type": "docker",
-            "dockerImage": "gimlichael/ubuntu-testrunner:mono-net8.0.411-9.0.301"
+            "dockerImage": "gimlichael/ubuntu-testrunner:mono-net8.0.412-9.0.302"
         }
     ]
 }