From a1d93ee82cde0f3946dab0f609b830de601112ef Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 12 Apr 2024 11:40:25 +0700
Subject: [PATCH 01/19] Adding Framework 4.8.1 and .NET8 to targets.

This required platform-specific references in the project files. I also fixed a warning about Assembly.CodeBase and some .NET8 warnings about manually copying duplicate files into our nuget package folder when packing. These files appear to be duplicates of what is copied during the .NET8 packaging.
---
 Directory.Build.props                      |  3 ++-
 src/CheckOrFixXliff/CheckOrFixXliff.csproj |  4 ++--
 src/CheckOrFixXliff/Program.cs             |  2 +-
 src/ExtractXliff/ExtractXliff.csproj       |  4 ++--
 src/L10NSharp/L10NSharp.csproj             | 14 +++++++++++---
 src/L10NSharpTests/L10NSharpTests.csproj   |  2 +-
 src/SampleApp/SampleApp.csproj             |  2 +-
 7 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index dd0b5e9..21392df 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net461</TargetFrameworks>
+    <TargetFrameworks>net461;net481;net8.0-windows</TargetFrameworks>
     <Company>SIL</Company>
     <Authors>SIL International</Authors>
     <Product>L10NSharp</Product>
@@ -24,6 +24,7 @@ See full changelog at https://github.com/sillsdev/l10nsharp/blob/master/CHANGELO
     </AppendToReleaseNotesProperty>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
+    <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
   <ItemGroup>
     <!-- Without this line some projects fail to build on TC with "error : SourceRoot items
diff --git a/src/CheckOrFixXliff/CheckOrFixXliff.csproj b/src/CheckOrFixXliff/CheckOrFixXliff.csproj
index 8ac4abd..3256a3d 100644
--- a/src/CheckOrFixXliff/CheckOrFixXliff.csproj
+++ b/src/CheckOrFixXliff/CheckOrFixXliff.csproj
@@ -9,9 +9,9 @@
     <PackageLicenseExpression>MIT</PackageLicenseExpression>
     <PackageProjectUrl>https://github.com/sillsdev/l10nsharp/tree/master/src/CheckOrFixXliff</PackageProjectUrl>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
-    <NoWarn>$(NoWarn);NU5128</NoWarn>
+    <NoWarn>$(NoWarn);NU5128;NU5118</NoWarn>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
diff --git a/src/CheckOrFixXliff/Program.cs b/src/CheckOrFixXliff/Program.cs
index 3ca7ed4..b2f7c7f 100644
--- a/src/CheckOrFixXliff/Program.cs
+++ b/src/CheckOrFixXliff/Program.cs
@@ -176,7 +176,7 @@ private static bool CheckForWellFormedXml(string filename)
 		private static bool ValidateXliffAgainstSchema(string filename)
 		{
 			bool valid = true;
-			var installedXliffDir = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).LocalPath);
+			var installedXliffDir = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().Location).LocalPath);
 			var schemaLocation = Path.Combine(installedXliffDir, "xliff-core-1.2-transitional.xsd");
 			var schemas = new XmlSchemaSet();
 			using (var reader = XmlReader.Create(schemaLocation))
diff --git a/src/ExtractXliff/ExtractXliff.csproj b/src/ExtractXliff/ExtractXliff.csproj
index 1f7aee4..05008f2 100644
--- a/src/ExtractXliff/ExtractXliff.csproj
+++ b/src/ExtractXliff/ExtractXliff.csproj
@@ -9,9 +9,9 @@
     <PackageId>L10NSharp.ExtractXliff</PackageId>
     <PackageProjectUrl>https://github.com/sillsdev/l10nsharp/tree/master/src/ExtractXliff</PackageProjectUrl>
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
-    <NoWarn>$(NoWarn);NU5128</NoWarn>
+    <NoWarn>$(NoWarn);NU5128;NU5118</NoWarn>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
diff --git a/src/L10NSharp/L10NSharp.csproj b/src/L10NSharp/L10NSharp.csproj
index 4c8cf8d..74cea40 100644
--- a/src/L10NSharp/L10NSharp.csproj
+++ b/src/L10NSharp/L10NSharp.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <RootNamespace>L10NSharp</RootNamespace>
     <Description>L10NSharp is a .NET localization library for Windows Forms applications. It collects strings which need localization when your application first runs and saves them in a XLIFF file. It can also dynamically collect strings at runtime.</Description>
