Skip to content

Update SIL.*Tasks to 4.0.0 and fix restore against libpalaso 18.0.0 #404

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
imnasnainaec merged 2 commits into from
Oct 26, 2026
Merged

Update SIL.*Tasks to 4.0.0 and fix restore against libpalaso 18.0.0 #404

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a20ca49
Update SIL.*Tasks to 4.0.0 and fix restore against libpalaso 18.0.0
imnasnainaec Oct 21, 2026
5ef1ec2
Install SIL.BuildTasks 4.0.0 for the Chorus Hub installer
imnasnainaec Oct 21, 2026
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
15 changes: 11 additions & 4 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,15 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [SIL.Chorus.LibChorus] Add ChorusStorage (the bundle cache) as an Excluded folder
- [SIL.Chorus.LibChorus] Changed HgResumeTransport LastKnownCommonBases to use Json serialization instead of BinaryFormatter
- Update SIL.Chorus.Mercurial dependency to version 7.0.1.93 which uses Python 3 and should be faster
- Update SIL.BuildTasks build-time dependency from version 3.0.0 to 3.3.0
- Update libPalaso dependency from version 15.0.0-* to 18.0.0-*
- Update SIL.BuildTasks build-time dependency from version 3.0.0 to 4.0.0
- Update SIL.ReleaseTasks build-time dependency from version 3.0.0 to 4.0.0
- Update libPalaso dependency from version 15.0.0-* to 18.0.0
- Update Newtonsoft.Json dependency from version 13.0.2 to 13.0.4
- Update Microsoft.NET.Test.Sdk dependency from version 17.3.1 to 17.14.1
- Update icu.net dependency from version 3.0.0-* to 3.0.1
- Update L10NSharp dependency from version 8.0.0-beta0005 to 10.0.0-*
- Update System.Resources.Extensions dependency from version 6.0.0 to 10.0.13
- Update NUnit test dependency from version 3.13.3 to 3.14.0
- Update icu.net dependency from version 3.0.0-* to 4.0.0
- Update L10NSharp dependency from version 8.0.0-beta0005 to 11.0.1
- [SIL.Chorus] Remove `emailForSubmissions` argument from `LocalizationManagerWinforms.Create` call (removed in L10NSharp 10)
- [SIL.Chorus.LibChorus] Read each revision's full hash from the existing `hg log` output instead of
launching one `hg` process per revision to widen the short hash
Expand All @@ -47,6 +50,10 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [SIL.Chorus.LibChorus] Return from each `hg` call as soon as its output ends, rather than on the next
100 ms poll, saving 30-80 ms per call

### Security

- [SIL.Chorus.LibChorus] Update System.ServiceModel.Primitives (netstandard2.0) from version 4.8.1 to 10.1.0, dropping the vulnerable System.Security.Cryptography.Xml 4.7.0 (GHSA-vh55-786g-wjwj) from the dependency graph
- Update NuGet.CommandLine (l10n packaging build tool) from version 6.7.0 to 6.14.3 (GHSA-68w7-72jg-6qpp)

### Removed

Expand Down
7 changes: 3 additions & 4 deletions l10n/l10n.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
<Project Sdk="Microsoft.NET.Sdk">
<Import Project="$(PkgGitVersion_GitVersion_MsBuild)\build\GitVersion.MsBuild.targets" Condition="Exists('$(PkgGitVersion_GitVersion_MsBuild)\build\GitVersion.MsBuild.targets')" />
<PropertyGroup>
<TargetFrameworks/>
<TargetFramework>netframework4.8</TargetFramework>
<PackageId>SIL.Chorus.l10ns</PackageId>
<Version>$(GitVersion_NuGetVersion)</Version>
<Authors>Jason Naylor</Authors>
<Company>SIL International</Company>
<RestartBuild Condition="'$(PkgGitVersion_GitVersion_MsBuild)' == ''
<RestartBuild Condition="'$(PkgGitVersion_MsBuild)' == ''
OR '$(PkgL10NSharp_ExtractXliff)' == ''
OR '$(PkgMSBuild_Extension_Pack)' == ''
OR '$(PkgNuGet_CommandLine)' == ''
Expand All @@ -21,8 +20,8 @@
</PackageReference>
<PackageReference Include="L10NSharp.ExtractXliff" Version="7.0.0-beta0011" GeneratePathProperty="true" />
<PackageReference Include="MSBuild.Extension.Pack" Version="1.9.1" GeneratePathProperty="true" />
<PackageReference Include="NuGet.CommandLine" Version="6.7.0" GeneratePathProperty="true" />
<PackageReference Include="SIL.BuildTasks" Version="2.6.0-beta0030" GeneratePathProperty="true" />
<PackageReference Include="NuGet.CommandLine" Version="6.14.3" GeneratePathProperty="true" />
<PackageReference Include="SIL.BuildTasks" Version="4.0.0" GeneratePathProperty="true" />
</ItemGroup>

<UsingTask TaskName="NormalizeLocales" AssemblyFile="$(PkgSIL_BuildTasks)\tools\SIL.BuildTasks.dll" />
Expand Down
2 changes: 1 addition & 1 deletion src/Chorus.Tests/Chorus.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.2" />
</ItemGroup>

Expand Down
5 changes: 3 additions & 2 deletions src/Chorus/Chorus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.Windows.Forms" Version="18.0.0-*" />
<PackageReference Include="SIL.ReleaseTasks" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.Windows.Forms" Version="18.0.0" />
<PackageReference Include="Vulcan.Uczniowie.HelpProvider" Version="1.0.16" />
</ItemGroup>

