From 5543cf1c070e363c243a40f391537a16b94727d7 Mon Sep 17 00:00:00 2001
From: John Lambert <john_lambert@sil.org>
Date: Mon, 18 May 2026 13:43:00 -0400
Subject: [PATCH 1/4] Bump versions of underlying tools

---
 .github/workflows/base-installer-cd.yml  |  2 +-
 Build/SilVersions.props                  |  8 ++++----
 Build/Src/NativeBuild/NativeBuild.csproj |  2 +-
 Directory.Packages.props                 | 14 +++++++-------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/base-installer-cd.yml b/.github/workflows/base-installer-cd.yml
index dc85a8d83a..cd5ce62db4 100644
--- a/.github/workflows/base-installer-cd.yml
+++ b/.github/workflows/base-installer-cd.yml
@@ -292,7 +292,7 @@ jobs:
 
       - name: Tag, Create Release, and Upload artifacts
         if: ${{ inputs.make_release == 'true' }}
-        uses: softprops/action-gh-release@153bb8e04406b158c6c84fc1615b65b24149a1fe
+        uses: softprops/action-gh-release@b4309332981a82ec1c5618f44dd2e27cc8bfbfda
         with:
             target_commitish: ${{ github.event.inputs.fw_ref || github.ref }}
             tag_name: build-${{ env.FW_BUILD_NUMBER }}
diff --git a/Build/SilVersions.props b/Build/SilVersions.props
index b62e3b89cc..b016042325 100644
--- a/Build/SilVersions.props
+++ b/Build/SilVersions.props
@@ -1,5 +1,5 @@
 <Project>
-  <!--
+	<!--
 		=============================================================
 		SIL ECOSYSTEM VERSION PROPERTIES
 		Single source of truth for all SIL dependency versions.
@@ -13,13 +13,13 @@
 	-->
 	<PropertyGroup Label="SIL Ecosystem Versions">
 		<SilLcmVersion>11.0.0-beta0161</SilLcmVersion>
-		<SilLibPalasoVersion>18.0.0-beta0008</SilLibPalasoVersion>
-		<SilLibPalasoL10nsVersion>18.0.0-beta0001</SilLibPalasoL10nsVersion>
+		<SilLibPalasoVersion>18.0.0-beta0013</SilLibPalasoVersion>
+		<SilLibPalasoL10nsVersion>18.0.0-beta0012</SilLibPalasoL10nsVersion>
 		<SilChorusVersion>6.0.0-beta0063</SilChorusVersion>
 		<SilChorusL10nsVersion>3.0.1</SilChorusL10nsVersion>
 		<SilMachineVersion>3.8.2</SilMachineVersion>
 		<SilIPCFrameworkVersion>1.1.1-beta0001</SilIPCFrameworkVersion>
-		<L10NSharpVersion>10.0.0-beta0001</L10NSharpVersion>
+		<L10NSharpVersion>10.0.0-beta0004</L10NSharpVersion>
 		<IcuNugetVersion>70.1.152</IcuNugetVersion>
 		<GeckoNugetVersion>60.0.56</GeckoNugetVersion>
 	</PropertyGroup>
diff --git a/Build/Src/NativeBuild/NativeBuild.csproj b/Build/Src/NativeBuild/NativeBuild.csproj
index ce1c73eded..533911044e 100644
--- a/Build/Src/NativeBuild/NativeBuild.csproj
+++ b/Build/Src/NativeBuild/NativeBuild.csproj
@@ -59,7 +59,7 @@
       <IncludeAssets>none</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="SIL.LibPalaso.L10ns" Version="$(SilLibPalasoVersion)">
+    <PackageReference Include="SIL.LibPalaso.L10ns" Version="$(SilLibPalasoL10nsVersion)">
       <IncludeAssets>none</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
diff --git a/Directory.Packages.props b/Directory.Packages.props
index a9841ecd2b..ddc8f448b8 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -24,22 +24,22 @@
 	-->
 	<ItemGroup Label="Transitive Pins">
 		<!-- System.Drawing.Common: SIL.LCModel.Core pulls 6.0.0 transitively,
-			 but ParatextData 9.5.x requires >= 9.0.9. Pin to 9.0.14. -->
-		<PackageVersion Include="System.Drawing.Common" Version="9.0.14" />
-		<PackageVersion Include="System.Reflection.Metadata" Version="10.0.7" />
+			 but ParatextData 9.5.x requires >= 9.0.9. Pin to 9.0.16. -->
+		<PackageVersion Include="System.Drawing.Common" Version="9.0.16" />
+		<PackageVersion Include="System.Reflection.Metadata" Version="10.0.8" />
 		<!-- System.Resources.Extensions: required for non-string resources (images, icons)
 			 in .NET Framework SDK-style projects. -->