@@ -6,14 +6,22 @@
     <PackageId>L10NSharp</PackageId>
     <PackageProjectUrl>https://github.com/sillsdev/l10nsharp</PackageProjectUrl>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
     <PackageReference Include="GitVersion.MsBuild" Version="5.11.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
     <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="all" />
     <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0-windows' ">
+    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1" PrivateAssets="all" />
+    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
+    <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="all" />
+    <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
+    <PackageReference Include="System.ServiceModel.Http" Version="6.2.0" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="6.2.0" />
+  </ItemGroup>
 </Project>
diff --git a/src/L10NSharpTests/L10NSharpTests.csproj b/src/L10NSharpTests/L10NSharpTests.csproj
index 178ad28..76160a0 100644
--- a/src/L10NSharpTests/L10NSharpTests.csproj
+++ b/src/L10NSharpTests/L10NSharpTests.csproj
@@ -13,7 +13,7 @@
 	  <PackageReference Include="NUnit" Version="3.13.3" />
 	  <PackageReference Include="NUnit3TestAdapter" Version="4.3.2" />
 	</ItemGroup>
-	<ItemGroup>
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
 	  <Reference Include="System.Windows.Forms" />
 	</ItemGroup>
 </Project>
diff --git a/src/SampleApp/SampleApp.csproj b/src/SampleApp/SampleApp.csproj
index d184764..fa9319a 100644
--- a/src/SampleApp/SampleApp.csproj
+++ b/src/SampleApp/SampleApp.csproj
@@ -5,7 +5,7 @@
     <AssemblyTitle>SampleApp</AssemblyTitle>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>

From 349944c75cf72d8dd17d363a2d2cdbd021b90b5f Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 12 Apr 2024 11:47:40 +0700
Subject: [PATCH 02/19] GHA installs .NET8

---
 .github/workflows/CI-CD.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
index cab1eb6..b4c6712 100644
--- a/.github/workflows/CI-CD.yml
+++ b/.github/workflows/CI-CD.yml
@@ -34,7 +34,7 @@ jobs:
     - name: Install .NET Core
       uses: actions/setup-dotnet@c0d4ad69d8bd405d234f1c9166d383b7a4f69ed8 # v2.1.0
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: Build and Pack
       run: dotnet build --configuration Release

From c5b66ad76267a3b00ce603d83b23318bb0f70b45 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Thu, 18 Apr 2024 12:19:15 +0700
Subject: [PATCH 03/19] EnableWindowsTargeting to true

This should fix a build server error for Ubuntu
---
 Directory.Build.props | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Directory.Build.props b/Directory.Build.props
index 21392df..34f45e1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -25,6 +25,7 @@ See full changelog at https://github.com/sillsdev/l10nsharp/blob/master/CHANGELO
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
     <GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
     <UseWindowsForms>true</UseWindowsForms>
+    <EnableWindowsTargeting>true</EnableWindowsTargeting>
   </PropertyGroup>
   <ItemGroup>
     <!-- Without this line some projects fail to build on TC with "error : SourceRoot items

From a8339b44b43c98323bcade4f12fbdd11b7499385 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 10 May 2024 08:17:34 +0700
Subject: [PATCH 04/19] Updated L10NCultureInfo unknown language detection

This is backwards compatible with older versions of .NET, though I couldn't test an older OS.
---
 src/L10NSharp/L10NCultureInfo.cs           | 8 +++++++-
 src/L10NSharpTests/L10NCultureInfoTests.cs | 3 ++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/L10NSharp/L10NCultureInfo.cs b/src/L10NSharp/L10NCultureInfo.cs
index d297985..454e2c0 100644
--- a/src/L10NSharp/L10NCultureInfo.cs
+++ b/src/L10NSharp/L10NCultureInfo.cs
@@ -34,7 +34,13 @@ public L10NCultureInfo(string name)
 			{
 				RawCultureInfo = null;
 			}
