From 2016418f8ce2ed1b232368f1149175ae851b56bc Mon Sep 17 00:00:00 2001
From: Jason Barden <jason.barden@outlook.com>
Date: Tue, 9 Sep 2025 21:16:45 +0100
Subject: [PATCH 1/2] NuGet updates and formatting

---
 .github/workflows/dotnet.yml                  |  62 +++
 .github/workflows/main_astar-dev.yml          |  22 +-
 .github/workflows/publish.yml                 |  34 ++
 .../.idea/.gitignore                          |   0
 .../.idea/.name                               |   1 +
 .../.idea/encodings.xml                       |   0
 .../.idea/indexLayout.xml                     |   0
 .../.idea/sonarlint.xml                       |   0
 .../.idea/vcs.xml                             |   0
 .idea/.idea.DatabaseTesting/.idea/.name       |   1 -
 .../.idea.DatabaseTesting/.idea/workspace.xml | 486 ++++++++++++++++++
 AStar.Dev.Database.Testing.slnx               |  27 +
 DatabaseTesting.sln                           | 114 ----
 .../AStar.Dev.Infrastructure.FilesDb.csproj   |  14 +-
 .../FileClassificationConfiguration.cs        |   2 +-
 .../Configurations/FileDetailConfiguration.cs |   4 +-
 .../FileNamePartConfiguration.cs              |   2 +-
 .../Data/FileDetailPagingExtensions.cs        |   2 +-
 .../Data/FileDetailSearchTypeExtensions.cs    |   2 +-
 .../Data/FilesContext.cs                      |   2 +-
 .../Models/DuplicateDetail.cs                 |  10 +-
 .../Models/EventType.cs                       |  16 +-
 .../Models/FileClassification.cs              |   4 +-
 .../Models/FileDetail.cs                      |   2 +-
 .../Models/FileNamePart.cs                    |   2 +-
 .../AStar.Dev.Infrastructure.csproj           |   8 +-
 .../AStar.Dev.Technical.Debt.Reporting.csproj |   4 +-
 .../AStar.Dev.Utilities.csproj                |   2 +-
 .../EncryptionExtensions.cs                   |   2 +-
 support/AStar.Dev.Utilities/LinqExtensions.cs |   2 +-
 .../DbContextHelpers/DbContextHelpers.csproj  |  12 +-
 support/DbContextHelpers/TestConstants.cs     |   2 +-
 ...structure.FilesDb.Tests.Integration.csproj |   8 +-
 ...ileDetailDeletionStatusExtensionsShould.cs |   3 +-
 ...FileDetailDirectoryNameExtensionsShould.cs |   3 +-
 .../FileDetailOrderingExtensionsShould.cs     |   3 +-
 .../FileDetailPagingExtensionsShould.cs       |   3 +-
 .../FileDetailSearchTypeExtensionsShould.cs   |   3 +-
 .../FileDetailTextContainsExtensionsShould.cs |   3 +-
 .../FilesContextLastViewedExtensionsShould.cs |   1 -
 ...v.Infrastructure.FilesDb.Tests.Unit.csproj |  16 +-
 .../Models/DeletionStatusShould.cs            |   1 -
 .../Models/DirectoryNameShould.cs             |   3 +-
 .../Models/DuplicateDetailShould.cs           |   9 +-
 .../Models/EventShould.cs                     |   7 +-
 .../Models/FileDetailShould.cs                |  27 +-
 .../Models/FileHandleShould.cs                |   2 -
 .../Models/FileIdShould.cs                    |   1 -
 .../Models/FileNamePartShould.cs              |   6 +-
 .../Models/FileNameShould.cs                  |   3 +-
 .../Models/FileSizeEqualityComparerShould.cs  |   1 -
 .../Models/FileSizeShould.cs                  |   1 -
 .../Models/ImageDetailShould.cs               |   3 +-
 .../Models/ImageDetailsShould.cs              |   2 -
 ...AStar.Dev.Infrastructure.Tests.Unit.csproj |  16 +-
 .../AuditableEntityShould.cs                  |   2 +-
 ...Technical.Debt.Reporting.Tests.Unit.csproj |   4 +-
 .../RefactorAttributeShould.cs                |   9 +-
 .../AStar.Dev.Utilities.Tests.Unit.csproj     |   4 +-
 .../StringExtensionsShould.cs                 |  26 +-
 60 files changed, 750 insertions(+), 261 deletions(-)
 create mode 100644 .github/workflows/dotnet.yml
 create mode 100644 .github/workflows/publish.yml
 rename .idea/{.idea.DatabaseTesting => .idea.AStar.Dev.Database.Testing}/.idea/.gitignore (100%)
 create mode 100644 .idea/.idea.AStar.Dev.Database.Testing/.idea/.name
 rename .idea/{.idea.DatabaseTesting => .idea.AStar.Dev.Database.Testing}/.idea/encodings.xml (100%)
 rename .idea/{.idea.DatabaseTesting => .idea.AStar.Dev.Database.Testing}/.idea/indexLayout.xml (100%)
 rename .idea/{.idea.DatabaseTesting => .idea.AStar.Dev.Database.Testing}/.idea/sonarlint.xml (100%)
 rename .idea/{.idea.DatabaseTesting => .idea.AStar.Dev.Database.Testing}/.idea/vcs.xml (100%)
 delete mode 100644 .idea/.idea.DatabaseTesting/.idea/.name
 create mode 100644 .idea/.idea.DatabaseTesting/.idea/workspace.xml
 create mode 100644 AStar.Dev.Database.Testing.slnx
 delete mode 100644 DatabaseTesting.sln

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
new file mode 100644
index 0000000..d3fe03f
--- /dev/null
+++ b/.github/workflows/dotnet.yml
@@ -0,0 +1,62 @@
+name: .NET
+
+on:
+  workflow_dispatch:
+  push:
+    branches: [ "main" ]
+  pull_request:
+    branches: [ "main" ]
+
+jobs:
+  build:
+    name: Build and analyze
+    runs-on: windows-latest
+    env:
+      SONAR_PROJECT: 'astar-dev-utilities'
+      ProjectName: 'AStar.Dev.Utilities'
+      RepositoryName: 'astar-dev-utilities'
+    steps:
+      - name: Set up JDK
+        uses: actions/setup-java@v4.4.0
+        with:
+          java-version: 17
+          distribution: 'zulu'
+
+      - name: Checkout
+        uses: actions/checkout@v4.2.1
+        with:
+          fetch-depth: 0
+
+      - name: 🛠 Cache SonarQube Cloud packages
+        uses: actions/cache@v4.2.3
+        with:
+          path: ~\sonar\cache
+          key: ${{ runner.os }}-sonar
+          restore-keys: ${{ runner.os }}-sonar
+
+      - name: 🛠 Cache SonarQube Cloud scanner
+        id: cache-sonar-scanner
+        uses: actions/cache@v4.2.3
+        with:
+          path: .\.sonar\scanner
+          key: ${{ runner.os }}-sonar-scanner
+          restore-keys: ${{ runner.os }}-sonar-scanner
+
+      - name: 🛠 Install SonarQube Cloud scanner
+        if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
+        shell: powershell
+        run: |
+          New-Item -Path .\.sonar\scanner -ItemType Directory
+          dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
+
+      - name: 🔍 Restore, 🛠 Build and 🧪 Test with ☁️ SonarCloud / Qube
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
+        shell: powershell
+        run: |
+          dotnet tool install --global dotnet-coverage
+          .\.sonar\scanner\dotnet-sonarscanner begin /k:"astar-development_${{ env.SONAR_PROJECT }}" /o:"astar-development" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.cs.vscoveragexml.reportsPaths=coverage.xml /d:sonar.scanner.scanAll=false /d:sonar.scanner.skipJreProvisioning=true
+          dotnet build --configuration Release
+          dotnet-coverage collect 'dotnet test --filter "FullyQualifiedName!~Tests.EndToEnd"' -f xml -o 'coverage.xml'
+          .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
diff --git a/.github/workflows/main_astar-dev.yml b/.github/workflows/main_astar-dev.yml
index 05be87d..9b71b43 100644
--- a/.github/workflows/main_astar-dev.yml
+++ b/.github/workflows/main_astar-dev.yml
@@ -1,45 +1,55 @@
 name: SonarQube
+
 permissions:
   contents: read
+
 on:
   push:
     branches:
       - main
   pull_request:
     types: [ opened, synchronize, reopened ]
+
 jobs:
+
   build:
     name: Build and analyze
     runs-on: windows-latest
+
     steps:
       - name: Set up JDK 17
         uses: actions/setup-java@v4
         with:
           java-version: 17
-          distribution: 'zulu' # Alternative distribution options are available.
+          distribution: 'zulu'
+
       - uses: actions/checkout@v4
         with:
-          fetch-depth: 0  # Shallow clones should be disabled for a better relevancy of analysis
-      - name: Cache SonarQube Cloud packages
+          fetch-depth: 0
+
+      - name: 🛠 Cache SonarQube Cloud packages
         uses: actions/cache@v4
         with:
           path: ~\sonar\cache
           key: ${{ runner.os }}-sonar
           restore-keys: ${{ runner.os }}-sonar
-      - name: Cache SonarQube Cloud scanner
+
+      - name: 🛠 Cache SonarQube Cloud scanner
         id: cache-sonar-scanner
         uses: actions/cache@v4
         with:
           path: .\.sonar\scanner
           key: ${{ runner.os }}-sonar-scanner
           restore-keys: ${{ runner.os }}-sonar-scanner
-      - name: Install SonarQube Cloud scanner
+
+      - name: ☁️ Install SonarQube Cloud scanner
         if: steps.cache-sonar-scanner.outputs.cache-hit != 'true'
         shell: powershell
         run: |
           New-Item -Path .\.sonar\scanner -ItemType Directory
           dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
