Skip to content
Merged
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
3 changes: 1 addition & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
- [SIL.Windows.Forms.Keyboarding] BREAKING CHANGE: Upgraded to L10nSharp v9. Any clients which also use L10nSharp must also upgrade to v9.
- [SIL.Windows.Forms.Keyboarding] Add a reference to L10nSharp.Windows.Forms v9.
- [SIL.Windows.Forms] BREAKING CHANGE: ToolStripExtensions.InitializeWithAvailableUILocales() removed the ILocalizationManager parameter. This method no longer provides functionality to display the localization dialog box in response to the user clicking More.
- Temporarily pinned SDK to v9 using global.json.

### Removed

Expand All @@ -45,7 +44,7 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
### Fixed

- [SIL.Windows.Forms] Made ContributorsListControl.GetCurrentContribution() return null in the case when a valid row is not selected.
- [SIL.WritingSystems] Make the English names for Chinese (Simplified) and Chinese (Traditional) consistent regardless of differences in Windows CultureInfo
- [SIL.WritingSystems] Make the English names for Chinese (Simplified) and Chinese (Traditional) consistent regardless of differences in Windows CultureInfo

## [16.1.0] - 2025-07-18

Expand Down
3 changes: 3 additions & 0 deletions SIL.Core.Desktop/SIL.Core.Desktop.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,9 @@
<WarningLevel>4</WarningLevel>
<TargetFrameworks>$(TargetFrameworks);netstandard2.0</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1" PrivateAssets="all" />
<PackageReference Include="JetBrains.Annotations" Version="2024.3.0">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,9 @@
<TargetFrameworks>$(TargetFrameworks);net8.0-windows</TargetFrameworks>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="L10NSharp" Version="9.0.0-*" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,9 @@
<Description>The SIL.Windows.Forms.Keyboarding library provides cross-platform functionality for keyboard selection and switching in Windows Forms applications. Currently, this library supports system and Keyman keyboards on Windows, and X keyboard extension (XKB) and Intelligent Input Bus (IBus) keyboards on Linux.</Description>
<TargetFrameworks>$(TargetFrameworks);net8.0-windows</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
</PropertyGroup>

<ItemGroup Condition=" !$(DefineConstants.Contains('NETFRAMEWORK')) ">
<Content Remove="Linux\**" />
Expand Down
3 changes: 3 additions & 0 deletions SIL.Windows.Forms.Tests/SIL.Windows.Forms.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,9 @@
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
<IsTestProject>true</IsTestProject>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\SIL.Core\SIL.Core.csproj" />
Expand Down
3 changes: 3 additions & 0 deletions SIL.Windows.Forms/SIL.Windows.Forms.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,9 @@
<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
<TargetFrameworks>$(TargetFrameworks);net8.0-windows</TargetFrameworks>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Enchant.Net" Version="1.4.2" />
Expand Down
3 changes: 3 additions & 0 deletions SIL.WritingSystems/SIL.WritingSystems.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
<TargetFrameworks>$(TargetFrameworks);netstandard2.0</TargetFrameworks>
<Description>SIL.WritingSystems contains classes for managing and persisting writing systems using the Locale Data Markup Language (LDML) format. This library also contains classes for processing IETF (BCP-47) language tags and accessing the SIL Locale Data Repository (SLDR).</Description>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net462' OR '$(TargetFramework)' == 'net48' ">
<DefineConstants>$(DefineConstants);NETFRAMEWORK</DefineConstants>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="GitVersion.MsBuild" Version="5.11.1" PrivateAssets="all" />
Expand Down
6 changes: 0 additions & 6 deletions global.json

This file was deleted.

Loading