Expand All @@ -22,6 +22,7 @@

<ItemGroup>
<Reference Include="System.ComponentModel.Composition" />
<Reference Include="System.ServiceModel" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ChorusHub/ChorusHub.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.BuildTasks" Version="3.3.0" PrivateAssets="All" GeneratePathProperty="true" />
<PackageReference Include="SIL.ReleaseTasks" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.BuildTasks" Version="4.0.0" PrivateAssets="All" GeneratePathProperty="true" />
</ItemGroup>

<ItemGroup>
Expand Down
4 changes: 2 additions & 2 deletions src/ChorusHubApp/ChorusHubApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.Windows.Forms" Version="18.0.0-*" />
<PackageReference Include="SIL.ReleaseTasks" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.Windows.Forms" Version="18.0.0" />
<PackageReference Include="Vulcan.Uczniowie.HelpProvider" Version="1.0.16" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/ChorusHubTests/ChorusHubTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.2"/>
</ItemGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/ChorusMerge.Tests/ChorusMerge.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.2"/>
<PackageReference Include="SIL.TestUtilities" Version="18.0.0-*" />
<PackageReference Include="SIL.TestUtilities" Version="18.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/ChorusMerge/ChorusMerge.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.ReleaseTasks" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" Version="4.3.0" />
<PackageReference Include="System.Text.Encoding.CodePages" Version="4.0.1" />
</ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/ChorusHub.wixproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
<!-- Stamp Years -->
<Import Project="NuGet.targets" />
<PropertyGroup>
<SilBuildTasksVersion>2.5.0</SilBuildTasksVersion>
<SilBuildTasksVersion>4.0.0</SilBuildTasksVersion>
<SilBuildTasksDll>$(NuGetToolsPath)/packages/SIL.BuildTasks.$(SilBuildTasksVersion)/tools/SIL.BuildTasks.dll</SilBuildTasksDll>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions src/LibChorus.IntegrationTests/LibChorus.IntegrationTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.2" />
<PackageReference Include="SIL.TestUtilities" Version="18.0.0-*" />
<PackageReference Include="SIL.TestUtilities" Version="18.0.0" />
<PackageReference Include="Testcontainers" Version="4.14.0" />
</ItemGroup>

Expand Down
8 changes: 4 additions & 4 deletions src/LibChorus.TestUtilities/LibChorus.TestUtilities.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,10 @@
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="SIL.Core" Version="18.0.0-*" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.TestUtilities" Version="18.0.0-*" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="SIL.Core" Version="18.0.0" />
<PackageReference Include="SIL.ReleaseTasks" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.TestUtilities" Version="18.0.0" />
</ItemGroup>

<ItemGroup>
Expand Down
14 changes: 7 additions & 7 deletions src/LibChorus/LibChorus.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,19 +14,19 @@
<ItemGroup>
<PackageReference Include="Autofac" Version="4.9.4" />
<PackageReference Include="GitVersion.MsBuild" Version="5.10.3" PrivateAssets="All" />
<PackageReference Include="icu.net" Version="3.0.1" />
<PackageReference Include="icu.net" Version="4.0.0" />
<PackageReference Include="Icu4c.Win.Min" Version="59.1.7" IncludeAssets="build" />
<PackageReference Include="L10NSharp" Version="10.0.0-*" />
<PackageReference Include="L10NSharp" Version="11.0.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="NDesk.DBus" Version="0.15.0" Condition="'$(TargetFramework)' != 'netstandard2.0'" />
<PackageReference Include="SIL.Chorus.Mercurial" Version="7.0.1.95" IncludeAssets="build" />
<PackageReference Include="SIL.Core" Version="18.0.0-*" />
<PackageReference Include="SIL.Lift" Version="18.0.0-*" />
<PackageReference Include="SIL.ReleaseTasks" Version="3.0.0" PrivateAssets="All" />
<PackageReference Include="SIL.Core" Version="18.0.0" />
<PackageReference Include="SIL.Lift" Version="18.0.0" />
<PackageReference Include="SIL.ReleaseTasks" Version="4.0.0" PrivateAssets="All" />
<PackageReference Include="System.ComponentModel.Composition" Version="6.0.0" />
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="9.0.2" />
<PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
<PackageReference Include="System.ServiceModel.Primitives" Version="4.8.1" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
<PackageReference Include="System.Resources.Extensions" Version="10.0.13" />
<PackageReference Include="System.ServiceModel.Primitives" Version="10.1.0" Condition="'$(TargetFramework)' == 'netstandard2.0'" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
Expand Down
8 changes: 4 additions & 4 deletions src/LibChorusTests/LibChorus.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.4" />
<PackageReference Include="NUnit" Version="3.13.3" />
<PackageReference Include="NUnit" Version="3.14.0" />
<PackageReference Include="NUnit3TestAdapter" Version="4.3.2"/>
<PackageReference Include="SharpZipLib" Version="1.3.3" />
<PackageReference Include="SIL.Core" Version="18.0.0-*" />
<PackageReference Include="SIL.TestUtilities" Version="18.0.0-*" />
<PackageReference Include="SIL.WritingSystems.Tests" Version="18.0.0-*" />
<PackageReference Include="SIL.Core" Version="18.0.0" />
<PackageReference Include="SIL.TestUtilities" Version="18.0.0" />
<PackageReference Include="SIL.WritingSystems.Tests" Version="18.0.0" />
<PackageReference Include="System.IO.FileSystem.Primitives" Version="4.3.0" />
</ItemGroup>

Expand Down
Loading