From 8fd83bec27e553eb3809cd499fcb5b73a8b25630 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Wed, 13 Nov 2024 14:51:23 +0700
Subject: [PATCH] .NET8 Windows for SIL.Windows.Forms.Keyboarding and
 .WritingSystems

It builds, and the tests appear to be not catastrophic, but I'll wait for the build server to do the actual verification.

For .Keyboarding, I completely removed the Linux\ folder on .NET8 Windows. Same for the test files directed at Linux.
---
 ...SIL.Windows.Forms.Keyboarding.Tests.csproj | 22 ++++++++++++++++++-
 .../KeyboardController.cs                     |  4 ++++
 .../SIL.Windows.Forms.Keyboarding.csproj      | 15 +++++++++++--
 ....Windows.Forms.WritingSystems.Tests.csproj |  1 +
 .../SIL.Windows.Forms.WritingSystems.csproj   |  1 +
 5 files changed, 40 insertions(+), 3 deletions(-)

diff --git a/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj b/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj
index 0cf57183e..fd4b9c090 100644
--- a/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj
+++ b/SIL.Windows.Forms.Keyboarding.Tests/SIL.Windows.Forms.Keyboarding.Tests.csproj
@@ -4,6 +4,7 @@
     <RootNamespace>SIL.Windows.Forms.Keyboarding.Tests</RootNamespace>
     <AssemblyTitle>SIL.Windows.Forms.Keyboarding.Tests</AssemblyTitle>
     <Description>Unit tests for SIL.Windows.Forms.Keyboarding</Description>
+    <TargetFrameworks>$(TargetFrameworks);net8-windows</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
@@ -25,8 +26,27 @@
     <ProjectReference Include="..\SIL.Windows.Forms.Keyboarding\SIL.Windows.Forms.Keyboarding.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
+  <ItemGroup Condition=" $(DefineConstants.Contains('NETFRAMEWORK')) ">
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
 
+  <!-- explicitly remove Linux files for Windows -->
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8-windows'">
+    <Compile Remove="TestHelper\GnomeKeyboardRetrievingHelperDouble.cs" />
+    <Compile Remove="TestHelper\GnomeShellIbusKeyboardRetrievingAdaptorDouble.cs" />
+    <Compile Remove="CombinedIbusKeyboardRetrievingAdaptorTests.cs" />
+    <Compile Remove="CombinedIbusKeyboardSwitchingAdaptorTests.cs" />
+    <Compile Remove="GnomeKeyboardRetrievingHelperTests.cs" />
+    <Compile Remove="GnomeShellIbusKeyboardRetrievingAdaptorTests.cs" />
+    <Compile Remove="GnomeShellIbusKeyboardSwitchingAdaptorTests.cs" />
+    <Compile Remove="IbusDefaultEventHandlerTests.cs" />
+    <Compile Remove="IbusKeyboardAdaptorTests.cs" />
+    <Compile Remove="IbusKeyboardDescriptionTests.cs" />
+    <Compile Remove="IbusXkbKeyboardDescriptionTests.cs" />
+    <Compile Remove="LinuxKeyboardControllerTests.cs" />
+    <Compile Remove="UnityKeyboardRetrievingHelperTests.cs" />
+    <Compile Remove="XkbKeyboardAdapterTests.cs" />
+    <Compile Remove="XklEngineTests.cs" />
+  </ItemGroup>
+
 </Project>
\ No newline at end of file
diff --git a/SIL.Windows.Forms.Keyboarding/KeyboardController.cs b/SIL.Windows.Forms.Keyboarding/KeyboardController.cs
index 35ca4b3ad..468ce8368 100644
--- a/SIL.Windows.Forms.Keyboarding/KeyboardController.cs
+++ b/SIL.Windows.Forms.Keyboarding/KeyboardController.cs
@@ -12,7 +12,9 @@
 using SIL.ObjectModel;
 using SIL.PlatformUtilities;
 using SIL.Reporting;
+#if NETFRAMEWORK
 using SIL.Windows.Forms.Keyboarding.Linux;
