Finish plan + remove x64 parameters

Author: johnml1135

.github/workflows/CI.yml

@@ -27,7 +27,7 @@ jobs:
         id: managed_build
         shell: powershell
         run: |
-          .\build.ps1 -Configuration Debug -Platform x64 -BuildTests
+          .\build.ps1 -Configuration Debug -BuildTests
           if ($LASTEXITCODE -ne 0) { exit $LASTEXITCODE }
 
       - name: Run managed tests

.serena/project.yml

@@ -93,7 +93,7 @@ initial_prompt: |
   Key build facts:
   - Uses MSBuild Traversal SDK via FieldWorks.proj (21 ordered phases, 110+ projects)
   - Native C++ (Phase 2) must build before managed code (Phases 3+)
-  - Build command: .\build.ps1 or msbuild FieldWorks.proj /p:Configuration=Debug /p:Platform=x64 /m
+  - Build command: .\build.ps1 or msbuild FieldWorks.proj /p:Configuration=Debug /m
   - Check .github/instructions/*.instructions.md for coding guidelines (managed, native, testing, etc.)
   - Per-folder AGENTS.md files describe component contracts and dependencies
 # project_name: Intentionally left out so that the folder name will be used and worktrees will not conflict

.vscode/tasks.json

@@ -216,7 +216,7 @@
         "kind": "build",
         "isDefault": true
       },
-      "detail": "Build FieldWorks (auto-detects worktree)",
+      "detail": "Build FieldWorks (package-backed by default; use explicit local LCM tasks for source mode)",
       "options": {
         "shell": {
           "executable": "powershell.exe",
@@ -332,7 +332,7 @@
         "kind": "test",
         "isDefault": true
       },
-      "detail": "Run all tests (auto-detects worktree). See specs/007-test-modernization-vstest/IGNORED_TESTS.md for the tracked skip/ignore inventory.",
+      "detail": "Run all tests. See specs/007-test-modernization-vstest/IGNORED_TESTS.md for the tracked skip/ignore inventory.",
       "options": {
         "shell": {
           "executable": "powershell.exe",
@@ -567,9 +567,9 @@
       "problemMatcher": []
     },
     {
-      "label": "Installer Check: Bundle (Debug, x64)",
+      "label": "Installer Check: Bundle (Debug)",
       "type": "shell",
-      "command": "./scripts/Agent/Invoke-InstallerCheck.ps1 -InstallerType Bundle -Configuration Debug -Platform x64",
+      "command": "./scripts/Agent/Invoke-InstallerCheck.ps1 -InstallerType Bundle -Configuration Debug",
       "detail": "Run snapshot -> install bundle -> snapshot -> diff (writes evidence under Output/InstallerEvidence/<RunId>)",
       "options": {
         "shell": {

Build/Agent/Setup-InstallerBuild.ps1

@@ -326,15 +326,15 @@ if ($issues.Count -eq 0) {
         # VS Developer environment is active, show simple commands
         Write-Host ""
         Write-Host "  # Restore packages" -ForegroundColor Gray
-        Write-Host "  msbuild Build/InstallerBuild.proj /t:RestorePackages /p:Configuration=Debug /p:Platform=x64" -ForegroundColor Cyan
+        Write-Host "  msbuild Build/InstallerBuild.proj /t:RestorePackages /p:Configuration=Debug" -ForegroundColor Cyan
         Write-Host ""
         Write-Host "  # Build base installer" -ForegroundColor Gray
-        Write-Host "  msbuild Build/InstallerBuild.proj /t:BuildInstaller /p:Configuration=Debug /p:Platform=x64 /p:config=release /m /v:n" -ForegroundColor Cyan
+        Write-Host "  msbuild Build/InstallerBuild.proj /t:BuildInstaller /p:Configuration=Debug /p:config=release /m /v:n" -ForegroundColor Cyan
         Write-Host ""
 
         if ($SetupPatch) {
             Write-Host "  # Build patch installer" -ForegroundColor Gray
-            Write-Host "  msbuild Build/InstallerBuild.proj /t:BuildPatchInstaller /p:Configuration=Debug /p:Platform=x64 /p:config=release /m /v:n" -ForegroundColor Cyan
+            Write-Host "  msbuild Build/InstallerBuild.proj /t:BuildPatchInstaller /p:Configuration=Debug /p:config=release /m /v:n" -ForegroundColor Cyan
             Write-Host ""
         }
     } else {
@@ -344,15 +344,15 @@ if ($issues.Count -eq 0) {
         Write-Host "  # Option 2: Use these one-liner commands from any PowerShell:" -ForegroundColor Gray
         Write-Host ""
         Write-Host "  # Restore packages" -ForegroundColor Gray
-        Write-Host '  cmd /c "call ""C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat"" -arch=amd64 >nul && msbuild Build/InstallerBuild.proj /t:RestorePackages /p:Configuration=Debug /p:Platform=x64"' -ForegroundColor Cyan
+        Write-Host '  cmd /c "call ""C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat"" -arch=amd64 >nul && msbuild Build/InstallerBuild.proj /t:RestorePackages /p:Configuration=Debug"' -ForegroundColor Cyan
         Write-Host ""
         Write-Host "  # Build base installer" -ForegroundColor Gray
-        Write-Host '  cmd /c "call ""C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat"" -arch=amd64 >nul && msbuild Build/InstallerBuild.proj /t:BuildInstaller /p:Configuration=Debug /p:Platform=x64 /p:config=release /m /v:n"' -ForegroundColor Cyan
+        Write-Host '  cmd /c "call ""C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat"" -arch=amd64 >nul && msbuild Build/InstallerBuild.proj /t:BuildInstaller /p:Configuration=Debug /p:config=release /m /v:n"' -ForegroundColor Cyan
         Write-Host ""
 
         if ($SetupPatch) {
             Write-Host "  # Build patch installer" -ForegroundColor Gray
-            Write-Host '  cmd /c "call ""C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat"" -arch=amd64 >nul && msbuild Build/InstallerBuild.proj /t:BuildPatchInstaller /p:Configuration=Debug /p:Platform=x64 /p:config=release /m /v:n"' -ForegroundColor Cyan
+            Write-Host '  cmd /c "call ""C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\VsDevCmd.bat"" -arch=amd64 >nul && msbuild Build/InstallerBuild.proj /t:BuildPatchInstaller /p:Configuration=Debug /p:config=release /m /v:n"' -ForegroundColor Cyan
             Write-Host ""
         }
     }

Build/Agent/validate-test-exclusions.ps1

@@ -26,7 +26,7 @@ try {
     # Run MSBuild and check for CS0436
     $BuildLog = "$RepoRoot/Output/test-exclusions/build.log"
     Write-Host "Running MSBuild..."
-    $BuildArgs = @("FieldWorks.proj", "/m", "/p:Configuration=Debug", "/p:Platform=x64", "/v:minimal", "/nologo", "/fl", "/flp:LogFile=$BuildLog;Verbosity=Normal")
+    $BuildArgs = @("FieldWorks.proj", "/m", "/p:Configuration=Debug", "/v:minimal", "/nologo", "/fl", "/flp:LogFile=$BuildLog;Verbosity=Normal")
 
     & msbuild $BuildArgs
     if ($LASTEXITCODE -ne 0) {

Directory.Packages.props

@@ -1,6 +1,7 @@
 <Project>
 	<PropertyGroup>
 		<_IsNestedLcmProject Condition="$([System.String]::Copy('$(MSBuildProjectFullPath)').Contains('\\Localizations\\LCM\\'))">true</_IsNestedLcmProject>
+		<ManagePackageVersionsCentrally Condition="'$(_IsNestedLcmProject)'=='true'">false</ManagePackageVersionsCentrally>
 		<ManagePackageVersionsCentrally Condition="'$(_IsNestedLcmProject)'!='true'">true</ManagePackageVersionsCentrally>
 		<!--
 			Transitive Pinning: When a package is declared here but only consumed

Docs/64bit-regfree-migration.md

@@ -42,7 +42,7 @@ A) Move to64-bit only
 
 3) Solution + CI
 - Update `FieldWorks.sln` to remove Win32 platforms and keep `x64` (Debug/Release). If other solutions exist, do the same.
-- Update CI/build scripts to call: `msbuild FieldWorks.sln /m /p:Configuration=Debug /p:Platform=x64`.
+- Update CI/build scripts to call: `build.ps1` or `msbuild FieldWorks.sln /m /p:Configuration=Debug`.
 - Remove any32-bit specific paths or tools (e.g., SysWOW64 regsvr32) from build/targets.
 
 B) Registration‑free COM (no regsvr32)
@@ -133,7 +133,7 @@ Appendix: key references in repo
 - COM interop usage sites: `Src/Common/ViewsInterfaces/Views.cs`, `Src/Common/FwUtils/DebugProcs.cs`.
 
 Validation path (first pass)
-- Build all (x64): `msbuild FieldWorks.sln /m /p:Configuration=Debug /p:Platform=x64`.
+- Build all: `msbuild FieldWorks.sln /m /p:Configuration=Debug`.
 - Confirm `FieldWorks.exe.manifest` is generated and contains `<file name="Views.dll">` with `comClass` entries and interfaces. **✅ VERIFIED**
 - From a machine with no FieldWorks registrations, launch `FieldWorks.exe` → expect no class-not-registered exceptions. **✅ VERIFIED**
 
@@ -143,7 +143,7 @@ Validation path (first pass)
 - `Directory.Build.props` enforces `<PlatformTarget>x64</PlatformTarget>`
 - `FieldWorks.sln` Win32 configurations removed
 - Native VCXPROJs x86 configurations removed
-- CI enforces `/p:Platform=x64` by invoking `msbuild Build/FieldWorks.proj`
+- CI enforces the x64-only default by invoking `build.ps1`
 
 ### Phase 2: Manifest wiring (✅ COMPLETE)
 - `Build/RegFree.targets` generates manifests with COM class/typelib entries

Docs/installer-build-guide.md

@@ -58,22 +58,22 @@ git clone https://github.com/sillsdev/liblcm.git Localizations/LCM
 ### Full Build (Recommended)
 
 ```powershell
-# Open VS Developer Command Prompt (x64) or run:
+# Open VS Developer Command Prompt or run:
 # & "C:\Program Files\Microsoft Visual Studio\2022\Community\Common7\Tools\Launch-VsDevShell.ps1" -Arch amd64
 
 # Restore packages
-msbuild Build/InstallerBuild.proj /t:RestorePackages /p:Configuration=Debug /p:Platform=x64
+msbuild Build/InstallerBuild.proj /t:RestorePackages /p:Configuration=Debug
 
-# Build base installer (x64 only)
-msbuild Build/InstallerBuild.proj /t:BuildInstaller /p:Configuration=Release /p:Platform=x64 /p:config=release /m /v:n
+# Build base installer
+msbuild Build/InstallerBuild.proj /t:BuildInstaller /p:Configuration=Release /p:config=release /m /v:n
 ```
 
 ### Output Location
 
 After successful build, artifacts are produced in one of these locations (bundle outputs are culture-specific under `en-US/`):
 
-- WiX 3 default: `FLExInstaller/bin/<platform>/<configuration>/`
-- WiX 6 opt-in: `FLExInstaller/wix6/bin/<platform>/<configuration>/`
+- WiX 3 default: `FLExInstaller/bin/x64/<configuration>/`
+- WiX 6 opt-in: `FLExInstaller/wix6/bin/x64/<configuration>/`
 
 ## Building a Patch Installer
 
@@ -89,10 +89,10 @@ These can be downloaded from GitHub Releases (e.g., `build-1188`).
 
 ```powershell
 # Restore packages
-msbuild Build/InstallerBuild.proj /t:RestorePackages /p:Configuration=Debug /p:Platform=x64
+msbuild Build/InstallerBuild.proj /t:RestorePackages /p:Configuration=Debug
 
-# Build patch installer (x64 only)
-msbuild Build/InstallerBuild.proj /t:BuildPatchInstaller /p:Configuration=Release /p:Platform=x64 /p:config=release /m /v:n
+# Build patch installer
+msbuild Build/InstallerBuild.proj /t:BuildPatchInstaller /p:Configuration=Release /p:config=release /m /v:n
 ```
 
 ### Output Location
@@ -157,7 +157,7 @@ Workflows should use **WiX Toolset v6** via `WixToolset.Sdk` restored from NuGet
 **Cause**: NuGet restore/build tools not fully restored, or missing VS build prerequisites.
 
 **Fix**:
-1. Ensure `msbuild Build/InstallerBuild.proj /t:RestorePackages /p:Configuration=Debug /p:Platform=x64` succeeds.
+1. Ensure `msbuild Build/InstallerBuild.proj /t:RestorePackages /p:Configuration=Debug` succeeds.
 2. Re-run `\Build\Agent\Setup-InstallerBuild.ps1 -ValidateOnly` and resolve any reported issues.
 2. Add WiX bin directory to PATH: `C:\Program Files (x86)\WiX Toolset v3.14\bin`
 

Docs/traversal-sdk-migration.md

@@ -86,10 +86,10 @@ Installer builds use traversal internally but are invoked via MSBuild targets:
 
 ```powershell
 # Base installer (calls traversal build via Installer.targets)
-msbuild Build/InstallerBuild.proj /t:BuildBaseInstaller /p:Configuration=Debug /p:Platform=x64 /p:config=release
+msbuild Build/InstallerBuild.proj /t:BuildBaseInstaller /p:Configuration=Debug /p:config=release
 
 # Patch installer (calls traversal build via Installer.targets)
-msbuild Build/InstallerBuild.proj /t:BuildPatchInstaller /p:Configuration=Debug /p:Platform=x64 /p:config=release
+msbuild Build/InstallerBuild.proj /t:BuildPatchInstaller /p:Configuration=Debug /p:config=release
 ```
 
 Note: The installer targets in `Build/Installer.targets` have been modernized to call `FieldWorks.proj` instead of the old `remakefw` target.
@@ -112,7 +112,7 @@ msbuild Src/xWorks/xWorks.csproj /p:Configuration=Debug
 
 **Solution**: Build native components first:
 ```powershell
-msbuild Build\Src\NativeBuild\NativeBuild.csproj /p:Configuration=Debug /p:Platform=x64
+msbuild Build\Src\NativeBuild\NativeBuild.csproj /p:Configuration=Debug
 .\build.ps1
 ```
 

FieldWorks.LocalLcm.sln

@@ -252,6 +252,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.LCModel", "Localization
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.LCModel.Core", "Localizations\LCM\src\SIL.LCModel.Core\SIL.LCModel.Core.csproj", "{4C7D6B65-A331-4ED7-9B53-3301E714F8E7}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.LCModel.FixData", "Localizations\LCM\src\SIL.LCModel.FixData\SIL.LCModel.FixData.csproj", "{4983B3EB-F54A-4DED-B89C-1A4D6A12C96D}"
+EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SIL.LCModel.Utils", "Localizations\LCM\src\SIL.LCModel.Utils\SIL.LCModel.Utils.csproj", "{4E4CE84F-BB35-416A-8E4F-B8C096DA32B7}"
 EndProject
 Global
@@ -993,6 +995,12 @@ Global
 		{4C7D6B65-A331-4ED7-9B53-3301E714F8E7}.Debug|x64.Build.0 = Debug|Any CPU
 		{4C7D6B65-A331-4ED7-9B53-3301E714F8E7}.Release|x64.ActiveCfg = Release|Any CPU
 		{4C7D6B65-A331-4ED7-9B53-3301E714F8E7}.Release|x64.Build.0 = Release|Any CPU
+		{4983B3EB-F54A-4DED-B89C-1A4D6A12C96D}.Bounds|x64.ActiveCfg = Release|Any CPU
+		{4983B3EB-F54A-4DED-B89C-1A4D6A12C96D}.Bounds|x64.Build.0 = Release|Any CPU
+		{4983B3EB-F54A-4DED-B89C-1A4D6A12C96D}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{4983B3EB-F54A-4DED-B89C-1A4D6A12C96D}.Debug|x64.Build.0 = Debug|Any CPU
+		{4983B3EB-F54A-4DED-B89C-1A4D6A12C96D}.Release|x64.ActiveCfg = Release|Any CPU
+		{4983B3EB-F54A-4DED-B89C-1A4D6A12C96D}.Release|x64.Build.0 = Release|Any CPU
 		{4E4CE84F-BB35-416A-8E4F-B8C096DA32B7}.Bounds|x64.ActiveCfg = Release|Any CPU
 		{4E4CE84F-BB35-416A-8E4F-B8C096DA32B7}.Bounds|x64.Build.0 = Release|Any CPU
 		{4E4CE84F-BB35-416A-8E4F-B8C096DA32B7}.Debug|x64.ActiveCfg = Debug|Any CPU