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..82cead5710 100644 --- a/.github/skills/verify-test/SKILL.md +++ b/.github/skills/verify-test/SKILL.md @@ -18,8 +18,11 @@ You will receive: 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** @@ -29,6 +32,7 @@ You will receive: - 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. 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..71820f8aca 100644 --- a/Build/SilVersions.props +++ b/Build/SilVersions.props @@ -13,13 +13,13 @@ --> 11.0.0-beta0161 - 18.0.0-beta0008 - 18.0.0-beta0001 - 6.0.0-beta0063 + 18.0.0-beta0013 + 18.0.0-beta0012 + 6.0.0-beta0065 3.0.1 3.8.2 1.1.1-beta0001 - 10.0.0-beta0001 + 10.0.0-beta0004 70.1.152 60.0.56 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 @@ none all - + none all diff --git a/Directory.Packages.props b/Directory.Packages.props index a9841ecd2b..fd6974bad6 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -23,23 +23,28 @@ ============================================================= --> + - - + but ParatextData 9.5.x requires >= 9.0.9. Pin to 9.0.16. --> + + - - + + - + System.Security.AccessControl needs >= 6.0.0. Pin to 9.0.16. --> +