-			if (RawCultureInfo == null || RawCultureInfo.EnglishName.StartsWith("Unknown Language"))
+
+			// Starting with Windows 10, unknown cultures no longer return a RawCultureInfo containing an "Unknown Language" indication.
+			// The proper way to detect fully unknown cultures, for Windows 10 and prior, is to:
+			//    1. Check for the custom culture flag
+			//    2. Check if the three-letter language name is set to default
+			var isFullyUnknown = RawCultureInfo.CultureTypes.HasFlag(CultureTypes.UserCustomCulture) && RawCultureInfo.ThreeLetterWindowsLanguageName == "ZZZ";
+			if (RawCultureInfo == null || isFullyUnknown)
 			{
 				Name = name;
 				IsNeutralCulture = !Name.Contains("-");
diff --git a/src/L10NSharpTests/L10NCultureInfoTests.cs b/src/L10NSharpTests/L10NCultureInfoTests.cs
index c7a6d7e..f7c728f 100644
--- a/src/L10NSharpTests/L10NCultureInfoTests.cs
+++ b/src/L10NSharpTests/L10NCultureInfoTests.cs
@@ -41,7 +41,8 @@ public void L10NCultureInfo_TestPbu()
 			else if (pbuci.RawCultureInfo != null)
 			{
 				Assert.AreEqual("pbu", pbuci.RawCultureInfo.Name);
-				Assert.AreEqual("Unknown Language (pbu)", pbuci.RawCultureInfo.EnglishName);
+				Assert.IsTrue(pbuci.RawCultureInfo.CultureTypes.HasFlag(CultureTypes.UserCustomCulture));
+				Assert.AreEqual("ZZZ", pbuci.RawCultureInfo.ThreeLetterWindowsLanguageName);
 			}
 		}
 

From 6ced60e1b31f22056afecf951aacd0bae38b88aa Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 10 May 2024 08:27:06 +0700
Subject: [PATCH 05/19] Fixed other broken tests

---
 src/L10NSharpTests/TempFile.cs                   | 2 +-
 src/L10NSharpTests/XLiffSchemaValidationTests.cs | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/L10NSharpTests/TempFile.cs b/src/L10NSharpTests/TempFile.cs
