Skip to content

Update to version of palaso with keyboard fix #852

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
jasonleenaylor merged 1 commit into from
Apr 24, 2026
+42 −11
Merged

Update to version of palaso with keyboard fix #852

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
25 changes: 21 additions & 4 deletions Build/Manage-LocalLibraries.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,16 @@
Path to a local machine checkout. Overrides SILMACHINE_PATH env var.
Only used when -Machine is specified.

.PARAMETER L10nSharp
Switch: include L10NSharp in the pack operation.

.PARAMETER L10nSharpPath
Path to a local L10NSharp checkout. Overrides L10NSHARP_PATH env var.
Only used when -L10nSharp is specified.

.PARAMETER Library
Which library to set a version for (SetVersion mode only):
liblcm, libpalaso, chorus, or machine.
liblcm, libpalaso, chorus, machine, or l10nsharp.

.PARAMETER Version
Sets the version in SilVersions.props (SetVersion mode). Use to revert
Expand Down Expand Up @@ -85,7 +92,10 @@ param(
[switch]$Machine,
[string]$MachinePath,

[ValidateSet('liblcm', 'libpalaso', 'chorus', 'machine')]
[switch]$L10nSharp,
[string]$L10nSharpPath,

[ValidateSet('liblcm', 'libpalaso', 'chorus', 'machine', 'l10nsharp')]
[string]$Library,

[string]$Version
Expand Down Expand Up @@ -131,10 +141,16 @@ $LibraryConfig = @{
'src/SIL.Machine.Morphology.HermitCrab/SIL.Machine.Morphology.HermitCrab.csproj'
)
}
l10nsharp = @{
VersionProperty = 'L10NSharpVersion'
PdbRelativeDir = 'output/Debug/net462'
CachePrefixes = @('l10nsharp')
EnvVar = 'L10NSHARP_PATH'
}
}

# Pack order: libpalaso first (other libraries may depend on it)
$PackOrder = @('libpalaso', 'liblcm', 'chorus', 'machine')
$PackOrder = @('libpalaso', 'l10nsharp', 'liblcm', 'chorus', 'machine')

# ---------------------------------------------------------------------------
# Read SilVersions.props
Expand Down Expand Up @@ -333,6 +349,7 @@ $switchMap = @{
liblcm = @{ Enabled = [bool]$Lcm; ExplicitPath = $LcmPath }
chorus = @{ Enabled = [bool]$Chorus; ExplicitPath = $ChorusPath }
machine = @{ Enabled = [bool]$Machine; ExplicitPath = $MachinePath }
l10nsharp = @{ Enabled = [bool]$L10nSharp; ExplicitPath = $L10nSharpPath }
}

# Resolve source paths: explicit path > env var (only when switch is set)
Expand Down Expand Up @@ -419,5 +436,5 @@ elseif ($Library -and $Version) {
Write-Host "Run .\build.ps1 to restore and build with the new version." -ForegroundColor Cyan
}
else {
throw "Nothing to do. Use -Palaso/-Lcm/-Chorus/-Machine switches to pack, or -Library and -Version to set a version.`nExamples:`n .\Build\Manage-LocalLibraries.ps1 -Palaso -PalasoPath C:\Repos\libpalaso`n .\Build\Manage-LocalLibraries.ps1 -Palaso -Chorus`n .\Build\Manage-LocalLibraries.ps1 -Machine -MachinePath C:\Repos\machine`n .\Build\Manage-LocalLibraries.ps1 -Library libpalaso -Version 17.0.0"
throw "Nothing to do. Use -Palaso/-Lcm/-Chorus/-Machine/-L10nSharp switches to pack, or -Library and -Version to set a version.`nExamples:`n .\Build\Manage-LocalLibraries.ps1 -Palaso -PalasoPath C:\Repos\libpalaso`n .\Build\Manage-LocalLibraries.ps1 -Palaso -Chorus`n .\Build\Manage-LocalLibraries.ps1 -Machine -MachinePath C:\Repos\machine`n .\Build\Manage-LocalLibraries.ps1 -Library l10nsharp -Version 10.0.0`n .\Build\Manage-LocalLibraries.ps1 -Library libpalaso -Version 17.0.0"
}
8 changes: 5 additions & 3 deletions Build/SilVersions.props
View file
Open in desktop
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.
Expand All @@ -13,12 +13,14 @@
-->
<PropertyGroup Label="SIL Ecosystem Versions">
<SilLcmVersion>11.0.0-beta0160</SilLcmVersion>
<SilLibPalasoVersion>17.0.0</SilLibPalasoVersion>
<SilLibPalasoVersion>18.0.0-beta0008</SilLibPalasoVersion>
<SilLibPalasoL10nsVersion>18.0.0-beta0001</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>
<IcuNugetVersion>70.1.152</IcuNugetVersion>
<GeckoNugetVersion>60.0.56</GeckoNugetVersion>
</PropertyGroup>
</Project>
</Project>
4 changes: 2 additions & 2 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -87,9 +87,9 @@
=============================================================
-->
<ItemGroup Label="SIL Localization">
<PackageVersion Include="L10NSharp" Version="9.0.0" />
<PackageVersion Include="L10NSharp" Version="$(L10NSharpVersion)" />
<PackageVersion Include="SIL.Chorus.L10ns" Version="3.0.1" />
<PackageVersion Include="SIL.LibPalaso.L10ns" Version="$(SilLibPalasoVersion)" />
<PackageVersion Include="SIL.LibPalaso.L10ns" Version="$(SilLibPalasoL10nsVersion)" />
</ItemGroup>