+#endif
 using SIL.Windows.Forms.Keyboarding.Windows;
 
 namespace SIL.Windows.Forms.Keyboarding
@@ -217,10 +219,12 @@ private void SetDefaultKeyboardAdaptors()
 					}
 					: new IKeyboardRetrievingAdaptor[]
 					{
+#if NETFRAMEWORK
 						new XkbKeyboardRetrievingAdaptor(), new IbusKeyboardRetrievingAdaptor(),
 						new UnityXkbKeyboardRetrievingAdaptor(), new UnityIbusKeyboardRetrievingAdaptor(),
 						new CombinedIbusKeyboardRetrievingAdaptor(),
 						new GnomeShellIbusKeyboardRetrievingAdaptor()
+#endif
 					}
 			);
 		}
diff --git a/SIL.Windows.Forms.Keyboarding/SIL.Windows.Forms.Keyboarding.csproj b/SIL.Windows.Forms.Keyboarding/SIL.Windows.Forms.Keyboarding.csproj
index c4e519ad0..78662a08a 100644
--- a/SIL.Windows.Forms.Keyboarding/SIL.Windows.Forms.Keyboarding.csproj
+++ b/SIL.Windows.Forms.Keyboarding/SIL.Windows.Forms.Keyboarding.csproj
@@ -4,7 +4,15 @@
     <RootNamespace>SIL.Windows.Forms.Keyboarding</RootNamespace>
     <AssemblyTitle>SIL.Windows.Forms.Keyboarding</AssemblyTitle>
     <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-windows</TargetFrameworks>
   </PropertyGroup>
+  
+  <ItemGroup Condition="'$(TargetFramework)' == 'net8-windows'">
+    <Content Remove="Linux\**" />
+    <Compile Remove="Linux\**" />
+    <EmbeddedResource Remove="Linux\**" />
+    <None Remove="Linux\**" />
+  </ItemGroup>
 
   <ItemGroup>
     <PackageReference Include="GitVersion.MsBuild" Version="5.11.1" PrivateAssets="all" />
@@ -23,6 +31,11 @@
     <ProjectReference Include="..\SIL.Core\SIL.Core.csproj" />
   </ItemGroup>
 
+  <ItemGroup Condition=" $(DefineConstants.Contains('NETFRAMEWORK')) ">
+    <Reference Include="Microsoft.VisualBasic" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+  
   <ItemGroup>
     <Reference Include="Keyman10Interop">
       <HintPath>..\lib\Keyman10Interop.dll</HintPath>
@@ -33,8 +46,6 @@
     <Reference Include="KeymanLink">
       <HintPath>..\lib\KeymanLink.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.VisualBasic" />
-    <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>
     <None Include="../lib/Keyman*.dll">
diff --git a/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj b/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj
index be2fa479f..f710e7444 100644
--- a/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj
+++ b/SIL.Windows.Forms.WritingSystems.Tests/SIL.Windows.Forms.WritingSystems.Tests.csproj
@@ -7,6 +7,7 @@
     <IsPackable>false</IsPackable>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
+    <TargetFrameworks>$(TargetFrameworks);net8-windows</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
   </PropertyGroup>
 
diff --git a/SIL.Windows.Forms.WritingSystems/SIL.Windows.Forms.WritingSystems.csproj b/SIL.Windows.Forms.WritingSystems/SIL.Windows.Forms.WritingSystems.csproj
index bb7abe38c..fe3047c3c 100644
--- a/SIL.Windows.Forms.WritingSystems/SIL.Windows.Forms.WritingSystems.csproj
+++ b/SIL.Windows.Forms.WritingSystems/SIL.Windows.Forms.WritingSystems.csproj
@@ -4,6 +4,7 @@
     <RootNamespace>SIL.Windows.Forms.WritingSystems</RootNamespace>
     <AssemblyTitle>SIL.Windows.Forms.WritingSystems</AssemblyTitle>
     <Description>SIL.Windows.Forms.WritingSystems contains Windows Forms UI elements for displaying and editing writing systems as defined by the SIL.WritingSystems assembly.</Description>
+    <TargetFrameworks>$(TargetFrameworks);net8-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
   </PropertyGroup>