index 2f10044..d1be0ae 100644
--- a/src/L10NSharpTests/TempFile.cs
+++ b/src/L10NSharpTests/TempFile.cs
@@ -249,7 +249,7 @@ public TempFolder(): this(TestContext.CurrentContext.Test.Name)
 		public TempFolder(string testName)
 		{
 			testName = System.IO.Path.GetInvalidPathChars().Aggregate(testName,
-				(current, c) => current.Replace(c, '_')).Replace('`', '_');
+				(current, c) => current.Replace(c, '_')).Replace('`', '_').Replace('"', '_');
 			_path = System.IO.Path.Combine(BasePath, testName);
 			if(Directory.Exists(_path))
 			{
diff --git a/src/L10NSharpTests/XLiffSchemaValidationTests.cs b/src/L10NSharpTests/XLiffSchemaValidationTests.cs
index 19a1f19..11d530f 100644
--- a/src/L10NSharpTests/XLiffSchemaValidationTests.cs
+++ b/src/L10NSharpTests/XLiffSchemaValidationTests.cs
@@ -1,4 +1,4 @@
-// Copyright (c) 2017 SIL International
+// Copyright (c) 2017 SIL International
 // This software is licensed under the MIT License (http://opensource.org/licenses/MIT)
 
 using System;
@@ -42,6 +42,7 @@ public void ValidateInFoldersAgainstSchema()
 				Directory.CreateDirectory(folder.Path);
 				new XLiffLocalizationManagerTests().SetupManager(folder);
 
+				AppContext.SetSwitch("Switch.System.Xml.AllowDefaultResolver", true);
 				var schemas = new XmlSchemaSet();
 				using (var reader = XmlReader.Create(SchemaLocation))
 				{
@@ -88,6 +89,7 @@ public void ValidateFlatFilesAgainstSchema()
 				Directory.CreateDirectory(folder.Path);
 				new XLiffLocalizationManagerTests().SetupManager(folder);
 
+				AppContext.SetSwitch("Switch.System.Xml.AllowDefaultResolver", true);
 				var schemas = new XmlSchemaSet();
 				using (var reader = XmlReader.Create(SchemaLocation))
 				{

From c027a8ff083f221c2f01316dfb231c599721f5d7 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 10 May 2024 10:26:22 +0700
Subject: [PATCH 06/19] Temporarily disabling ubuntu

---
 .github/workflows/CI-CD.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
index b4c6712..f34fc38 100644
--- a/.github/workflows/CI-CD.yml
+++ b/.github/workflows/CI-CD.yml
@@ -22,7 +22,7 @@ jobs:
     name: "Build and Test"
     strategy:
       matrix:
-        os: [windows-latest, ubuntu-latest]
+        os: [windows-latest]
     runs-on: ${{ matrix.os }}
 
     steps:

From 6c95e3c93f00bbd11995ae31c2c1f66a26dafe85 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 10 May 2024 11:15:25 +0700
Subject: [PATCH 07/19] Downgrading to test sdk 17.3.2

This appears to be an alternate fix for discovering tests on Framework 4.6.1. Replacing the previous fix may allow tests for the new frameworks to be discovered.
---
 .github/workflows/CI-CD.yml              | 2 +-
 src/L10NSharpTests/L10NSharpTests.csproj | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
index f34fc38..8ce45b6 100644
--- a/.github/workflows/CI-CD.yml
+++ b/.github/workflows/CI-CD.yml
@@ -45,7 +45,7 @@ jobs:
 
     - name: Test (Windows)
       # specify path to test assembly as workaround for https://github.com/nunit/nunit3-vs-adapter/issues/1040
-      run: dotnet test --configuration Release --no-build output\Release\net461\*Tests.dll -- NUnit.TestOutputXml=TestResults
+      run: dotnet test --configuration Release --no-build -- NUnit.TestOutputXml=TestResults
       if: matrix.os != 'ubuntu-latest'
 
     - name: Upload Test Results
diff --git a/src/L10NSharpTests/L10NSharpTests.csproj b/src/L10NSharpTests/L10NSharpTests.csproj
index 76160a0..dcb5ff4 100644
--- a/src/L10NSharpTests/L10NSharpTests.csproj
+++ b/src/L10NSharpTests/L10NSharpTests.csproj
@@ -9,7 +9,7 @@
 	  <ProjectReference Include="..\L10NSharp\L10NSharp.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
 	  <PackageReference Include="NUnit" Version="3.13.3" />
 	  <PackageReference Include="NUnit3TestAdapter" Version="4.3.2" />
 	</ItemGroup>

From ece79e60b3ebbe2da132c210ec646bb1b6d95cd4 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 10 May 2024 14:19:02 +0700
Subject: [PATCH 08/19] A bit more test work for windows

---
 .github/workflows/CI-CD.yml              | 1 -
 src/L10NSharpTests/L10NSharpTests.csproj | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
index 8ce45b6..24b700d 100644
--- a/.github/workflows/CI-CD.yml
+++ b/.github/workflows/CI-CD.yml
@@ -44,7 +44,6 @@ jobs:
       if: matrix.os == 'ubuntu-latest'
 
     - name: Test (Windows)
-      # specify path to test assembly as workaround for https://github.com/nunit/nunit3-vs-adapter/issues/1040
       run: dotnet test --configuration Release --no-build -- NUnit.TestOutputXml=TestResults
       if: matrix.os != 'ubuntu-latest'
 
diff --git a/src/L10NSharpTests/L10NSharpTests.csproj b/src/L10NSharpTests/L10NSharpTests.csproj
index dcb5ff4..76160a0 100644
--- a/src/L10NSharpTests/L10NSharpTests.csproj
+++ b/src/L10NSharpTests/L10NSharpTests.csproj
@@ -9,7 +9,7 @@
 	  <ProjectReference Include="..\L10NSharp\L10NSharp.csproj" />
 	</ItemGroup>
 	<ItemGroup>
-	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
+	  <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
 	  <PackageReference Include="NUnit" Version="3.13.3" />
 	  <PackageReference Include="NUnit3TestAdapter" Version="4.3.2" />
 	</ItemGroup>

From 9454edee9ecd681929a68cb24f7acc1b1db91702 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 10 May 2024 14:45:56 +0700
Subject: [PATCH 09/19] Remove ubuntu build

Consequently, artifacts get uploaded on windows.
---
 .github/workflows/CI-CD.yml | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
index 24b700d..98e581a 100644
--- a/.github/workflows/CI-CD.yml
+++ b/.github/workflows/CI-CD.yml
@@ -20,10 +20,7 @@ jobs:
 
   build-and-test:
     name: "Build and Test"
-    strategy:
-      matrix:
-        os: [windows-latest]
-    runs-on: ${{ matrix.os }}
+    runs-on: windows-latest
 
     steps:
     - name: Checkout
@@ -39,13 +36,8 @@ jobs:
     - name: Build and Pack
       run: dotnet build --configuration Release
 
-    - name: Test (Ubuntu)
-      run: dotnet test --configuration Release --no-build --filter TestCategory!=RequiresDisplay -- NUnit.TestOutputXml=TestResults
-      if: matrix.os == 'ubuntu-latest'
-
     - name: Test (Windows)
       run: dotnet test --configuration Release --no-build -- NUnit.TestOutputXml=TestResults
-      if: matrix.os != 'ubuntu-latest'
 
     - name: Upload Test Results
       if: always()
@@ -61,7 +53,6 @@ jobs:
         path: |
           output/*.nupkg
           output/*.snupkg
-      if: matrix.os == 'ubuntu-latest'
 
   publish-nuget:
     name: "Publish NuGet package"

From 10f2fe18dce00a9617b569340927d0ec2e6ee13f Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 17 May 2024 10:01:20 +0700
Subject: [PATCH 10/19] Refactored out some duplication in the project file

---
 src/L10NSharp/L10NSharp.csproj | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/L10NSharp/L10NSharp.csproj b/src/L10NSharp/L10NSharp.csproj
index 74cea40..b859182 100644
--- a/src/L10NSharp/L10NSharp.csproj
+++ b/src/L10NSharp/L10NSharp.csproj
@@ -10,18 +10,14 @@
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
-    <PackageReference Include="GitVersion.MsBuild" Version="5.11.1" PrivateAssets="all" />
-    <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
-    <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="all" />
-    <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
-  </ItemGroup>
   <ItemGroup Condition=" '$(TargetFramework)' == 'net8.0-windows' ">
+    <PackageReference Include="System.ServiceModel.Http" Version="6.2.0" />
+    <PackageReference Include="System.ServiceModel.Primitives" Version="6.2.0" />
+  </ItemGroup>
+  <ItemGroup>
     <PackageReference Include="GitVersion.MsBuild" Version="5.11.1" PrivateAssets="all" />
     <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="all" />
     <PackageReference Include="SIL.ReleaseTasks" Version="2.5.0" PrivateAssets="all" />
     <PackageReference Include="System.Resources.Extensions" Version="6.0.0" />
-    <PackageReference Include="System.ServiceModel.Http" Version="6.2.0" />
-    <PackageReference Include="System.ServiceModel.Primitives" Version="6.2.0" />
   </ItemGroup>
 </Project>

From dab88cd900e18eee3eacba5d6568617aecc90569 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Mon, 20 May 2024 12:01:19 +0700
Subject: [PATCH 11/19] Clarifying a comment

+semver: major
---
 src/L10NSharp/L10NCultureInfo.cs | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/L10NSharp/L10NCultureInfo.cs b/src/L10NSharp/L10NCultureInfo.cs
index 454e2c0..1c807c8 100644
--- a/src/L10NSharp/L10NCultureInfo.cs
+++ b/src/L10NSharp/L10NCultureInfo.cs
@@ -35,10 +35,11 @@ public L10NCultureInfo(string name)
 				RawCultureInfo = null;
 			}
 
-			// Starting with Windows 10, unknown cultures no longer return a RawCultureInfo containing an "Unknown Language" indication.
-			// The proper way to detect fully unknown cultures, for Windows 10 and prior, is to:
+			// Windows 10 changed the behavior of CultureInfo, in that unknown cultures no longer return a RawCultureInfo containing an "Unknown Language" indication.
+			// The proper way to detect fully unknown cultures (for Windows 10 and prior) is to:
 			//    1. Check for the custom culture flag
 			//    2. Check if the three-letter language name is set to default
+			// Source: https://stackoverflow.com/a/71388328/1964319
 			var isFullyUnknown = RawCultureInfo.CultureTypes.HasFlag(CultureTypes.UserCustomCulture) && RawCultureInfo.ThreeLetterWindowsLanguageName == "ZZZ";
 			if (RawCultureInfo == null || isFullyUnknown)
 			{

From 63c81bec93a0ff6f9aa29160c5f06d38dd060dba Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 24 May 2024 10:19:00 +0700
Subject: [PATCH 12/19] Updated the unknown language comment to include Win11.

I believe the previous OS's, primarily Win10 and Win7, still work with this method.
---
 src/L10NSharp/L10NCultureInfo.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/L10NSharp/L10NCultureInfo.cs b/src/L10NSharp/L10NCultureInfo.cs
index 1c807c8..e79318e 100644
--- a/src/L10NSharp/L10NCultureInfo.cs
+++ b/src/L10NSharp/L10NCultureInfo.cs
@@ -36,7 +36,7 @@ public L10NCultureInfo(string name)
 			}
 
 			// Windows 10 changed the behavior of CultureInfo, in that unknown cultures no longer return a RawCultureInfo containing an "Unknown Language" indication.
-			// The proper way to detect fully unknown cultures (for Windows 10 and prior) is to:
+			// The proper way to detect fully unknown cultures (for Windows 11 and prior) is to:
 			//    1. Check for the custom culture flag
 			//    2. Check if the three-letter language name is set to default
 			// Source: https://stackoverflow.com/a/71388328/1964319

From 8f9a4d74ac1ab3ae8778f8f7d750341889f1600f Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 24 May 2024 10:25:20 +0700
Subject: [PATCH 13/19] Targeting Framework 4.8 instead of 4.8.1

Framework 4.8 is apparently the last version to deploy offline installers for Windows 7 SP1.
---
 Directory.Build.props                      | 2 +-
 src/CheckOrFixXliff/CheckOrFixXliff.csproj | 2 +-
 src/ExtractXliff/ExtractXliff.csproj       | 2 +-
 src/L10NSharp/L10NSharp.csproj             | 2 +-
 src/L10NSharpTests/L10NSharpTests.csproj   | 2 +-
 src/SampleApp/SampleApp.csproj             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Directory.Build.props b/Directory.Build.props
index 34f45e1..ab1fec1 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -1,6 +1,6 @@
 <Project>
   <PropertyGroup>
-    <TargetFrameworks>net461;net481;net8.0-windows</TargetFrameworks>
+    <TargetFrameworks>net461;net48;net8.0-windows</TargetFrameworks>
     <Company>SIL</Company>
     <Authors>SIL International</Authors>
     <Product>L10NSharp</Product>
diff --git a/src/CheckOrFixXliff/CheckOrFixXliff.csproj b/src/CheckOrFixXliff/CheckOrFixXliff.csproj
index 3256a3d..081e19d 100644
--- a/src/CheckOrFixXliff/CheckOrFixXliff.csproj
+++ b/src/CheckOrFixXliff/CheckOrFixXliff.csproj
@@ -11,7 +11,7 @@
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
     <NoWarn>$(NoWarn);NU5128;NU5118</NoWarn>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net48' ">
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
diff --git a/src/ExtractXliff/ExtractXliff.csproj b/src/ExtractXliff/ExtractXliff.csproj
index 05008f2..ec72154 100644
--- a/src/ExtractXliff/ExtractXliff.csproj
+++ b/src/ExtractXliff/ExtractXliff.csproj
@@ -11,7 +11,7 @@
     <TargetsForTfmSpecificBuildOutput>$(TargetsForTfmSpecificBuildOutput);CopyProjectReferencesToPackage</TargetsForTfmSpecificBuildOutput>
     <NoWarn>$(NoWarn);NU5128;NU5118</NoWarn>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == '' ">
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
diff --git a/src/L10NSharp/L10NSharp.csproj b/src/L10NSharp/L10NSharp.csproj
index b859182..39ca4a5 100644
--- a/src/L10NSharp/L10NSharp.csproj
+++ b/src/L10NSharp/L10NSharp.csproj
@@ -6,7 +6,7 @@
     <PackageId>L10NSharp</PackageId>
     <PackageProjectUrl>https://github.com/sillsdev/l10nsharp</PackageProjectUrl>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net48' ">
     <Reference Include="System.ServiceModel" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
diff --git a/src/L10NSharpTests/L10NSharpTests.csproj b/src/L10NSharpTests/L10NSharpTests.csproj
index 76160a0..8541cae 100644
--- a/src/L10NSharpTests/L10NSharpTests.csproj
+++ b/src/L10NSharpTests/L10NSharpTests.csproj
@@ -13,7 +13,7 @@
 	  <PackageReference Include="NUnit" Version="3.13.3" />
 	  <PackageReference Include="NUnit3TestAdapter" Version="4.3.2" />
 	</ItemGroup>
-	<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
+	<ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net48' ">
 	  <Reference Include="System.Windows.Forms" />
 	</ItemGroup>
 </Project>
diff --git a/src/SampleApp/SampleApp.csproj b/src/SampleApp/SampleApp.csproj
index fa9319a..b63a28f 100644
--- a/src/SampleApp/SampleApp.csproj
+++ b/src/SampleApp/SampleApp.csproj
@@ -5,7 +5,7 @@
     <AssemblyTitle>SampleApp</AssemblyTitle>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
-  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net481' ">
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net461' Or '$(TargetFramework)' == 'net48' ">
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
   <ItemGroup>

From 362ec7785c23e529d9126bcc09c28c3f8df99123 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 31 May 2024 13:44:53 +0700
Subject: [PATCH 14/19] Reinstating ubuntu build

---
 .github/workflows/CI-CD.yml | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
index 98e581a..24b700d 100644
--- a/.github/workflows/CI-CD.yml
+++ b/.github/workflows/CI-CD.yml
@@ -20,7 +20,10 @@ jobs:
 
   build-and-test:
     name: "Build and Test"
-    runs-on: windows-latest
+    strategy:
+      matrix:
+        os: [windows-latest]
+    runs-on: ${{ matrix.os }}
 
     steps:
     - name: Checkout
@@ -36,8 +39,13 @@ jobs:
     - name: Build and Pack
       run: dotnet build --configuration Release
 
+    - name: Test (Ubuntu)
+      run: dotnet test --configuration Release --no-build --filter TestCategory!=RequiresDisplay -- NUnit.TestOutputXml=TestResults
+      if: matrix.os == 'ubuntu-latest'
+
     - name: Test (Windows)
       run: dotnet test --configuration Release --no-build -- NUnit.TestOutputXml=TestResults
+      if: matrix.os != 'ubuntu-latest'
 
     - name: Upload Test Results
       if: always()
@@ -53,6 +61,7 @@ jobs:
         path: |
           output/*.nupkg
           output/*.snupkg
+      if: matrix.os == 'ubuntu-latest'
 
   publish-nuget:
     name: "Publish NuGet package"

From 410c4fc4531daeeadc03d67ef005aa360230e669 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 31 May 2024 13:49:19 +0700
Subject: [PATCH 15/19] Attempt number 2

---
 .github/workflows/CI-CD.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
index 24b700d..77cbb4b 100644
--- a/.github/workflows/CI-CD.yml
+++ b/.github/workflows/CI-CD.yml
@@ -22,7 +22,7 @@ jobs:
     name: "Build and Test"
     strategy:
       matrix:
-        os: [windows-latest]
+        os: [windows-latest, ubuntu-latest]
     runs-on: ${{ matrix.os }}
 
     steps:

From 6d668423471a7c56f90e2b7a6c6962016dce47c7 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 31 May 2024 13:57:38 +0700
Subject: [PATCH 16/19] Pointing to theoretical test output folder

---
 .github/workflows/CI-CD.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
index 77cbb4b..8d73891 100644
--- a/.github/workflows/CI-CD.yml
+++ b/.github/workflows/CI-CD.yml
@@ -40,7 +40,7 @@ jobs:
       run: dotnet build --configuration Release
 
     - name: Test (Ubuntu)
-      run: dotnet test --configuration Release --no-build --filter TestCategory!=RequiresDisplay -- NUnit.TestOutputXml=TestResults
+      run: dotnet test --configuration Release --no-build output\Release\net461\*Tests.dll --filter TestCategory!=RequiresDisplay -- NUnit.TestOutputXml=TestResults
       if: matrix.os == 'ubuntu-latest'
 
     - name: Test (Windows)

From 9e66c51e7ccbf3a86e2cb333c04a764ca03a9252 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 31 May 2024 14:05:04 +0700
Subject: [PATCH 17/19] Slashes

---
 .github/workflows/CI-CD.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
index 8d73891..d939fb8 100644
--- a/.github/workflows/CI-CD.yml
+++ b/.github/workflows/CI-CD.yml
@@ -40,7 +40,7 @@ jobs:
       run: dotnet build --configuration Release
 
     - name: Test (Ubuntu)
-      run: dotnet test --configuration Release --no-build output\Release\net461\*Tests.dll --filter TestCategory!=RequiresDisplay -- NUnit.TestOutputXml=TestResults
+      run: dotnet test --configuration Release --no-build output/Release/net461/*Tests.dll --filter TestCategory!=RequiresDisplay -- NUnit.TestOutputXml=TestResults
       if: matrix.os == 'ubuntu-latest'
 
     - name: Test (Windows)

From 4622fa8b62f2e6621b17944651ce03f1442ac366 Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 31 May 2024 14:18:54 +0700
Subject: [PATCH 18/19] Removing tests on ubuntu, since they aren't running on
 master

The tests on master, for ubuntu and framework 4.6.1, are succeeding with empty output. So I'm deleting them here.
---
 .github/workflows/CI-CD.yml | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
index d939fb8..fe7cfd2 100644
--- a/.github/workflows/CI-CD.yml
+++ b/.github/workflows/CI-CD.yml
@@ -39,10 +39,6 @@ jobs:
     - name: Build and Pack
       run: dotnet build --configuration Release
 
-    - name: Test (Ubuntu)
-      run: dotnet test --configuration Release --no-build output/Release/net461/*Tests.dll --filter TestCategory!=RequiresDisplay -- NUnit.TestOutputXml=TestResults
-      if: matrix.os == 'ubuntu-latest'
-
     - name: Test (Windows)
       run: dotnet test --configuration Release --no-build -- NUnit.TestOutputXml=TestResults
       if: matrix.os != 'ubuntu-latest'

From d567f2e35c2521685a7ea47ba5db75f15031186b Mon Sep 17 00:00:00 2001
From: Joseph Myers <wjosephmyers@gmail.com>
Date: Fri, 31 May 2024 15:19:59 +0700
Subject: [PATCH 19/19] Experimenting with 4.6.1 tests

---
 .github/workflows/CI-CD.yml | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/CI-CD.yml b/.github/workflows/CI-CD.yml
index fe7cfd2..9d1a0f8 100644
--- a/.github/workflows/CI-CD.yml
+++ b/.github/workflows/CI-CD.yml
@@ -39,7 +39,11 @@ jobs:
     - name: Build and Pack
       run: dotnet build --configuration Release
 
-    - name: Test (Windows)
+    - name: Test (Framework 4.6.1)
+      run: dotnet test --configuration Release --no-build output\Release\net461\*Tests.dll -- NUnit.TestOutputXml=TestResults
+      if: matrix.os != 'ubuntu-latest'
+
+    - name: Test (Framework and .NET latest)
       run: dotnet test --configuration Release --no-build -- NUnit.TestOutputXml=TestResults
       if: matrix.os != 'ubuntu-latest'