<!--
Expand Down
6 changes: 6 additions & 0 deletions Src/AppForTests.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,12 @@
<!-- Binding redirects are auto-generated at build time
(AutoGenerateBindingRedirects=true in Directory.Build.props).
Do NOT add manual redirects here; they will drift from CPM versions. -->
<!-- Chorus 6.0.0 references L10NSharp 9.0.0; redirect to 10.0.0.
Remove when Chorus is updated to reference L10NSharp 10. -->
<dependentAssembly>
<assemblyIdentity name="L10NSharp" publicKeyToken="fd0b3e309a5b7c28" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
6 changes: 6 additions & 0 deletions Src/Common/FieldWorks/App.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ Only entries that auto-gen cannot produce are kept below.
<assemblyIdentity name="SIL.Core.Desktop" publicKeyToken="cab3c8c5232dfcf2" culture="neutral" />
<codeBase version="0.0.0.0" href="SIL.Core.Desktop.dll" />
</dependentAssembly>
<!-- Chorus 6.0.0 references L10NSharp 9.0.0; redirect to 10.0.0.
Remove when Chorus is updated to reference L10NSharp 10. -->
<dependentAssembly>
<assemblyIdentity name="L10NSharp" publicKeyToken="fd0b3e309a5b7c28" culture="neutral" />
<bindingRedirect oldVersion="0.0.0.0-10.0.0.0" newVersion="10.0.0.0" />
</dependentAssembly>
</assemblyBinding>
</runtime>
</configuration>
4 changes: 2 additions & 2 deletions Src/Common/FieldWorks/FieldWorks.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3665,7 +3665,7 @@ internal static void InitializeLocalizationManager()
var version = $"{versionObj.Major}.{versionObj.Minor}.{versionObj.Build}";
// First create localization manager for Chorus with english
LocalizationManagerWinforms.Create("en",
"Chorus", "Chorus", version, installedL10nBaseDir, userL10nBaseDir, null, "flex_localization@sil.org", new [] { "Chorus", "LibChorus" });
"Chorus", "Chorus", version, installedL10nBaseDir, userL10nBaseDir, null, new[] { "Chorus", "LibChorus" });
// Now that we have one manager initialized check and see if the users UI language has
// localizations available
var uiCulture = CultureInfo.CurrentUICulture.TwoLetterISOLanguageName;
Expand All @@ -3678,7 +3678,7 @@ internal static void InitializeLocalizationManager()
versionObj = Assembly.GetAssembly(typeof(ErrorReport)).GetName().Version;
version = $"{versionObj.Major}.{versionObj.Minor}.{versionObj.Build}";
LocalizationManagerWinforms.Create(LocalizationManager.UILanguageId, "Palaso", "Palaso", version, installedL10nBaseDir,
userL10nBaseDir, null, "flex_localization@sil.org", new [] { "SIL.Windows.Forms" });
userL10nBaseDir, null, new[] { "SIL.Windows.Forms" });
}
catch (Exception e)
{
Expand Down
Loading