-		<PackageVersion Include="System.Resources.Extensions" Version="9.0.13" />
+		<PackageVersion Include="System.Resources.Extensions" Version="9.0.16" />
 		<!-- DependencyModel: icu.net wants 2.0.4, ParatextData wants >= 9.0.9.
-			 Pin to 9.0.14 which is backward compatible with 2.0.4 API surface. -->
+			 Keep 9.0.14 until icu.net can load newer assembly identities. -->
 		<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.14" />
 		<!-- System.Memory: ParatextData requires 4.6.3; other packages want 4.5.0–4.6.0. -->
 		<PackageVersion Include="System.Memory" Version="4.6.3" />
 		<!-- Microsoft.Bcl.HashCode: System.Resources.Extensions requires HashCode. -->
 		<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
 		<!-- System.Security.Permissions (LT-22394): ProDotNetZip needs >= 8.0.0,
-			 System.Security.AccessControl needs >= 6.0.0. Pin to 9.0.14. -->
-		<PackageVersion Include="System.Security.Permissions" Version="9.0.14" />
+			 System.Security.AccessControl needs >= 6.0.0. Pin to 9.0.16. -->
+		<PackageVersion Include="System.Security.Permissions" Version="9.0.16" />
 	</ItemGroup>
 
 	<!--

From ae4dd492247981417eef33777a3bb4ed4fd389aa Mon Sep 17 00:00:00 2001
From: John Lambert <john_lambert@sil.org>
Date: Mon, 18 May 2026 13:43:00 -0400
Subject: [PATCH 2/4] Clarify clean validation for stale artifacts

---
 .github/instructions/build.instructions.md | 2 +-
 .github/skills/verify-test/SKILL.md        | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/.github/instructions/build.instructions.md b/.github/instructions/build.instructions.md
index 9e5f6b559a..f49165ac83 100644
--- a/.github/instructions/build.instructions.md
+++ b/.github/instructions/build.instructions.md
@@ -71,7 +71,7 @@ Re-run the scripted build:
 If the failure persists, check the first error (later ones often cascade) and confirm native Phase 2 succeeds.
 
 ### Stale intermediates
-Prefer re-running `.\build.ps1` first (it performs cleanup needed for this repo). If you must do a hard reset, delete `Output/` and `Obj/`, then run `.\build.ps1` again.
+Prefer `.\build.ps1 -Clean` when switching branches or worktrees, after package or version bumps, when stale `Obj/` or `Output/` artifacts are plausible, or when you need a completely clean validation run. If you must do a harder reset beyond that, delete `Output/` and `Obj/`, then run `.\build.ps1` again.
 
 ## References
 - Traversal order: `FieldWorks.proj`
diff --git a/.github/skills/verify-test/SKILL.md b/.github/skills/verify-test/SKILL.md
index 60ddfcaff2..f8ed79559e 100644
--- a/.github/skills/verify-test/SKILL.md
+++ b/.github/skills/verify-test/SKILL.md
@@ -18,8 +18,11 @@ You will receive:
 <workflow>
 1. **Select verification steps**
    - Choose the minimal tests or checks that validate acceptance signals.
+    - If stale intermediates or copied outputs could invalidate the result, include a clean validation pass.
 2. **Run verification**
    - Execute builds/tests or manual checks as appropriate.
+    - For FieldWorks, run `./build.ps1 -Clean` before validation when switching branches or worktrees, upgrading package versions, suspecting stale `Obj/` or `Output/` artifacts, or any time you need a fully clean validation baseline.
+    - After the clean step, rerun the normal scripted verification commands such as `./build.ps1`, `./test.ps1`, or the narrow scripted slice you are validating.
 3. **Capture results**
    - Record pass/fail outcomes and any artifacts.
 4. **Report**
@@ -27,8 +30,7 @@ You will receive:
 </workflow>
 
 <constraints>
-- Prefer repo-standard build/test entry points.
-- Document any skipped verification and why.
+- In FieldWorks, do not rely on incremental validation alone when stale native or managed artifacts are plausible.
 </constraints>
 
 <notes>

From 89f6ddb339d096c999524ec94df33ddd8968ce54 Mon Sep 17 00:00:00 2001
From: John Lambert <john_lambert@sil.org>
Date: Mon, 18 May 2026 14:08:04 -0400
Subject: [PATCH 3/4] Address PR review follow-ups

---
 .github/skills/verify-test/SKILL.md | 8 +++++---
 Build/SilVersions.props             | 2 +-
 Directory.Packages.props            | 9 +++++++--
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/skills/verify-test/SKILL.md b/.github/skills/verify-test/SKILL.md
index f8ed79559e..82cead5710 100644
--- a/.github/skills/verify-test/SKILL.md
+++ b/.github/skills/verify-test/SKILL.md
@@ -18,11 +18,11 @@ You will receive:
 <workflow>
 1. **Select verification steps**
    - Choose the minimal tests or checks that validate acceptance signals.
