diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 45f13f356..214161e47 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -279,6 +279,18 @@ jobs:
       - run: dotnet build MigrationTools.sln /p:Version=${{ env.GitVersion_SemVer }} /p:FileVersion=${{ env.GitVersion_AssemblySemVer }} /p:InformationalVersion=${{ env.GitVersion_InformationalVersion }} /p:GitVersionTag=${{ env.GitVersion_PreReleaseLabel }}
         name: Build MigrationTools.sln
         id: Build
+      - name: "Check that required files exist!"
+        shell: pwsh
+        run: |
+            $foundFiles = Get-ChildItem -Path .\ -Recurse -Filter '*WITDataStore64*' | ForEach-Object { $_.FullName }
+            if ($foundFiles -eq $null) {
+                Write-Output "No WITDataStore64 found"
+                exit 1
+            } else {
+              Write-Output "Found WITDataStore64"
+            }
+            $foundFiles
+      - run: dotnet tool install --global dotnet-sonarscanner
       - run: dotnet test "MigrationTools.sln" --results-directory ".\test-results\" --logger trx --collect "Code coverage" --no-build --filter "(TestCategory=L0|TestCategory=L1)"
       - run: dotnet test "MigrationTools.sln" --results-directory ".\test-results\" --logger trx --collect "Code coverage" --no-build --filter "(TestCategory=L2|TestCategory=L3)"
       - run: dotnet test "MigrationTools.sln" --results-directory ".\test-results\" --logger trx --collect "Code coverage" --no-build --filter "(TestCategory!=L0&TestCategory!=L1&TestCategory!=L2&TestCategory!=L3)"
diff --git a/build/packageExecutable.ps1 b/build/packageExecutable.ps1
index 01f2d4e8c..bad48adaa 100644
--- a/build/packageExecutable.ps1
+++ b/build/packageExecutable.ps1
@@ -75,12 +75,32 @@ New-Item -Path $outfolder -Name "/MigrationTools/" -ItemType Directory
 New-Item -Path $outfolder -Name "/MigrationTools/preview/" -ItemType Directory
 New-Item  -Path $outfolder -Name "/MigrationTools/ConfigSamples/" -ItemType Directory
 Write-Output "----------------------------------------"
+Write-Output "Validating Contents of  ./src/MigrationTools.ConsoleFull/bin/Debug/net472/*"
+$foundFiles = Get-ChildItem -Path "./src/MigrationTools.ConsoleFull/bin/Debug/net472/" -Recurse -Filter '*WITDataStore*' | ForEach-Object { $_.FullName }
+if ($foundFiles -eq $null) {
+    Write-Output "No WITDataStore found"
+    exit 1
+} else {
+    Write-Output "Found WITDataStore"
+}
+$foundFiles
+Write-Output "----------------------------------------"
 # Copy Files
 Write-Output "Copy files to $outfolder/MigrationTools/"
 Copy-Item  -Path "./src/MigrationTools.ConsoleFull/bin/Debug/net472/*" -Destination "$outfolder/MigrationTools/" -Recurse
 Copy-Item  -Path "./src/MigrationTools.ConsoleCore/bin/Debug/net8.0/*" -Destination "$outfolder/MigrationTools/preview/" -Recurse
 Copy-Item  -Path "./src/MigrationTools.Samples/*" -Destination "$outfolder/MigrationTools/ConfigSamples/" -Recurse 
 Write-Output "----------------------------------------"
+Write-Output "Validating Contents of  $outfolder/MigrationTools/"
+$foundFiles = Get-ChildItem -Path "$outfolder/MigrationTools/" -Recurse -Filter '*WITDataStore*' | ForEach-Object { $_.FullName }
+if ($foundFiles -eq $null) {
+    Write-Output "No WITDataStore found"
+    exit 1
+} else {
+    Write-Output "Found WITDataStore"
+}
+$foundFiles
+Write-Output "----------------------------------------"
 # Create Zip
 7z a -tzip  $OutputFullName $outfolder/MigrationTools/**
 Write-Output "----------------------------------------"
diff --git a/docs/Reference/Generated/MigrationTools.xml b/docs/Reference/Generated/MigrationTools.xml
index 83c65dea0..30eecbc1c 100644
--- a/docs/Reference/Generated/MigrationTools.xml
+++ b/docs/Reference/Generated/MigrationTools.xml
@@ -248,7 +248,7 @@
         </member>
         <member name="F:ThisAssembly.Git.IsDirtyString">
             <summary>
-            => @"false"
+            => @"true"
             </summary>
         </member>
         <member name="F:ThisAssembly.Git.RepositoryUrl">
@@ -258,32 +258,32 @@
         </member>
         <member name="F:ThisAssembly.Git.Branch">
             <summary>
-            => @"main"
+            => @"fix/WITDataStore64-missing"
             </summary>
         </member>
         <member name="F:ThisAssembly.Git.Commit">
             <summary>
-            => @"cc0b804b"
+            => @"bafb2485"
             </summary>
         </member>
         <member name="F:ThisAssembly.Git.Sha">
             <summary>
-            => @"cc0b804bb54d2838d186f8c26bc00063459809ba"
+            => @"bafb2485ee0926f0443ede89e1e0204fc50f8aae"
             </summary>
         </member>
         <member name="F:ThisAssembly.Git.CommitDate">
             <summary>
-            => @"2024-09-03T17:25:32+01:00"
+            => @"2024-09-04T08:45:13+01:00"
             </summary>
         </member>
         <member name="F:ThisAssembly.Git.Commits">
             <summary>
-            => @"0"
+            => @"2"
             </summary>
         </member>
         <member name="F:ThisAssembly.Git.Tag">
             <summary>
-            => @"v16.0.0-Preview.7"
+            => @"v16.0.0-Preview.7-2-gbafb2485"
             </summary>
         </member>
         <member name="F:ThisAssembly.Git.BaseTag">
@@ -318,7 +318,7 @@
         </member>
         <member name="F:ThisAssembly.Git.SemVer.Patch">
             <summary>
-            => @"0"
+            => @"2"
             </summary>
         </member>
         <member name="F:ThisAssembly.Git.SemVer.Label">
diff --git a/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj b/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj
index 491f6744c..7a638402e 100644
--- a/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj
+++ b/src/MigrationTools.ConsoleFull/MigrationTools.ConsoleFull.csproj
@@ -49,6 +49,7 @@
 
   <ItemGroup>
     <PackageReference Include="Azure.Monitor.OpenTelemetry.Exporter" Version="1.3.0" />
+    <PackageReference Include="Microsoft.TeamFoundationServer.ExtendedClient" Version="19.225.1" />
     <PackageReference Include="OpenTelemetry.Exporter.Console" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Extensions.Hosting" Version="1.9.0" />
     <PackageReference Include="OpenTelemetry.Instrumentation.Runtime" Version="1.9.0" />