Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/instructions/build.instructions.md
Original file line number Diff line number Diff line change
Expand Up @@ -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`
Expand Down
6 changes: 4 additions & 2 deletions .github/skills/verify-test/SKILL.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,17 +18,19 @@ 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.
Comment on lines 19 to +25
3. **Capture results**
- Record pass/fail outcomes and any artifacts.
4. **Report**
- Summarize verification coverage and gaps.
</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>
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/base-installer-cd.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }}
Expand Down
8 changes: 4 additions & 4 deletions Build/SilVersions.props
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<Project>
<!--
<!--
=============================================================
SIL ECOSYSTEM VERSION PROPERTIES
Single source of truth for all SIL dependency versions.
Comment on lines 1 to 5
Expand All @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion Build/Src/NativeBuild/NativeBuild.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
14 changes: 7 additions & 7 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It also says keep 9.0.14 while also bumping to version 9.0.16

<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>

<!--
Expand Down
Loading