-      - name: Build and analyze
+
+      - name: 🛠 Build, 🧪 Test and analyse with ☁️ SonarCloud / Qube
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         shell: powershell
diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
new file mode 100644
index 0000000..840e6b1
--- /dev/null
+++ b/.github/workflows/publish.yml
@@ -0,0 +1,34 @@
+name: 🚀 Publish NuGet Package
+
+on:
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+    env:
+      ProjectName: 'AStar.Dev.Utilities'
+
+    steps:
+      - name: 🧾 Checkout code
+        uses: actions/checkout@v4
+
+      - name: 🛠 Setup .NET
+        uses: actions/setup-dotnet@v4
+        with:
+          dotnet-version: '9.x'
+
+      - name: 🔍 Restore dependencies
+        run: dotnet restore
+
+      - name: 🛠 Build solution
+        run: dotnet build --configuration Release
+
+      - name: 📦 Pack NuGet package
+        run: dotnet pack ./src/${{ env.ProjectName }}/${{ env.ProjectName }}.csproj --configuration Release --output ./nupkg
+
+      - name: 🚀 Publish to NuGet.org
+        run: dotnet nuget push ./nupkg/*.nupkg --skip-duplicate --source https://api.nuget.org/v3/index.json --api-key ${{ secrets.NuGet_API_Key }} #
+
diff --git a/.idea/.idea.DatabaseTesting/.idea/.gitignore b/.idea/.idea.AStar.Dev.Database.Testing/.idea/.gitignore
similarity index 100%
rename from .idea/.idea.DatabaseTesting/.idea/.gitignore
rename to .idea/.idea.AStar.Dev.Database.Testing/.idea/.gitignore
diff --git a/.idea/.idea.AStar.Dev.Database.Testing/.idea/.name b/.idea/.idea.AStar.Dev.Database.Testing/.idea/.name
new file mode 100644
index 0000000..bbc6b33
--- /dev/null
+++ b/.idea/.idea.AStar.Dev.Database.Testing/.idea/.name
@@ -0,0 +1 @@
+AStar.Dev.Database.Testing
\ No newline at end of file
diff --git a/.idea/.idea.DatabaseTesting/.idea/encodings.xml b/.idea/.idea.AStar.Dev.Database.Testing/.idea/encodings.xml
similarity index 100%
rename from .idea/.idea.DatabaseTesting/.idea/encodings.xml
rename to .idea/.idea.AStar.Dev.Database.Testing/.idea/encodings.xml
diff --git a/.idea/.idea.DatabaseTesting/.idea/indexLayout.xml b/.idea/.idea.AStar.Dev.Database.Testing/.idea/indexLayout.xml
similarity index 100%
rename from .idea/.idea.DatabaseTesting/.idea/indexLayout.xml
rename to .idea/.idea.AStar.Dev.Database.Testing/.idea/indexLayout.xml
diff --git a/.idea/.idea.DatabaseTesting/.idea/sonarlint.xml b/.idea/.idea.AStar.Dev.Database.Testing/.idea/sonarlint.xml
similarity index 100%
rename from .idea/.idea.DatabaseTesting/.idea/sonarlint.xml
rename to .idea/.idea.AStar.Dev.Database.Testing/.idea/sonarlint.xml
diff --git a/.idea/.idea.DatabaseTesting/.idea/vcs.xml b/.idea/.idea.AStar.Dev.Database.Testing/.idea/vcs.xml
similarity index 100%
rename from .idea/.idea.DatabaseTesting/.idea/vcs.xml
rename to .idea/.idea.AStar.Dev.Database.Testing/.idea/vcs.xml
diff --git a/.idea/.idea.DatabaseTesting/.idea/.name b/.idea/.idea.DatabaseTesting/.idea/.name
deleted file mode 100644
index bc93157..0000000
--- a/.idea/.idea.DatabaseTesting/.idea/.name
+++ /dev/null
@@ -1 +0,0 @@
-DatabaseTesting
\ No newline at end of file
diff --git a/.idea/.idea.DatabaseTesting/.idea/workspace.xml b/.idea/.idea.DatabaseTesting/.idea/workspace.xml
new file mode 100644
index 0000000..189ff4f
--- /dev/null
+++ b/.idea/.idea.DatabaseTesting/.idea/workspace.xml
@@ -0,0 +1,486 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="AutoGeneratedRunConfigurationManager">
+    <projectFile>ConsoleApp1/ConsoleApp1.csproj</projectFile>
+    <projectFile>DatabaseTesting/DatabaseTesting.csproj</projectFile>
+  </component>
+  <component name="AutoImportSettings">
+    <option name="autoReloadType" value="SELECTIVE" />
+  </component>
+  <component name="ChangeListManager">
+    <list default="true" id="cb1668b7-0994-4921-a23c-4562db19393b" name="Changes" comment="">
+      <change beforePath="$PROJECT_DIR$/.editorconfig" beforeDir="false" afterPath="$PROJECT_DIR$/.editorconfig" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.github/workflows/main_astar-dev.yml" beforeDir="false" afterPath="$PROJECT_DIR$/.github/workflows/main_astar-dev.yml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.DatabaseTesting/.idea/.gitignore" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.DatabaseTesting/.idea/.name" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.DatabaseTesting/.idea/encodings.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.DatabaseTesting/.idea/indexLayout.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.DatabaseTesting/.idea/sonarlint.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/.idea.DatabaseTesting/.idea/vcs.xml" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/DatabaseTesting.sln" beforeDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileClassificationConfiguration.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileClassificationConfiguration.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileDetailConfiguration.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileDetailConfiguration.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileNamePartConfiguration.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileNamePartConfiguration.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailPagingExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailPagingExtensions.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailSearchTypeExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailSearchTypeExtensions.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/FilesContext.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Data/FilesContext.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Models/DuplicateDetail.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Models/DuplicateDetail.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Models/EventType.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Models/EventType.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Models/FileClassification.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Models/FileClassification.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Models/FileDetail.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Models/FileDetail.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Models/FileNamePart.cs" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure.FilesDb/Models/FileNamePart.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure/AStar.Dev.Infrastructure.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/src/AStar.Dev.Infrastructure/AStar.Dev.Infrastructure.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/support/AStar.Dev.Technical.Debt.Reporting/AStar.Dev.Technical.Debt.Reporting.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/support/AStar.Dev.Technical.Debt.Reporting/AStar.Dev.Technical.Debt.Reporting.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/support/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/support/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/support/AStar.Dev.Utilities/EncryptionExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/support/AStar.Dev.Utilities/EncryptionExtensions.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/support/AStar.Dev.Utilities/LinqExtensions.cs" beforeDir="false" afterPath="$PROJECT_DIR$/support/AStar.Dev.Utilities/LinqExtensions.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/support/DbContextHelpers/DbContextHelpers.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/support/DbContextHelpers/DbContextHelpers.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/support/DbContextHelpers/TestConstants.cs" beforeDir="false" afterPath="$PROJECT_DIR$/support/DbContextHelpers/TestConstants.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/AStar.Dev.Infrastructure.FilesDb.Tests.Integration.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/AStar.Dev.Infrastructure.FilesDb.Tests.Integration.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDeletionStatusExtensionsShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDeletionStatusExtensionsShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDirectoryNameExtensionsShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDirectoryNameExtensionsShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailOrderingExtensionsShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailOrderingExtensionsShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailPagingExtensionsShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailPagingExtensionsShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailSearchTypeExtensionsShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailSearchTypeExtensionsShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailTextContainsExtensionsShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailTextContainsExtensionsShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FilesContextLastViewedExtensionsShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FilesContextLastViewedExtensionsShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/AStar.Dev.Infrastructure.FilesDb.Tests.Unit.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/AStar.Dev.Infrastructure.FilesDb.Tests.Unit.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DeletionStatusShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DeletionStatusShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DirectoryNameShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DirectoryNameShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DuplicateDetailShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DuplicateDetailShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/EventShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/EventShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileDetailShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileDetailShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileHandleShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileHandleShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileIdShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileIdShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNamePartShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNamePartShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNameShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNameShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeEqualityComparerShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeEqualityComparerShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailsShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailsShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.Tests.Unit/AStar.Dev.Infrastructure.Tests.Unit.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.Tests.Unit/AStar.Dev.Infrastructure.Tests.Unit.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.Tests.Unit/AuditableEntityShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Infrastructure.Tests.Unit/AuditableEntityShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/AStar.Dev.Technical.Debt.Reporting.Tests.Unit.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/AStar.Dev.Technical.Debt.Reporting.Tests.Unit.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/RefactorAttributeShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/RefactorAttributeShould.cs" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Utilities.Tests.Unit/AStar.Dev.Utilities.Tests.Unit.csproj" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Utilities.Tests.Unit/AStar.Dev.Utilities.Tests.Unit.csproj" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/test/AStar.Dev.Utilities.Tests.Unit/StringExtensionsShould.cs" beforeDir="false" afterPath="$PROJECT_DIR$/test/AStar.Dev.Utilities.Tests.Unit/StringExtensionsShould.cs" afterDir="false" />
+    </list>
+    <option name="SHOW_DIALOG" value="false" />
+    <option name="HIGHLIGHT_CONFLICTS" value="true" />
+    <option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
+    <option name="LAST_RESOLUTION" value="IGNORE" />
+  </component>
+  <component name="ChangesViewManager">
+    <option name="groupingKeys">
+      <option value="directory" />
+      <option value="repository" />
+    </option>
+  </component>
+  <component name="DpaMonitoringSettings">
+    <option name="firstShow" value="false" />
+  </component>
+  <component name="Git.Settings">
+    <option name="PREVIEW_PUSH_PROTECTED_ONLY" value="true" />
+    <option name="RECENT_BRANCH_BY_REPOSITORY">
+      <map>
+        <entry key="$PROJECT_DIR$" value="main" />
+      </map>
+    </option>
+    <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
+  </component>
+  <component name="GithubDefaultAccount">
+    <option name="defaultAccountId" value="c33e45bc-ba15-45ea-89b8-f9dce31d8655" />
+  </component>
+  <component name="HighlightingSettingsPerFile">
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/DecompilerCache/decompiler/e580097862614e859942198d732b406216d400/fc/36c8815a/JsonPropertyInfo`1.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/25bda51662b9cbd1d3dd943e6873a915d899d60e2456fc3bca985f6b4af1633/ShouldBeNullExtensions.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/5ada2b76e4bdf12f7f393b06bc15d22d33ddfe75485f77473a74c15e7041f4/RelationalCommand.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="file://$APPLICATION_CONFIG_DIR$/resharper-host/SourcesCache/c41bfdf325389978dc3a5553a5ccef0d2ab217c704bbcd98c1e80374b4eba/ComplexPropertyBuilder`.cs" root0="FORCE_HIGHLIGHTING" />
+    <setting file="mock:///home/jason-barden/RiderProjects/astar-dev-database-testing/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileDetailShould.cs" root0="SKIP_HIGHLIGHTING" />
+    <setting file="mock:///home/jason-barden/RiderProjects/astar-dev-database-testing/test/AStar.Dev.Utilities.Tests.Unit/ConstantsShould.cs" root0="SKIP_HIGHLIGHTING" />
+  </component>
+  <component name="MetaFilesCheckinStateConfiguration" checkMetaFiles="true" />
+  <component name="ProjectColorInfo">{
+  &quot;associatedIndex&quot;: 8
+}</component>
+  <component name="ProjectId" id="30QP3ajGeyKFrinU94P3UcaNi1h" />
+  <component name="ProjectLevelVcsManager">
+    <ConfirmationsSetting value="2" id="Add" />
+  </component>
+  <component name="ProjectViewState">
+    <option name="hideEmptyMiddlePackages" value="true" />
+    <option name="showLibraryContents" value="true" />
+  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "055da5fe-539e-4d65-a4bb-d861bf9e2bae.executor": "Debug",
+    "56a1f6f9-d64c-4fae-87f1-61e81b28a09d.executor": "Debug",
+    "6a1383eb-f01b-491c-bb74-a772f8e24489.executor": "Debug",
+    "ModuleVcsDetector.initialDetectionPerformed": "true",
+    "RunOnceActivity.ShowReadmeOnStart": "true",
+    "RunOnceActivity.git.unshallow": "true",
+    "SONARLINT_PRECOMMIT_ANALYSIS": "true",
+    "e1a0be19-9d18-4118-90fb-c30b94916670.executor": "Debug",
+    "git-widget-placeholder": "features/nuget-updates",
+    "last_opened_file_path": "/home/jason-barden/RiderProjects/astar-dev-database-testing/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/AStar.Dev.Technical.Debt.Reporting.Tests.Unit.csproj",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs_package_manager_path": "npm",
+    "settings.editor.selected.configurable": "preferences.pluginManager",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
+  <component name="RunManager">
+    <configuration name="DatabaseTesting" type="DotNetProject" factoryName=".NET Project">
+      <option name="EXE_PATH" value="$PROJECT_DIR$/support/DbContextHelpers/bin/Debug/net9.0/DbContextHelpers.dll" />
+      <option name="PROGRAM_PARAMETERS" value="" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$/support/DbContextHelpers/bin/Debug/net9.0" />
+      <option name="PASS_PARENT_ENVS" value="1" />
+      <option name="USE_EXTERNAL_CONSOLE" value="0" />
+      <option name="ENV_FILE_PATHS" value="" />
+      <option name="REDIRECT_INPUT_PATH" value="" />
+      <option name="PTY_MODE" value="Auto" />
+      <option name="MIXED_MODE_DEBUG" value="0" />
+      <option name="USE_MONO" value="0" />
+      <option name="RUNTIME_ARGUMENTS" value="" />
+      <option name="AUTO_ATTACH_CHILDREN" value="0" />
+      <option name="PROJECT_PATH" value="$PROJECT_DIR$/support/DbContextHelpers/DbContextHelpers.csproj" />
+      <option name="PROJECT_EXE_PATH_TRACKING" value="1" />
+      <option name="PROJECT_ARGUMENTS_TRACKING" value="1" />
+      <option name="PROJECT_WORKING_DIRECTORY_TRACKING" value="1" />
+      <option name="PROJECT_KIND" value="StaticMethod" />
+      <option name="PROJECT_TFM" value="net9.0" />
+      <method v="2">
+        <option name="Build" />
+      </method>
+    </configuration>
+  </component>
+  <component name="TaskManager">
+    <task active="true" id="Default" summary="Default task">
+      <changelist id="cb1668b7-0994-4921-a23c-4562db19393b" name="Changes" comment="" />
+      <created>1753556624514</created>
+      <option name="number" value="Default" />
+      <option name="presentableId" value="Default" />
+      <updated>1753556624514</updated>
+      <workItem from="1753556625677" duration="6829000" />
+      <workItem from="1753563706014" duration="4552000" />
+      <workItem from="1753645513801" duration="8607000" />
+      <workItem from="1753692386963" duration="5749000" />
+      <workItem from="1753807061383" duration="16379000" />
+      <workItem from="1754656362669" duration="671000" />
+      <workItem from="1754682649460" duration="14029000" />
+      <workItem from="1754776035053" duration="5519000" />
+      <workItem from="1757447140020" duration="498000" />
+    </task>
+    <task id="LOCAL-00001" summary="If I've C&amp;P'd correctly, this should build on GitHub">
+      <option name="closed" value="true" />
+      <created>1753557395652</created>
+      <option name="number" value="00001" />
+      <option name="presentableId" value="LOCAL-00001" />
+      <option name="project" value="LOCAL" />
+      <updated>1753557395652</updated>
+    </task>
+    <task id="LOCAL-00002" summary="Return existing implementations to simple version&#10;&#10;now we're using SQL for Integration testing...&#10;&#10;Also restructured the solution folder structure">
+      <option name="closed" value="true" />
+      <created>1753559105093</created>
+      <option name="number" value="00002" />
+      <option name="presentableId" value="LOCAL-00002" />
+      <option name="project" value="LOCAL" />
+      <updated>1753559105093</updated>
+    </task>
+    <task id="LOCAL-00003" summary="Restructure on the file system to match sln">
+      <option name="closed" value="true" />
+      <created>1753559513951</created>
+      <option name="number" value="00003" />
+      <option name="presentableId" value="LOCAL-00003" />
+      <option name="project" value="LOCAL" />
+      <updated>1753559513951</updated>
+    </task>
+    <task id="LOCAL-00004" summary="Delete the old blob-based code">
+      <option name="closed" value="true" />
+      <created>1753560206051</created>
+      <option name="number" value="00004" />
+      <option name="presentableId" value="LOCAL-00004" />
+      <option name="project" value="LOCAL" />
+      <updated>1753560206051</updated>
+    </task>
+    <task id="LOCAL-00005" summary="Remove obsolete/duplicated code and&#10; &#10;get back to passing tests">
+      <option name="closed" value="true" />
+      <created>1753562055857</created>
+      <option name="number" value="00005" />
+      <option name="presentableId" value="LOCAL-00005" />
+      <option name="project" value="LOCAL" />
+      <updated>1753562055857</updated>
+    </task>
+    <task id="LOCAL-00006" summary="Add tests to bring coverage up&#10;&#10;It';'s quiet possible that the tests exist in the original project(s) but...">
+      <option name="closed" value="true" />
+      <created>1753567669456</created>
+      <option name="number" value="00006" />
+      <option name="presentableId" value="LOCAL-00006" />
+      <option name="project" value="LOCAL" />
+      <updated>1753567669456</updated>
+    </task>
+    <task id="LOCAL-00007" summary="Closer to required test coverage but not quiet there">
+      <option name="closed" value="true" />
+      <created>1753567928264</created>
+      <option name="number" value="00007" />
+      <option name="presentableId" value="LOCAL-00007" />
+      <option name="project" value="LOCAL" />
+      <updated>1753567928264</updated>
+    </task>
+    <task id="LOCAL-00008" summary="Add the tests from the other project&#10;&#10;And add any missing ones / fix bugs in the original code">
+      <option name="closed" value="true" />
+      <created>1753651524315</created>
+      <option name="number" value="00008" />
+      <option name="presentableId" value="LOCAL-00008" />
+      <option name="project" value="LOCAL" />
+      <updated>1753651524315</updated>
+    </task>
+    <task id="LOCAL-00009" summary="Fix namespaces... not sure how messed up">
+      <option name="closed" value="true" />
+      <created>1753651878261</created>
+      <option name="number" value="00009" />
+      <option name="presentableId" value="LOCAL-00009" />
+      <option name="project" value="LOCAL" />
+      <updated>1753651878261</updated>
+    </task>
+    <task id="LOCAL-00010" summary="Add missing test for the ComplexPropertyBuilderConfiguration.cs&#10;&#10;which triggered a few other code changes but, test-wise, it compiles and passes">
+      <option name="closed" value="true" />
+      <created>1753653118517</created>
+      <option name="number" value="00010" />
+      <option name="presentableId" value="LOCAL-00010" />
+      <option name="project" value="LOCAL" />
+      <updated>1753653118517</updated>
+    </task>
+    <task id="LOCAL-00011" summary="A bunch of clean-up">
+      <option name="closed" value="true" />
+      <created>1753654015885</created>
+      <option name="number" value="00011" />
+      <option name="presentableId" value="LOCAL-00011" />
+      <option name="project" value="LOCAL" />
+      <updated>1753654015885</updated>
+    </task>
+    <task id="LOCAL-00012" summary="Update migrations and continue with FileDetail extensions">
+      <option name="closed" value="true" />
+      <created>1753823787495</created>
+      <option name="number" value="00012" />
+      <option name="presentableId" value="LOCAL-00012" />
+      <option name="project" value="LOCAL" />
+      <updated>1753823787495</updated>
+    </task>
+    <task id="LOCAL-00013" summary="Fix missed test">
+      <option name="closed" value="true" />
+      <created>1753824091050</created>
+      <option name="number" value="00013" />
+      <option name="presentableId" value="LOCAL-00013" />
+      <option name="project" value="LOCAL" />
+      <updated>1753824091050</updated>
+    </task>
+    <task id="LOCAL-00014" summary="Glad that the password isn't for production!&#10;&#10;Or, for that matter anywhere but still... Oops!">
+      <option name="closed" value="true" />
+      <created>1753824718844</created>
+      <option name="number" value="00014" />
+      <option name="presentableId" value="LOCAL-00014" />
+      <option name="project" value="LOCAL" />
+      <updated>1753824718844</updated>
+    </task>
+    <task id="LOCAL-00015" summary="Quite possibly pointless but playing with separating the Sonar step">
+      <option name="closed" value="true" />
+      <created>1753825582705</created>
+      <option name="number" value="00015" />
+      <option name="presentableId" value="LOCAL-00015" />
+      <option name="project" value="LOCAL" />
+      <updated>1753825582705</updated>
+    </task>
+    <task id="LOCAL-00016" summary="Bring in offline updates">
+      <option name="closed" value="true" />
+      <created>1754686346313</created>
+      <option name="number" value="00016" />
+      <option name="presentableId" value="LOCAL-00016" />
+      <option name="project" value="LOCAL" />
+      <updated>1754686346313</updated>
+    </task>
+    <task id="LOCAL-00017" summary="Update test data and impacted tests">
+      <option name="closed" value="true" />
+      <created>1754768807909</created>
+      <option name="number" value="00017" />
+      <option name="presentableId" value="LOCAL-00017" />
+      <option name="project" value="LOCAL" />
+      <updated>1754768807909</updated>
+    </task>
+    <task id="LOCAL-00018" summary="Fix path in the previous commit. My bad">
+      <option name="closed" value="true" />
+      <created>1754769154678</created>
+      <option name="number" value="00018" />
+      <option name="presentableId" value="LOCAL-00018" />
+      <option name="project" value="LOCAL" />
+      <updated>1754769154678</updated>
+    </task>
+    <task id="LOCAL-00019" summary="Small cleanup">
+      <option name="closed" value="true" />
+      <created>1754769736271</created>
+      <option name="number" value="00019" />
+      <option name="presentableId" value="LOCAL-00019" />
+      <option name="project" value="LOCAL" />
+      <updated>1754769736271</updated>
+    </task>
+    <task id="LOCAL-00020" summary="Not sure why SonarQube isn't getting the test coverage...&#10;&#10;I am sure the separation worked, but let's see if this works...">
+      <option name="closed" value="true" />
+      <created>1754770599099</created>
+      <option name="number" value="00020" />
+      <option name="presentableId" value="LOCAL-00020" />
+      <option name="project" value="LOCAL" />
+      <updated>1754770599099</updated>
+    </task>
+    <task id="LOCAL-00021" summary="Silly boy... FullyQualifiedName can't work if the project doesn't use...">
+      <option name="closed" value="true" />
+      <created>1754776736497</created>
+      <option name="number" value="00021" />
+      <option name="presentableId" value="LOCAL-00021" />
+      <option name="project" value="LOCAL" />
+      <updated>1754776736497</updated>
+    </task>
+    <task id="LOCAL-00022" summary="it helps if a) actually fully qualified n b) remember to escape !">
+      <option name="closed" value="true" />
+      <created>1754777157012</created>
+      <option name="number" value="00022" />
+      <option name="presentableId" value="LOCAL-00022" />
+      <option name="project" value="LOCAL" />
+      <updated>1754777157012</updated>
+    </task>
+    <task id="LOCAL-00023" summary="OK, let's try including Tests.Unit rather than excluding others">
+      <option name="closed" value="true" />
+      <created>1754778632393</created>
+      <option name="number" value="00023" />
+      <option name="presentableId" value="LOCAL-00023" />
+      <option name="project" value="LOCAL" />
+      <updated>1754778632393</updated>
+    </task>
+    <task id="LOCAL-00024" summary="ignore the 2 tests failing on GitHub but passing locally...">
+      <option name="closed" value="true" />
+      <created>1754779327082</created>
+      <option name="number" value="00024" />
+      <option name="presentableId" value="LOCAL-00024" />
+      <option name="project" value="LOCAL" />
+      <updated>1754779327082</updated>
+    </task>
+    <task id="LOCAL-00025" summary="Hopefully, this is the last issue">
+      <option name="closed" value="true" />
+      <created>1754779616922</created>
+      <option name="number" value="00025" />
+      <option name="presentableId" value="LOCAL-00025" />
+      <option name="project" value="LOCAL" />
+      <updated>1754779616922</updated>
+    </task>
+    <task id="LOCAL-00026" summary="Yet another difference between SQ examples and apparent requirements">
+      <option name="closed" value="true" />
+      <created>1754780050520</created>
+      <option name="number" value="00026" />
+      <option name="presentableId" value="LOCAL-00026" />
+      <option name="project" value="LOCAL" />
+      <updated>1754780050520</updated>
+    </task>
+    <option name="localTasksCounter" value="27" />
+    <servers />
+  </component>
+  <component name="TypeScriptGeneratedFilesManager">
+    <option name="version" value="3" />
+  </component>
+  <component name="UnitTestsCoverage.Settings">
+    <option name="coveragePercentColumnWidth" value="143" />
+    <option name="sortOrder" value="DESCENDING" />
+    <option name="sortedColumn" value="1" />
+    <option name="symbolColumnWidth" value="391" />
+    <coverage-tree-state>
+      <expand>
+        <path>
+          <item name="rootNode" type="c53c71d1:RiderDotCoverCoverageTreeModel$RootNode" />
+          <item name="Total 86% 61/426" type="8b8fad3a:RiderDotCoverCoverageTreeNode" />
+        </path>
+        <path>
+          <item name="rootNode" type="c53c71d1:RiderDotCoverCoverageTreeModel$RootNode" />
+          <item name="Total 86% 61/426" type="8b8fad3a:RiderDotCoverCoverageTreeNode" />
+          <item name="src 82% 54/306" type="8b8fad3a:RiderDotCoverCoverageTreeNode" />
+        </path>
+        <path>
+          <item name="rootNode" type="c53c71d1:RiderDotCoverCoverageTreeModel$RootNode" />
+          <item name="Total 86% 61/426" type="8b8fad3a:RiderDotCoverCoverageTreeNode" />
+          <item name="src 82% 54/306" type="8b8fad3a:RiderDotCoverCoverageTreeNode" />
+          <item name="AStar.Dev.Infrastructure.FilesDb 81% 54/287" type="8b8fad3a:RiderDotCoverCoverageTreeNode" />
+        </path>
+        <path>
+          <item name="rootNode" type="c53c71d1:RiderDotCoverCoverageTreeModel$RootNode" />
+          <item name="Total 86% 61/426" type="8b8fad3a:RiderDotCoverCoverageTreeNode" />
+          <item name="src 82% 54/306" type="8b8fad3a:RiderDotCoverCoverageTreeNode" />
+          <item name="AStar.Dev.Infrastructure.FilesDb 81% 54/287" type="8b8fad3a:RiderDotCoverCoverageTreeNode" />
+          <item name="AStar.Dev.Infrastructure.FilesDb 81% 54/287" type="8b8fad3a:RiderDotCoverCoverageTreeNode" />
+        </path>
+      </expand>
+      <select />
+    </coverage-tree-state>
+  </component>
+  <component name="UnityCheckinConfiguration" checkUnsavedScenes="true" />
+  <component name="UnityProjectConfiguration" hasMinimizedUI="false" />
+  <component name="Vcs.Log.Tabs.Properties">
+    <option name="TAB_STATES">
+      <map>
+        <entry key="MAIN">
+          <value>
+            <State />
+          </value>
+        </entry>
+      </map>
+    </option>
+  </component>
+  <component name="VcsManagerConfiguration">
+    <option name="CHECK_CODE_CLEANUP_BEFORE_PROJECT_COMMIT" value="true" />
+    <option name="CLEAR_INITIAL_COMMIT_MESSAGE" value="true" />
+    <MESSAGE value="Return existing implementations to simple version&#10;&#10;now we're using SQL for Integration testing...&#10;&#10;Also restructured the solution folder structure" />
+    <MESSAGE value="Restructure on the file system to match sln" />
+    <MESSAGE value="Delete the old blob-based code" />
+    <MESSAGE value="Remove obsolete/duplicated code and&#10; &#10;get back to passing tests" />
+    <MESSAGE value="Add tests to bring coverage up&#10;&#10;It';'s quiet possible that the tests exist in the original project(s) but..." />
+    <MESSAGE value="Closer to required test coverage but not quiet there" />
+    <MESSAGE value="Add the tests from the other project&#10;&#10;And add any missing ones / fix bugs in the original code" />
+    <MESSAGE value="Fix namespaces... not sure how messed up" />
+    <MESSAGE value="Add missing test for the ComplexPropertyBuilderConfiguration.cs&#10;&#10;which triggered a few other code changes but, test-wise, it compiles and passes" />
+    <MESSAGE value="A bunch of clean-up" />
+    <MESSAGE value="Update migrations and continue with FileDetail extensions" />
+    <MESSAGE value="Fix missed test" />
+    <MESSAGE value="Glad that the password isn't for production!&#10;&#10;Or, for that matter anywhere but still... Oops!" />
+    <MESSAGE value="Quite possibly pointless but playing with separating the Sonar step" />
+    <MESSAGE value="Bring in offline updates" />
+    <MESSAGE value="Update test data and impacted tests" />
+    <MESSAGE value="Fix path in the previous commit. My bad" />
+    <MESSAGE value="Small cleanup" />
+    <MESSAGE value="Not sure why SonarQube isn't getting the test coverage...&#10;&#10;I am sure the separation worked, but let's see if this works..." />
+    <MESSAGE value="Silly boy... FullyQualifiedName can't work if the project doesn't use..." />
+    <MESSAGE value="it helps if a) actually fully qualified n b) remember to escape !" />
+    <MESSAGE value="OK, let's try including Tests.Unit rather than excluding others" />
+    <MESSAGE value="ignore the 2 tests failing on GitHub but passing locally..." />
+    <MESSAGE value="Hopefully, this is the last issue" />
+    <MESSAGE value="Yet another difference between SQ examples and apparent requirements" />
+    <option name="LAST_COMMIT_MESSAGE" value="Yet another difference between SQ examples and apparent requirements" />
+  </component>
+  <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.OperationCanceledException" breakIfHandledByOtherCode="false" displayValue="System.OperationCanceledException" />
+          <option name="timeStamp" value="1" />
+        </breakpoint>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.Threading.Tasks.TaskCanceledException" breakIfHandledByOtherCode="false" displayValue="System.Threading.Tasks.TaskCanceledException" />
+          <option name="timeStamp" value="2" />
+        </breakpoint>
+        <breakpoint enabled="true" type="DotNet_Exception_Breakpoints">
+          <properties exception="System.Threading.ThreadAbortException" breakIfHandledByOtherCode="false" displayValue="System.Threading.ThreadAbortException" />
+          <option name="timeStamp" value="3" />
+        </breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
+  </component>
+</project>
\ No newline at end of file
diff --git a/AStar.Dev.Database.Testing.slnx b/AStar.Dev.Database.Testing.slnx
new file mode 100644
index 0000000..cb4b124
--- /dev/null
+++ b/AStar.Dev.Database.Testing.slnx
@@ -0,0 +1,27 @@
+<Solution>
+    <Folder Name="/Solution Items/">
+        <File Path=".editorconfig"/>
+    </Folder>
+    <Folder Name="/Solution Items/.github/">
+        <File Path=".github/dependabot.yml"/>
+    </Folder>
+    <Folder Name="/Solution Items/.github/workflows/">
+        <File Path=".github/workflows/main_astar-dev.yml"/>
+    </Folder>
+    <Folder Name="/src/">
+        <Project Path="src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj"/>
+        <Project Path="src/AStar.Dev.Infrastructure/AStar.Dev.Infrastructure.csproj"/>
+    </Folder>
+    <Folder Name="/support/">
+        <Project Path="support/AStar.Dev.Technical.Debt.Reporting/AStar.Dev.Technical.Debt.Reporting.csproj"/>
+        <Project Path="support/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj"/>
+        <Project Path="support/DbContextHelpers/DbContextHelpers.csproj"/>
+    </Folder>
+    <Folder Name="/test/">
+        <Project Path="test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/AStar.Dev.Infrastructure.FilesDb.Tests.Integration.csproj"/>
+        <Project Path="test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/AStar.Dev.Infrastructure.FilesDb.Tests.Unit.csproj"/>
+        <Project Path="test/AStar.Dev.Infrastructure.Tests.Unit/AStar.Dev.Infrastructure.Tests.Unit.csproj"/>
+        <Project Path="test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/AStar.Dev.Technical.Debt.Reporting.Tests.Unit.csproj"/>
+        <Project Path="test/AStar.Dev.Utilities.Tests.Unit/AStar.Dev.Utilities.Tests.Unit.csproj"/>
+    </Folder>
+</Solution>
diff --git a/DatabaseTesting.sln b/DatabaseTesting.sln
deleted file mode 100644
index 05af0cc..0000000
--- a/DatabaseTesting.sln
+++ /dev/null
@@ -1,114 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 17
-VisualStudioVersion = 17.14.36221.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Technical.Debt.Reporting", "support\AStar.Dev.Technical.Debt.Reporting\AStar.Dev.Technical.Debt.Reporting.csproj", "{08DE9921-9593-4530-B062-84A41A6FAA90}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Utilities", "support\AStar.Dev.Utilities\AStar.Dev.Utilities.csproj", "{28720605-9CA9-4A33-BB00-655F4B76CA19}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Infrastructure.FilesDb.Tests.Integration", "test\AStar.Dev.Infrastructure.FilesDb.Tests.Integration\AStar.Dev.Infrastructure.FilesDb.Tests.Integration.csproj", "{2860766A-6251-4874-9535-199ED5E29AA0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DbContextHelpers", "support\DbContextHelpers\DbContextHelpers.csproj", "{FE38F9CD-8573-44D1-A03F-73D318B6E86D}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-	ProjectSection(SolutionItems) = preProject
-		.editorconfig = .editorconfig
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = ".github", ".github", "{EB916946-4AEB-4F7A-B6AF-E270D6574EC0}"
-	ProjectSection(SolutionItems) = preProject
-		.github\dependabot.yml = .github\dependabot.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "workflows", "workflows", "{1B8EF033-F575-495D-BC9C-D0539E66EC28}"
-	ProjectSection(SolutionItems) = preProject
-		.github\workflows\main_astar-dev.yml = .github\workflows\main_astar-dev.yml
-	EndProjectSection
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{D61F13DC-3A32-42BE-8687-F795D7332A51}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{D96E7D57-B3CF-4792-8532-59F03453A8B6}"
-EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "support", "support", "{F06BC983-3361-41B2-B64F-7A77A2E32782}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Infrastructure", "src\AStar.Dev.Infrastructure\AStar.Dev.Infrastructure.csproj", "{C00B2A62-E46E-4F6E-BC8A-39088261A17E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Infrastructure.FilesDb", "src\AStar.Dev.Infrastructure.FilesDb\AStar.Dev.Infrastructure.FilesDb.csproj", "{626B3E85-6C5D-4D8B-96BB-BF2D375326CA}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Infrastructure.Tests.Unit", "test\AStar.Dev.Infrastructure.Tests.Unit\AStar.Dev.Infrastructure.Tests.Unit.csproj", "{1EC059E7-7C8D-4492-8C07-30BD79AEE465}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Infrastructure.FilesDb.Tests.Unit", "test\AStar.Dev.Infrastructure.FilesDb.Tests.Unit\AStar.Dev.Infrastructure.FilesDb.Tests.Unit.csproj", "{019990B2-EFCD-4FB1-9FD1-CD98CCBFF670}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Utilities.Tests.Unit", "test\AStar.Dev.Utilities.Tests.Unit\AStar.Dev.Utilities.Tests.Unit.csproj", "{55EB2B02-1528-45B8-A460-93F269527272}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AStar.Dev.Technical.Debt.Reporting.Tests.Unit", "test\AStar.Dev.Technical.Debt.Reporting.Tests.Unit\AStar.Dev.Technical.Debt.Reporting.Tests.Unit.csproj", "{3C872AF9-A2A3-4CB8-B7BB-FC1BC3B57A82}"
-EndProject
-Global
-	GlobalSection(SolutionConfigurationPlatforms) = preSolution
-		Debug|Any CPU = Debug|Any CPU
-		Release|Any CPU = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(ProjectConfigurationPlatforms) = postSolution
-		{08DE9921-9593-4530-B062-84A41A6FAA90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{08DE9921-9593-4530-B062-84A41A6FAA90}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{08DE9921-9593-4530-B062-84A41A6FAA90}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{08DE9921-9593-4530-B062-84A41A6FAA90}.Release|Any CPU.Build.0 = Release|Any CPU
-		{28720605-9CA9-4A33-BB00-655F4B76CA19}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{28720605-9CA9-4A33-BB00-655F4B76CA19}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{28720605-9CA9-4A33-BB00-655F4B76CA19}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{28720605-9CA9-4A33-BB00-655F4B76CA19}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2860766A-6251-4874-9535-199ED5E29AA0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2860766A-6251-4874-9535-199ED5E29AA0}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2860766A-6251-4874-9535-199ED5E29AA0}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2860766A-6251-4874-9535-199ED5E29AA0}.Release|Any CPU.Build.0 = Release|Any CPU
-		{FE38F9CD-8573-44D1-A03F-73D318B6E86D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{FE38F9CD-8573-44D1-A03F-73D318B6E86D}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{FE38F9CD-8573-44D1-A03F-73D318B6E86D}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{FE38F9CD-8573-44D1-A03F-73D318B6E86D}.Release|Any CPU.Build.0 = Release|Any CPU
-		{C00B2A62-E46E-4F6E-BC8A-39088261A17E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{C00B2A62-E46E-4F6E-BC8A-39088261A17E}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{C00B2A62-E46E-4F6E-BC8A-39088261A17E}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{C00B2A62-E46E-4F6E-BC8A-39088261A17E}.Release|Any CPU.Build.0 = Release|Any CPU
-		{626B3E85-6C5D-4D8B-96BB-BF2D375326CA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{626B3E85-6C5D-4D8B-96BB-BF2D375326CA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{626B3E85-6C5D-4D8B-96BB-BF2D375326CA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{626B3E85-6C5D-4D8B-96BB-BF2D375326CA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{1EC059E7-7C8D-4492-8C07-30BD79AEE465}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{1EC059E7-7C8D-4492-8C07-30BD79AEE465}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{1EC059E7-7C8D-4492-8C07-30BD79AEE465}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{1EC059E7-7C8D-4492-8C07-30BD79AEE465}.Release|Any CPU.Build.0 = Release|Any CPU
-		{019990B2-EFCD-4FB1-9FD1-CD98CCBFF670}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{019990B2-EFCD-4FB1-9FD1-CD98CCBFF670}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{019990B2-EFCD-4FB1-9FD1-CD98CCBFF670}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{019990B2-EFCD-4FB1-9FD1-CD98CCBFF670}.Release|Any CPU.Build.0 = Release|Any CPU
-		{55EB2B02-1528-45B8-A460-93F269527272}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{55EB2B02-1528-45B8-A460-93F269527272}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{55EB2B02-1528-45B8-A460-93F269527272}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{55EB2B02-1528-45B8-A460-93F269527272}.Release|Any CPU.Build.0 = Release|Any CPU
-		{3C872AF9-A2A3-4CB8-B7BB-FC1BC3B57A82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{3C872AF9-A2A3-4CB8-B7BB-FC1BC3B57A82}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{3C872AF9-A2A3-4CB8-B7BB-FC1BC3B57A82}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{3C872AF9-A2A3-4CB8-B7BB-FC1BC3B57A82}.Release|Any CPU.Build.0 = Release|Any CPU
-	EndGlobalSection
-	GlobalSection(SolutionProperties) = preSolution
-		HideSolutionNode = FALSE
-	EndGlobalSection
-	GlobalSection(ExtensibilityGlobals) = postSolution
-		SolutionGuid = {7F8498D7-2757-4147-B9D5-02595469FE7A}
-	EndGlobalSection
-	GlobalSection(NestedProjects) = preSolution
-		{EB916946-4AEB-4F7A-B6AF-E270D6574EC0} = {02EA681E-C7D8-13C7-8484-4AC65E1B71E8}
-		{1B8EF033-F575-495D-BC9C-D0539E66EC28} = {EB916946-4AEB-4F7A-B6AF-E270D6574EC0}
-		{2860766A-6251-4874-9535-199ED5E29AA0} = {D96E7D57-B3CF-4792-8532-59F03453A8B6}
-		{08DE9921-9593-4530-B062-84A41A6FAA90} = {F06BC983-3361-41B2-B64F-7A77A2E32782}
-		{28720605-9CA9-4A33-BB00-655F4B76CA19} = {F06BC983-3361-41B2-B64F-7A77A2E32782}
-		{FE38F9CD-8573-44D1-A03F-73D318B6E86D} = {F06BC983-3361-41B2-B64F-7A77A2E32782}
-		{C00B2A62-E46E-4F6E-BC8A-39088261A17E} = {D61F13DC-3A32-42BE-8687-F795D7332A51}
-		{626B3E85-6C5D-4D8B-96BB-BF2D375326CA} = {D61F13DC-3A32-42BE-8687-F795D7332A51}
-		{1EC059E7-7C8D-4492-8C07-30BD79AEE465} = {D96E7D57-B3CF-4792-8532-59F03453A8B6}
-		{019990B2-EFCD-4FB1-9FD1-CD98CCBFF670} = {D96E7D57-B3CF-4792-8532-59F03453A8B6}
-		{55EB2B02-1528-45B8-A460-93F269527272} = {D96E7D57-B3CF-4792-8532-59F03453A8B6}
-		{3C872AF9-A2A3-4CB8-B7BB-FC1BC3B57A82} = {D96E7D57-B3CF-4792-8532-59F03453A8B6}
-	EndGlobalSection
-EndGlobal
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj b/src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj
index 5819eaa..9f63e94 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj
+++ b/src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj
@@ -6,8 +6,8 @@
         <Nullable>enable</Nullable>
         <ApplicationIcon>astar.ico</ApplicationIcon>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Authors>AStar Developement, Jason Barden</Authors>
-        <Copyright>AStar Developement, 2025</Copyright>
+        <Authors>AStar Development, Jason Barden</Authors>
+        <Copyright>AStar Development, 2025</Copyright>
         <PackageProjectUrl>https://github.com/astar-development/</PackageProjectUrl>
         <RepositoryUrl>https://github.com/astar-development/</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
@@ -20,15 +20,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AStar.Dev.Functional.Extensions" Version="0.2.0"/>
+        <PackageReference Include="AStar.Dev.Functional.Extensions" Version="0.4.5"/>
         <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.0.15"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.7">
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.9"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.9">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.7"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7">
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.9">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileClassificationConfiguration.cs b/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileClassificationConfiguration.cs
index fd3873f..23e7155 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileClassificationConfiguration.cs
+++ b/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileClassificationConfiguration.cs
@@ -13,7 +13,7 @@ public void Configure(EntityTypeBuilder<FileClassification> builder)
     {
         _ = builder
             .ToTable(nameof(FileClassification), Constants.SchemaName)
-            .HasKey(fileClassification =>  fileClassification.Id);
+            .HasKey(fileClassification => fileClassification.Id);
 
         _ = builder.HasMany<FileNamePart>();
         _ = builder.Property(fileClassification => fileClassification.Name).HasMaxLength(150);
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileDetailConfiguration.cs b/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileDetailConfiguration.cs
index 8cfc136..be851fd 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileDetailConfiguration.cs
+++ b/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileDetailConfiguration.cs
@@ -17,7 +17,7 @@ public void Configure(EntityTypeBuilder<FileDetail> builder)
         builder.HasKey(file => file.Id);
 
         builder.Property(file => file.Id)
-               .HasConversion(fileId => fileId.Value, fileId => new (fileId));
+               .HasConversion(fileId => fileId.Value, fileId => new(fileId));
 
         builder.Ignore(fileDetail => fileDetail.FileName);
         builder.Ignore(fileDetail => fileDetail.DirectoryName);
@@ -25,7 +25,7 @@ public void Configure(EntityTypeBuilder<FileDetail> builder)
 
         builder.Property(file => file.FileHandle)
                .HasColumnType("nvarchar(256)")
-               .HasConversion(fileHandle => fileHandle.Value, fileHandle => new (fileHandle));
+               .HasConversion(fileHandle => fileHandle.Value, fileHandle => new(fileHandle));
 
         builder.ComplexProperty(fileDetail => fileDetail.ImageDetail)
                .Configure(new ImageDetailConfiguration());
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileNamePartConfiguration.cs b/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileNamePartConfiguration.cs
index f34c8f6..a69b177 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileNamePartConfiguration.cs
+++ b/src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileNamePartConfiguration.cs
@@ -13,7 +13,7 @@ public void Configure(EntityTypeBuilder<FileNamePart> builder)
     {
         _ = builder
             .ToTable(nameof(FileNamePart), Constants.SchemaName)
-            .HasKey(fileNamePart =>  fileNamePart.Id);
+            .HasKey(fileNamePart => fileNamePart.Id);
 
         _ = builder.Property(fileNamePart => fileNamePart.Text).HasMaxLength(150);
     }
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailPagingExtensions.cs b/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailPagingExtensions.cs
index 177713d..8f6e96e 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailPagingExtensions.cs
+++ b/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailPagingExtensions.cs
@@ -16,7 +16,7 @@ public static IQueryable<FileDetail> GetPage(this IQueryable<FileDetail> files,
     {
         pageSize = RestrictPageSize(pageSize);
 
-        if (pageNumber < 1)
+        if(pageNumber < 1)
         {
             pageNumber = 1;
         }
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailSearchTypeExtensions.cs b/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailSearchTypeExtensions.cs
index a3b6610..c1833c9 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailSearchTypeExtensions.cs
+++ b/src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailSearchTypeExtensions.cs
@@ -23,6 +23,6 @@ public static IQueryable<FileDetail> OfSearchType(this IQueryable<FileDetail> fi
                                                                                x.FileSize           == f.FileSize           &&
                                                                                x.ImageDetail.Height == f.ImageDetail.Height &&
                                                                                x.ImageDetail.Width  == f.ImageDetail.Width) > 1),
-               _                          => throw new UnreachableException("If we reach here, a new SearchType has been added but not included...")
+               _ => throw new UnreachableException("If we reach here, a new SearchType has been added but not included...")
            };
 }
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/Data/FilesContext.cs b/src/AStar.Dev.Infrastructure.FilesDb/Data/FilesContext.cs
index 8d3ae6a..dcc885c 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/Data/FilesContext.cs
+++ b/src/AStar.Dev.Infrastructure.FilesDb/Data/FilesContext.cs
@@ -22,7 +22,7 @@ public FilesContext(DbContextOptions<FilesContext> options)
     /// <summary>
     /// </summary>
     public FilesContext()
-        : base(new DbContextOptions<FilesContext>() )
+        : base(new DbContextOptions<FilesContext>())
     {
     }
 
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/Models/DuplicateDetail.cs b/src/AStar.Dev.Infrastructure.FilesDb/Models/DuplicateDetail.cs
index 9ce8bd7..914e4cc 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/Models/DuplicateDetail.cs
+++ b/src/AStar.Dev.Infrastructure.FilesDb/Models/DuplicateDetail.cs
@@ -22,17 +22,17 @@ public class DuplicateDetail
     /// <summary>
     ///     Gets or sets the File Height
     /// </summary>
-    public int    ImageHeight     { get; set; }
+    public int ImageHeight { get; set; }
 
     /// <summary>
     ///     Gets or sets the File Width
     /// </summary>
-    public int    ImageWidth      { get; set; }
+    public int ImageWidth { get; set; }
 
     /// <summary>
     ///     Gets or sets the File Size
     /// </summary>
-    public long    FileSize   { get; set; }
+    public long FileSize { get; set; }
 
     /// <summary>
     ///     Gets or sets the File Handle
@@ -43,12 +43,12 @@ public class DuplicateDetail
     /// <summary>
     ///     Gets or sets whether File is an image
     /// </summary>
-    public bool   IsImage    { get; set; }
+    public bool IsImage { get; set; }
 
     /// <summary>
     ///     Gets or sets the Instance count for the duplicate group
     /// </summary>
-    public int   Instances  { get; set; }
+    public int Instances { get; set; }
 
     /// <summary>
     ///     Gets or sets the Details Last Updated
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/Models/EventType.cs b/src/AStar.Dev.Infrastructure.FilesDb/Models/EventType.cs
index 96a2ef0..40d4f3c 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/Models/EventType.cs
+++ b/src/AStar.Dev.Infrastructure.FilesDb/Models/EventType.cs
@@ -22,42 +22,42 @@ private EventType(int value, string name)
     /// <summary>
     ///     Represents an 'Add' event type, typically used for new record creation.
     /// </summary>
-    public static EventType Add    => new (1, "Add");
+    public static EventType Add => new(1, "Add");
 
     /// <summary>
     ///     Represents an 'Update' event type, typically used for modifying existing records.
     /// </summary>
-    public static EventType Update => new (2, "Update");
+    public static EventType Update => new(2, "Update");
 
     /// <summary>
     ///     Represents a 'SoftDelete' event type, typically used for 'soft' removing records.
     /// </summary>
-    public static EventType SoftDelete => new (3, "SoftDelete");
+    public static EventType SoftDelete => new(3, "SoftDelete");
 
     /// <summary>
     ///     Represents a 'HardDelete' event type, typically used for permanently removing records.
     /// </summary>
-    public static EventType HardDelete => new (4, "HardDelete");
+    public static EventType HardDelete => new(4, "HardDelete");
 
     /// <summary>
     ///     Gets the integer value associated with the event type.
     /// </summary>
-    public int    Value { get; }
+    public int Value { get; }
 
     /// <summary>
     ///     Gets the string name of the event type.
     /// </summary>
-    public string Name  { get; }
+    public string Name { get; }
 
     /// <inheritdoc />
     public bool Equals(EventType? other)
     {
-        if (other is null)
+        if(other is null)
         {
             return false;
         }
 
-        if (ReferenceEquals(this, other))
+        if(ReferenceEquals(this, other))
         {
             return true;
         }
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/Models/FileClassification.cs b/src/AStar.Dev.Infrastructure.FilesDb/Models/FileClassification.cs
index 108d15a..669eec0 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/Models/FileClassification.cs
+++ b/src/AStar.Dev.Infrastructure.FilesDb/Models/FileClassification.cs
@@ -14,7 +14,7 @@ public class FileClassification
 
     /// <summary>
     /// </summary>
-    public ICollection<FileDetail> FileDetails { get ; set ; } = [];
+    public ICollection<FileDetail> FileDetails { get; set; } = [];
 
     /// <summary>
     /// </summary>
@@ -22,5 +22,5 @@ public class FileClassification
 
     /// <summary>
     /// </summary>
-    public ICollection<FileNamePart> FileNameParts { get ; set ; } = [];
+    public ICollection<FileNamePart> FileNameParts { get; set; } = [];
 }
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/Models/FileDetail.cs b/src/AStar.Dev.Infrastructure.FilesDb/Models/FileDetail.cs
index cc0c084..97002c6 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/Models/FileDetail.cs
+++ b/src/AStar.Dev.Infrastructure.FilesDb/Models/FileDetail.cs
@@ -31,7 +31,7 @@ public FileDetail(IFileInfo fileInfo)
 
     /// <summary>
     /// </summary>
-    public ICollection<FileClassification> FileClassifications { get ; set ; } = [];
+    public ICollection<FileClassification> FileClassifications { get; set; } = [];
 
     /// <summary>
     ///     Gets or sets the ID of the <see href="FileDetail"></see>. I know, shocking...
diff --git a/src/AStar.Dev.Infrastructure.FilesDb/Models/FileNamePart.cs b/src/AStar.Dev.Infrastructure.FilesDb/Models/FileNamePart.cs
index 00db166..0f2e69a 100644
--- a/src/AStar.Dev.Infrastructure.FilesDb/Models/FileNamePart.cs
+++ b/src/AStar.Dev.Infrastructure.FilesDb/Models/FileNamePart.cs
@@ -14,5 +14,5 @@ public class FileNamePart
 
     /// <summary>
     /// </summary>
-    public virtual ICollection<FileClassification> FileClassifications { get ; set ; } = [];
+    public virtual ICollection<FileClassification> FileClassifications { get; set; } = [];
 }
diff --git a/src/AStar.Dev.Infrastructure/AStar.Dev.Infrastructure.csproj b/src/AStar.Dev.Infrastructure/AStar.Dev.Infrastructure.csproj
index 99fec80..e7502b0 100644
--- a/src/AStar.Dev.Infrastructure/AStar.Dev.Infrastructure.csproj
+++ b/src/AStar.Dev.Infrastructure/AStar.Dev.Infrastructure.csproj
@@ -6,8 +6,8 @@
         <Nullable>enable</Nullable>
         <ApplicationIcon>astar.ico</ApplicationIcon>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Authors>AStar Developement, Jason Barden</Authors>
-        <Copyright>AStar Developement, 2025</Copyright>
+        <Authors>AStar Development, Jason Barden</Authors>
+        <Copyright>AStar Development, 2025</Copyright>
         <PackageProjectUrl>https://github.com/astar-development/</PackageProjectUrl>
         <RepositoryUrl>https://github.com/astar-development/</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
@@ -25,8 +25,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="AStar.Dev.Functional.Extensions" Version="0.2.0"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.7"/>
+        <PackageReference Include="AStar.Dev.Functional.Extensions" Version="0.4.5"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9"/>
     </ItemGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
diff --git a/support/AStar.Dev.Technical.Debt.Reporting/AStar.Dev.Technical.Debt.Reporting.csproj b/support/AStar.Dev.Technical.Debt.Reporting/AStar.Dev.Technical.Debt.Reporting.csproj
index 8788c48..9b991b8 100644
--- a/support/AStar.Dev.Technical.Debt.Reporting/AStar.Dev.Technical.Debt.Reporting.csproj
+++ b/support/AStar.Dev.Technical.Debt.Reporting/AStar.Dev.Technical.Debt.Reporting.csproj
@@ -6,8 +6,8 @@
         <Nullable>enable</Nullable>
         <ApplicationIcon>astar.ico</ApplicationIcon>
         <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-        <Authors>AStar Developement, Jason Barden</Authors>
-        <Copyright>AStar Developement, 2025</Copyright>
+        <Authors>AStar Development, Jason Barden</Authors>
+        <Copyright>AStar Development, 2025</Copyright>
         <PackageProjectUrl>https://github.com/astar-development/</PackageProjectUrl>
         <RepositoryUrl>https://github.com/astar-development/</RepositoryUrl>
         <RepositoryType>git</RepositoryType>
diff --git a/support/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj b/support/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj
index 7df4593..50588e5 100644
--- a/support/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj
+++ b/support/AStar.Dev.Utilities/AStar.Dev.Utilities.csproj
@@ -43,7 +43,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <None Update="AStar.png">
+        <None Update="astar.png">
             <CopyToOutputDirectory>Always</CopyToOutputDirectory>
         </None>
     </ItemGroup>
diff --git a/support/AStar.Dev.Utilities/EncryptionExtensions.cs b/support/AStar.Dev.Utilities/EncryptionExtensions.cs
index ad27b7f..68c06c3 100644
--- a/support/AStar.Dev.Utilities/EncryptionExtensions.cs
+++ b/support/AStar.Dev.Utilities/EncryptionExtensions.cs
@@ -36,7 +36,7 @@ public static string Encrypt(this string plainText, string? key = null, string?
         using var msEncrypt = new MemoryStream();
         using var csEncrypt = new CryptoStream(msEncrypt, encryptor, CryptoStreamMode.Write);
 
-        using (var swEncrypt = new StreamWriter(csEncrypt))
+        using(var swEncrypt = new StreamWriter(csEncrypt))
         {
             swEncrypt.Write(plainText);
         }
diff --git a/support/AStar.Dev.Utilities/LinqExtensions.cs b/support/AStar.Dev.Utilities/LinqExtensions.cs
index 3a28600..2db8783 100644
--- a/support/AStar.Dev.Utilities/LinqExtensions.cs
+++ b/support/AStar.Dev.Utilities/LinqExtensions.cs
@@ -11,7 +11,7 @@ public static class LinqExtensions
     /// <typeparam name="T"></typeparam>
     public static void ForEach<T>(this IEnumerable<T> enumerable, Action<T> action)
     {
-        foreach (var item in enumerable)
+        foreach(var item in enumerable)
         {
             action(item);
         }
diff --git a/support/DbContextHelpers/DbContextHelpers.csproj b/support/DbContextHelpers/DbContextHelpers.csproj
index 0824889..12fbb50 100644
--- a/support/DbContextHelpers/DbContextHelpers.csproj
+++ b/support/DbContextHelpers/DbContextHelpers.csproj
@@ -8,14 +8,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.7"/>
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7"/>
-        <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.7"/>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.7"/>
-        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.7"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="9.0.9"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.9"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration" Version="9.0.9"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="9.0.9"/>
         <PackageReference Include="Shouldly" Version="4.3.0"/>
         <PackageReference Include="xunit" Version="2.9.3"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/support/DbContextHelpers/TestConstants.cs b/support/DbContextHelpers/TestConstants.cs
index 6847c1a..917b41b 100644
--- a/support/DbContextHelpers/TestConstants.cs
+++ b/support/DbContextHelpers/TestConstants.cs
@@ -1,6 +1,6 @@
 namespace DbContextHelpers;
 
-public  static class TestConstants
+public static class TestConstants
 {
     public const string SharedIntegrationCollection = "Shared Integration Collection";
 }
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/AStar.Dev.Infrastructure.FilesDb.Tests.Integration.csproj b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/AStar.Dev.Infrastructure.FilesDb.Tests.Integration.csproj
index 5a613a9..75db9ec 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/AStar.Dev.Infrastructure.FilesDb.Tests.Integration.csproj
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/AStar.Dev.Infrastructure.FilesDb.Tests.Integration.csproj
@@ -18,13 +18,13 @@
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="JetBrains.Annotations" Version="2025.2.0"/>
-        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.7"/>
-        <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.7.0"/>
+        <PackageReference Include="JetBrains.Annotations" Version="2025.2.2"/>
+        <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="9.0.9"/>
+        <PackageReference Include="Microsoft.Extensions.TimeProvider.Testing" Version="9.9.0"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
         <PackageReference Include="Shouldly" Version="4.3.0"/>
         <PackageReference Include="xunit" Version="2.9.3"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDeletionStatusExtensionsShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDeletionStatusExtensionsShould.cs
index 9a64854..4742260 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDeletionStatusExtensionsShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDeletionStatusExtensionsShould.cs
@@ -1,12 +1,11 @@
 using AStar.Dev.Infrastructure.FilesDb.Data;
 using DbContextHelpers.Fixtures;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Integration;
 
 /// <summary>
 /// </summary>
-public class FileDetailDeletionStatusExtensionsShould (FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
+public class FileDetailDeletionStatusExtensionsShould(FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
 {
     [Fact]
     public void ShouldReturnExpectedFileDetailsWhenIncludeDeletedOrDeletePendingIsFalse()
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDirectoryNameExtensionsShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDirectoryNameExtensionsShould.cs
index 6a4fd1b..ed993ba 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDirectoryNameExtensionsShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailDirectoryNameExtensionsShould.cs
@@ -1,11 +1,10 @@
 using AStar.Dev.Infrastructure.FilesDb.Data;
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using DbContextHelpers.Fixtures;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Integration;
 
-public class FileDetailDirectoryNameExtensionsShould (FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
+public class FileDetailDirectoryNameExtensionsShould(FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
 {
     [Fact]
     public void ShouldReturnExpectedFileDetailsWhenDirectoryNameSpecifiedAndRecursionIsFalse()
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailOrderingExtensionsShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailOrderingExtensionsShould.cs
index a4a63f0..367ccd5 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailOrderingExtensionsShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailOrderingExtensionsShould.cs
@@ -1,13 +1,12 @@
 using AStar.Dev.Infrastructure.FilesDb.Data;
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using DbContextHelpers.Fixtures;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Integration;
 
 /// <summary>
 /// </summary>
-public class FileDetailOrderingExtensionsShould (FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
+public class FileDetailOrderingExtensionsShould(FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
 {
     [Fact]
     public void ShouldReturnExpectedFileDetailsOrderedByNameAscending()
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailPagingExtensionsShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailPagingExtensionsShould.cs
index 292f8fe..3be807f 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailPagingExtensionsShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailPagingExtensionsShould.cs
@@ -1,12 +1,11 @@
 using AStar.Dev.Infrastructure.FilesDb.Data;
 using DbContextHelpers.Fixtures;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Integration;
 
 /// <summary>
 /// </summary>
-public class FileDetailPagingExtensionsShould (FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
+public class FileDetailPagingExtensionsShould(FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
 {
     [Fact]
     public void ShouldReturnExpectedFirstPageOfTenResultsWithCorrectDetails()
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailSearchTypeExtensionsShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailSearchTypeExtensionsShould.cs
index 44da0c7..503fb4a 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailSearchTypeExtensionsShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailSearchTypeExtensionsShould.cs
@@ -1,13 +1,12 @@
 using AStar.Dev.Infrastructure.FilesDb.Data;
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using DbContextHelpers.Fixtures;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Integration;
 
 /// <summary>
 /// </summary>
-public class FileDetailSearchTypeExtensionsShould (FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
+public class FileDetailSearchTypeExtensionsShould(FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
 {
     [Fact]
     public void ShouldReturnExpectedFileDetailsWhenSearchTypeIsSetToAll()
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailTextContainsExtensionsShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailTextContainsExtensionsShould.cs
index c7fa323..0f56fd1 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailTextContainsExtensionsShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FileDetailTextContainsExtensionsShould.cs
@@ -1,12 +1,11 @@
 using AStar.Dev.Infrastructure.FilesDb.Data;
 using DbContextHelpers.Fixtures;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Integration;
 
 /// <summary>
 /// </summary>
-public class FileDetailTextContainsExtensionsShould (FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
+public class FileDetailTextContainsExtensionsShould(FilesContextFixture filesContextFixture) : IClassFixture<FilesContextFixture>
 {
     [Fact]
     public void ReturnTheExpectedFilesMatchingTheSuppliedTextWhenExistsInTheDirectoryNameOnly()
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FilesContextLastViewedExtensionsShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FilesContextLastViewedExtensionsShould.cs
index 9afa813..f71cc9c 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FilesContextLastViewedExtensionsShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Integration/FilesContextLastViewedExtensionsShould.cs
@@ -1,7 +1,6 @@
 using AStar.Dev.Infrastructure.FilesDb.Data;
 using DbContextHelpers.Fixtures;
 using Microsoft.Extensions.Time.Testing;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Integration;
 
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/AStar.Dev.Infrastructure.FilesDb.Tests.Unit.csproj b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/AStar.Dev.Infrastructure.FilesDb.Tests.Unit.csproj
index 496984a..03f429d 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/AStar.Dev.Infrastructure.FilesDb.Tests.Unit.csproj
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/AStar.Dev.Infrastructure.FilesDb.Tests.Unit.csproj
@@ -12,12 +12,18 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.2"/>
-        <PackageReference Include="JetBrains.Annotations" Version="2025.2.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="JetBrains.Annotations" Version="2025.2.2"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
         <PackageReference Include="Shouldly" Version="4.3.0"/>
-        <PackageReference Include="xunit" Version="2.9.2"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2"/>
+        <PackageReference Include="xunit" Version="2.9.3"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
         <PackageReference Include="NSubstitute" Version="5.3.0"/>
         <PackageReference Include="NSubstitute.Analyzers.CSharp" Version="1.0.17">
             <PrivateAssets>all</PrivateAssets>
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DeletionStatusShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DeletionStatusShould.cs
index afdcb41..8fb7a92 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DeletionStatusShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DeletionStatusShould.cs
@@ -1,6 +1,5 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using AStar.Dev.Utilities;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DirectoryNameShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DirectoryNameShould.cs
index 7ca7500..b2ddd2f 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DirectoryNameShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DirectoryNameShould.cs
@@ -1,6 +1,5 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using AStar.Dev.Utilities;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
@@ -8,7 +7,7 @@ public class DirectoryNameShould
 {
     [Fact]
     public void ContainTheExpectedProperties()
-        => new DirectoryName ( "test")
+        => new DirectoryName("test")
            .ToJson()
            .ShouldMatchApproved();
 }
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DuplicateDetailShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DuplicateDetailShould.cs
index 93bc491..c479010 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DuplicateDetailShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/DuplicateDetailShould.cs
@@ -1,6 +1,5 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using AStar.Dev.Utilities;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
@@ -10,13 +9,13 @@ public class DuplicateDetailShould
     public void ContainTheExpectedProperties()
         => new DuplicateDetail
            {
-               FileHandle        = new ("mock-file-handle"),
-               DirectoryName     = new ("mock-directory-name"),
-               FileName          = new ("mock-file-name"),
+               FileHandle        = new("mock-file-handle"),
+               DirectoryName     = new("mock-directory-name"),
+               FileName          = new("mock-file-name"),
                FileSize          = 1245,
                IsImage           = true,
                FileLastViewed    = new DateTimeOffset(2025, 07, 28, 11, 22, 33, TimeSpan.Zero),
-               UpdatedOn         = new (2025, 07, 28, 8, 7, 9, TimeSpan.Zero),
+               UpdatedOn         = new(2025, 07, 28, 8, 7, 9, TimeSpan.Zero),
                MoveRequired      = true,
                ImageHeight       = 123,
                ImageWidth        = 345,
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/EventShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/EventShould.cs
index e1ac6bb..beea81b 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/EventShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/EventShould.cs
@@ -1,6 +1,5 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using AStar.Dev.Utilities;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
@@ -13,13 +12,13 @@ public void ShouldContainTheExpectedProperties()
                FileName         = "FileName",
                DirectoryName    = "DirectoryName",
                FileSize         = 124,
-               FileCreated      = new (2025, 07, 28, 11, 22, 33, TimeSpan.Zero) ,
-               FileLastModified = new (2025, 07, 28, 1,  2,  3,  TimeSpan.Zero),
+               FileCreated      = new(2025, 07, 28, 11, 22, 33, TimeSpan.Zero),
+               FileLastModified = new(2025, 07, 28, 1, 2, 3, TimeSpan.Zero),
                Height           = 456,
                Id               = 1324,
                UpdatedBy        = "TestUser",
                Width            = 987,
-               EventOccurredAt  = new (2025, 07, 28, 1, 24, 34, TimeSpan.Zero),
+               EventOccurredAt  = new(2025, 07, 28, 1, 24, 34, TimeSpan.Zero),
                Handle           = "mock-handle",
                Type             = EventType.Add
            }
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileDetailShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileDetailShould.cs
index 2dddf93..c57ba51 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileDetailShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileDetailShould.cs
@@ -1,8 +1,6 @@
 using System.IO.Abstractions;
 using AStar.Dev.Infrastructure.FilesDb.Models;
-using JetBrains.Annotations;
 using NSubstitute;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
@@ -16,24 +14,24 @@ public void ReturnTheExpectedToStringRepresentation()
                          {
                              Id               = new(1),
                              DirectoryName    = new("MockDirectoryName"),
-                             FileCreated      = new (new (2025, 6, 28, 22, 15, 37, DateTimeKind.Utc)),
-                             FileLastModified = new (new (2025, 6, 28, 22, 15, 37, DateTimeKind.Utc)),
-                             DeletionStatus      =
+                             FileCreated      = new(new(2025, 6, 28, 22, 15, 37, DateTimeKind.Utc)),
+                             FileLastModified = new(new(2025, 6, 28, 22, 15, 37, DateTimeKind.Utc)),
+                             DeletionStatus =
                                  new()
                                  {
-                                     SoftDeleted       = new DateTimeOffset(new (2025, 6, 28, 22, 21, 37, DateTimeKind.Utc)),
-                                     SoftDeletePending = new DateTimeOffset(new (2025, 6, 28, 22, 22, 37, DateTimeKind.Utc)),
-                                     HardDeletePending = new DateTimeOffset(new (2025, 6, 28, 22, 23, 37, DateTimeKind.Utc))
+                                     SoftDeleted       = new DateTimeOffset(new(2025, 6, 28, 22, 21, 37, DateTimeKind.Utc)),
+                                     SoftDeletePending = new DateTimeOffset(new(2025, 6, 28, 22, 22, 37, DateTimeKind.Utc)),
+                                     HardDeletePending = new DateTimeOffset(new(2025, 6, 28, 22, 23, 37, DateTimeKind.Utc))
                                  },
                              FileName            = new("MockFileName"),
                              FileSize            = 1234,
                              FileHandle          = new("MockFileHandle"),
-                             FileLastViewed      = new DateTimeOffset(new (2025, 6, 28, 22, 20, 37, DateTimeKind.Utc)),
+                             FileLastViewed      = new DateTimeOffset(new(2025, 6, 28, 22, 20, 37, DateTimeKind.Utc)),
                              IsImage             = true,
                              ImageDetail         = new(1234, 5678),
                              UpdatedBy           = "Test User",
-                             UpdatedOn           = new (new (2025, 6, 28, 22, 30, 37, DateTimeKind.Utc)),
-                             FileClassifications = [new () { Id = 1, Name = "Test Classification", Celebrity = true }],
+                             UpdatedOn           = new(new(2025, 6, 28, 22, 30, 37, DateTimeKind.Utc)),
+                             FileClassifications = [new() { Id = 1, Name = "Test Classification", Celebrity = true }],
                              MoveRequired        = true
                          };
 
@@ -43,15 +41,12 @@ public void ReturnTheExpectedToStringRepresentation()
     [Fact(Skip = "Dunno why this is failing on the build server but not locally")]
     public void ReturnTheExpectedDataFromTheCopyConstructor()
     {
-        var mockFileInfo      = Substitute.For<IFileInfo>();
+        var mockFileInfo = Substitute.For<IFileInfo>();
         mockFileInfo.Name.Returns("MockFileName");
         mockFileInfo.DirectoryName.Returns("MockDirectoryName");
         mockFileInfo.Length.Returns(1234);
 
-        var fileDetail = new FileDetail(mockFileInfo)
-                         {
-                             FileName = new("Mock File Name"), DirectoryName = new("Mock Directory Name"), UpdatedOn = new (new (2025, 6, 28, 22, 20, 37, DateTimeKind.Utc))
-                         };
+        var fileDetail = new FileDetail(mockFileInfo) { FileName = new("Mock File Name"), DirectoryName = new("Mock Directory Name"), UpdatedOn = new(new(2025, 6, 28, 22, 20, 37, DateTimeKind.Utc)) };
 
         fileDetail.ToString().ShouldMatchApproved();
     }
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileHandleShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileHandleShould.cs
index 18e25bf..9eb4d40 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileHandleShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileHandleShould.cs
@@ -1,7 +1,5 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using AStar.Dev.Utilities;
-using JetBrains.Annotations;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileIdShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileIdShould.cs
index 7f3ba85..cb0adc8 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileIdShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileIdShould.cs
@@ -1,6 +1,5 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using AStar.Dev.Utilities;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNamePartShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNamePartShould.cs
index a9104d1..6386340 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNamePartShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNamePartShould.cs
@@ -1,7 +1,5 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using AStar.Dev.Utilities;
-using JetBrains.Annotations;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
@@ -10,6 +8,6 @@ public class FileNamePartShould
 {
     [Fact]
     public void ContainTheExpectedProperties()
-        => new FileNamePart { Id = 1, Text = "Mock Text", FileClassifications = new List<FileClassification> { new () { Id = 1, Celebrity = true, Name = "Mock Classification" } } }.ToJson()
-                                                                                                                                                                                    .ShouldMatchApproved();
+        => new FileNamePart { Id = 1, Text = "Mock Text", FileClassifications = new List<FileClassification> { new() { Id = 1, Celebrity = true, Name = "Mock Classification" } } }.ToJson()
+                                                                                                                                                                                   .ShouldMatchApproved();
 }
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNameShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNameShould.cs
index 924e2d3..f701931 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNameShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileNameShould.cs
@@ -1,6 +1,5 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using AStar.Dev.Utilities;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
@@ -8,7 +7,7 @@ public class FileNameShould
 {
     [Fact]
     public void ContainTheExpectedProperties()
-        => new FileName ("mock-file-name")
+        => new FileName("mock-file-name")
            .ToJson()
            .ShouldMatchApproved();
 }
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeEqualityComparerShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeEqualityComparerShould.cs
index 1de9b2b..5653d37 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeEqualityComparerShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeEqualityComparerShould.cs
@@ -1,5 +1,4 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeShould.cs
index ae5d3d6..456faec 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/FileSizeShould.cs
@@ -1,6 +1,5 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using AStar.Dev.Utilities;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailShould.cs
index 041fba4..792fa02 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailShould.cs
@@ -1,6 +1,5 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using AStar.Dev.Utilities;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
@@ -8,7 +7,7 @@ public class ImageDetailShould
 {
     [Fact]
     public void ContainTheExpectedProperties()
-        => new ImageDetail (  123, 456)
+        => new ImageDetail(123, 456)
            .ToJson()
            .ShouldMatchApproved();
 }
diff --git a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailsShould.cs b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailsShould.cs
index e85af90..d5a2c3d 100644
--- a/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailsShould.cs
+++ b/test/AStar.Dev.Infrastructure.FilesDb.Tests.Unit/Models/ImageDetailsShould.cs
@@ -1,7 +1,5 @@
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using AStar.Dev.Utilities;
-using JetBrains.Annotations;
-using Shouldly;
 
 namespace AStar.Dev.Infrastructure.FilesDb.Tests.Unit.Models;
 
diff --git a/test/AStar.Dev.Infrastructure.Tests.Unit/AStar.Dev.Infrastructure.Tests.Unit.csproj b/test/AStar.Dev.Infrastructure.Tests.Unit/AStar.Dev.Infrastructure.Tests.Unit.csproj
index 7a7161e..0c9876e 100644
--- a/test/AStar.Dev.Infrastructure.Tests.Unit/AStar.Dev.Infrastructure.Tests.Unit.csproj
+++ b/test/AStar.Dev.Infrastructure.Tests.Unit/AStar.Dev.Infrastructure.Tests.Unit.csproj
@@ -12,12 +12,18 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="coverlet.collector" Version="6.0.2"/>
-        <PackageReference Include="JetBrains.Annotations" Version="2025.2.0"/>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0"/>
+        <PackageReference Include="coverlet.collector" Version="6.0.4">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
+        <PackageReference Include="JetBrains.Annotations" Version="2025.2.2"/>
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
         <PackageReference Include="Shouldly" Version="4.3.0"/>
-        <PackageReference Include="xunit" Version="2.9.2"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.8.2"/>
+        <PackageReference Include="xunit" Version="2.9.3"/>
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
+            <PrivateAssets>all</PrivateAssets>
+            <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
+        </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
diff --git a/test/AStar.Dev.Infrastructure.Tests.Unit/AuditableEntityShould.cs b/test/AStar.Dev.Infrastructure.Tests.Unit/AuditableEntityShould.cs
index 7ca46b5..d4e1854 100644
--- a/test/AStar.Dev.Infrastructure.Tests.Unit/AuditableEntityShould.cs
+++ b/test/AStar.Dev.Infrastructure.Tests.Unit/AuditableEntityShould.cs
@@ -7,7 +7,7 @@ public class AuditableEntityShould
 {
     [Fact]
     public void ContainTheExpectedProperties()
-        => new MockAuditableEntity { UpdatedBy = "Test User", UpdatedOn = new (2000, 1, 1, 0, 0, 0, TimeSpan.Zero) }
+        => new MockAuditableEntity { UpdatedBy = "Test User", UpdatedOn = new(2000, 1, 1, 0, 0, 0, TimeSpan.Zero) }
            .ToJson()
            .ShouldMatchApproved();
 
diff --git a/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/AStar.Dev.Technical.Debt.Reporting.Tests.Unit.csproj b/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/AStar.Dev.Technical.Debt.Reporting.Tests.Unit.csproj
index 981827c..c9109a6 100644
--- a/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/AStar.Dev.Technical.Debt.Reporting.Tests.Unit.csproj
+++ b/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/AStar.Dev.Technical.Debt.Reporting.Tests.Unit.csproj
@@ -19,9 +19,9 @@
         </PackageReference>
         <PackageReference Include="Shouldly" Version="4.3.0"/>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
-        <PackageReference Include="JetBrains.Annotations" Version="2025.2.0"/>
+        <PackageReference Include="JetBrains.Annotations" Version="2025.2.2"/>
         <PackageReference Include="xunit" Version="2.9.3"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/RefactorAttributeShould.cs b/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/RefactorAttributeShould.cs
index dfcc4b4..f5cad87 100644
--- a/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/RefactorAttributeShould.cs
+++ b/test/AStar.Dev.Technical.Debt.Reporting.Tests.Unit/RefactorAttributeShould.cs
@@ -15,10 +15,9 @@ public void ShouldContainOnlyExpectedPublicPropertiesWithCorrectValues()
 
         var expectedProperties = new[]
                                  {
-                                     new { Name = "PainEstimate", Type   = typeof(int), Value    = (object)expectedPainEstimate },
-                                     new { Name = "HoursToResolve", Type = typeof(int), Value    = (object)expectedHoursToResolve },
-                                     new { Name = "Description", Type    = typeof(string), Value = (object)expectedDescription },
-                                     new { Name = "TypeId", Type         = typeof(object), Value = attribute.TypeId }
+                                     new { Name = "PainEstimate", Type = typeof(int), Value = (object)expectedPainEstimate },
+                                     new { Name = "HoursToResolve", Type = typeof(int), Value = (object)expectedHoursToResolve },
+                                     new { Name = "Description", Type = typeof(string), Value = (object)expectedDescription }, new { Name = "TypeId", Type = typeof(object), Value = attribute.TypeId }
                                  };
 
         var actualProperties = typeof(RefactorAttribute)
@@ -26,7 +25,7 @@ public void ShouldContainOnlyExpectedPublicPropertiesWithCorrectValues()
 
         actualProperties.Length.ShouldBe(expectedProperties.Length);
 
-        foreach (var expected in expectedProperties)
+        foreach(var expected in expectedProperties)
         {
             var actual = actualProperties.SingleOrDefault(p => p.Name == expected.Name);
             actual.ShouldNotBeNull();
diff --git a/test/AStar.Dev.Utilities.Tests.Unit/AStar.Dev.Utilities.Tests.Unit.csproj b/test/AStar.Dev.Utilities.Tests.Unit/AStar.Dev.Utilities.Tests.Unit.csproj
index c89ed37..0aa3fd5 100644
--- a/test/AStar.Dev.Utilities.Tests.Unit/AStar.Dev.Utilities.Tests.Unit.csproj
+++ b/test/AStar.Dev.Utilities.Tests.Unit/AStar.Dev.Utilities.Tests.Unit.csproj
@@ -18,10 +18,10 @@
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
         <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1"/>
-        <PackageReference Include="JetBrains.Annotations" Version="2025.2.0"/>
+        <PackageReference Include="JetBrains.Annotations" Version="2025.2.2"/>
         <PackageReference Include="Shouldly" Version="4.3.0"/>
         <PackageReference Include="xunit" Version="2.9.3"/>
-        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.3">
+        <PackageReference Include="xunit.runner.visualstudio" Version="3.1.4">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
diff --git a/test/AStar.Dev.Utilities.Tests.Unit/StringExtensionsShould.cs b/test/AStar.Dev.Utilities.Tests.Unit/StringExtensionsShould.cs
index 2c80eb3..7a4a5cd 100644
--- a/test/AStar.Dev.Utilities.Tests.Unit/StringExtensionsShould.cs
+++ b/test/AStar.Dev.Utilities.Tests.Unit/StringExtensionsShould.cs
@@ -2,11 +2,11 @@
 
 public sealed class StringExtensionsShould
 {
-    private          const       string AnyJson          = "{\"AnyInt\":0,\"AnyString\":\"\"}";
-    private                const string NotNullString    = "value does not matter";
-    private  const               string WhitespaceString = " ";
+    private const string AnyJson          = "{\"AnyInt\":0,\"AnyString\":\"\"}";
+    private const string NotNullString    = "value does not matter";
+    private const string WhitespaceString = " ";
 #pragma warning disable CA1805
-    private readonly string? nullString       = null;
+    private readonly string? nullString = null;
 #pragma warning restore CA1805
 
     [Fact]
@@ -47,18 +47,18 @@ public void ContainTheIsImageExtensionReturningTheExpectedResults(string fileNam
         fileName.IsImage().ShouldBe(expectedResponse);
 
     [Theory]
-    [InlineData("no-Truncation",            20, "no-Truncation")]
-    [InlineData("Small-String-Truncation.txt",     10, "Small-Stri")]
-    [InlineData("Small-String-Truncation.DOC",     15, "Small-String-Tr")]
-    [InlineData("Small-String-Truncation.PdF",     20, "Small-String-Truncat")]
-    [InlineData("Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String--Truncation.jpG",   100,
+    [InlineData("no-Truncation", 20, "no-Truncation")]
+    [InlineData("Small-String-Truncation.txt", 10, "Small-Stri")]
+    [InlineData("Small-String-Truncation.DOC", 15, "Small-String-Tr")]
+    [InlineData("Small-String-Truncation.PdF", 20, "Small-String-Truncat")]
+    [InlineData("Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String--Truncation.jpG", 100,
                 "Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-Str")]
-    [InlineData("Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String--Truncation.jpeG",  120,
+    [InlineData("Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String--Truncation.jpeG", 120,
                 "Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Lar")]
-    [InlineData("Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String--Truncation.bmp",   140,
+    [InlineData("Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String--Truncation.bmp", 140,
                 "Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-Stri")]
-    [InlineData("Write-Truncation.png",     10, "Write-Trun")]
-    [InlineData("Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String--Truncation.gif",   160,
+    [InlineData("Write-Truncation.png", 10, "Write-Trun")]
+    [InlineData("Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String--Truncation.gif", 160,
                 "Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String-Large-String--Tru")]
     public void ContainTheTruncateIfRequiredReturningTheExpectedResults(string fileName, int truncateLength, string expectedResponse) =>
         fileName.TruncateIfRequired(truncateLength).ShouldBe(expectedResponse);

From 75fcb6dcc870bd75c6f3021c61ccefb47eb78b0a Mon Sep 17 00:00:00 2001
From: Jay Barden <137005981+jaybarden1@users.noreply.github.com>
Date: Tue, 9 Sep 2025 21:19:21 +0100
Subject: [PATCH 2/2] Update dotnet.yml

---
 .github/workflows/dotnet.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml
index d3fe03f..d4454d1 100644
--- a/.github/workflows/dotnet.yml
+++ b/.github/workflows/dotnet.yml
@@ -11,6 +11,8 @@ jobs:
   build:
     name: Build and analyze
     runs-on: windows-latest
+    permissions:
+      contents: read
     env:
       SONAR_PROJECT: 'astar-dev-utilities'
       ProjectName: 'AStar.Dev.Utilities'