-    - If stale intermediates or copied outputs could invalidate the result, include a clean validation pass.
+   - If stale intermediates or copied outputs could invalidate the result, include a clean validation pass.
 2. **Run verification**
    - Execute builds/tests or manual checks as appropriate.
-    - For FieldWorks, run `./build.ps1 -Clean` before validation when switching branches or worktrees, upgrading package versions, suspecting stale `Obj/` or `Output/` artifacts, or any time you need a fully clean validation baseline.
-    - After the clean step, rerun the normal scripted verification commands such as `./build.ps1`, `./test.ps1`, or the narrow scripted slice you are validating.
+   - For FieldWorks, run `./build.ps1 -Clean` before validation when switching branches or worktrees, upgrading package versions, suspecting stale `Obj/` or `Output/` artifacts, or any time you need a fully clean validation baseline.
+   - After the clean step, rerun the normal scripted verification commands such as `./build.ps1`, `./test.ps1`, or the narrow scripted slice you are validating.
 3. **Capture results**
    - Record pass/fail outcomes and any artifacts.
 4. **Report**
@@ -30,6 +30,8 @@ You will receive:
 </workflow>
 
 <constraints>
+- Prefer repo-standard build/test entry points.
+- Document any skipped verification and why.
 - In FieldWorks, do not rely on incremental validation alone when stale native or managed artifacts are plausible.
 </constraints>
 
diff --git a/Build/SilVersions.props b/Build/SilVersions.props
index b016042325..f48383f6ca 100644
--- a/Build/SilVersions.props
+++ b/Build/SilVersions.props
@@ -1,5 +1,5 @@
 <Project>
-	<!--
+  <!--
 		=============================================================
 		SIL ECOSYSTEM VERSION PROPERTIES
 		Single source of truth for all SIL dependency versions.
diff --git a/Directory.Packages.props b/Directory.Packages.props
index ddc8f448b8..fd6974bad6 100644
--- a/Directory.Packages.props
+++ b/Directory.Packages.props
@@ -23,6 +23,10 @@
 		=============================================================
 	-->
 	<ItemGroup Label="Transitive Pins">
+		<!-- Current-line refresh in this block: System.Drawing.Common,
+			 System.Resources.Extensions, and System.Security.Permissions move to 9.0.16.
+			 Microsoft.Extensions.DependencyModel intentionally stays at 9.0.14 because
+			 9.0.16 breaks ICU initialization in the .NET Framework test host. -->
 		<!-- System.Drawing.Common: SIL.LCModel.Core pulls 6.0.0 transitively,
 			 but ParatextData 9.5.x requires >= 9.0.9. Pin to 9.0.16. -->
 		<PackageVersion Include="System.Drawing.Common" Version="9.0.16" />
@@ -30,8 +34,9 @@
 		<!-- System.Resources.Extensions: required for non-string resources (images, icons)
 			 in .NET Framework SDK-style projects. -->
 		<PackageVersion Include="System.Resources.Extensions" Version="9.0.16" />
-		<!-- DependencyModel: icu.net wants 2.0.4, ParatextData wants >= 9.0.9.
-			 Keep 9.0.14 until icu.net can load newer assembly identities. -->
+		<!-- DependencyModel: other current-line pins in this block move to 9.0.16,
+			 but this package stays at 9.0.14. icu.net wants 2.0.4, ParatextData wants
+			 >= 9.0.9, and 9.0.16 breaks ICU initialization in the .NET Framework test host. -->
 		<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.14" />
 		<!-- System.Memory: ParatextData requires 4.6.3; other packages want 4.5.0–4.6.0. -->
 		<PackageVersion Include="System.Memory" Version="4.6.3" />

From 924dd0768ffc30e497313f682609bdc48e70e03b Mon Sep 17 00:00:00 2001
From: Jason Naylor <jason_naylor@sil.org>
Date: Mon, 18 May 2026 14:44:42 -0700
Subject: [PATCH 4/4] Update Chorus to a version that matches L10NSharp

---
 Build/SilVersions.props | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Build/SilVersions.props b/Build/SilVersions.props
index f48383f6ca..71820f8aca 100644
--- a/Build/SilVersions.props
+++ b/Build/SilVersions.props
@@ -15,7 +15,7 @@
 		<SilLcmVersion>11.0.0-beta0161</SilLcmVersion>
 		<SilLibPalasoVersion>18.0.0-beta0013</SilLibPalasoVersion>
 		<SilLibPalasoL10nsVersion>18.0.0-beta0012</SilLibPalasoL10nsVersion>
-		<SilChorusVersion>6.0.0-beta0063</SilChorusVersion>
+		<SilChorusVersion>6.0.0-beta0065</SilChorusVersion>
 		<SilChorusL10nsVersion>3.0.1</SilChorusL10nsVersion>
 		<SilMachineVersion>3.8.2</SilMachineVersion>
 		<SilIPCFrameworkVersion>1.1.1-beta0001</SilIPCFrameworkVersion>