From f22556ec737651532f15e86065a675ec6684d78e Mon Sep 17 00:00:00 2001
From: josephmyers <43733878+josephmyers@users.noreply.github.com>
Date: Fri, 6 Sep 2024 09:44:03 +0700
Subject: [PATCH] Fix build errors (#1345)

---
 .github/workflows/l10n-packaging.yml  | 4 +++-
 .github/workflows/l10n-source.yml     | 4 +++-
 SIL.WritingSystems.Tests/SldrTests.cs | 7 +++++++
 3 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/l10n-packaging.yml b/.github/workflows/l10n-packaging.yml
index 93940f2ed..4203b7e98 100644
--- a/.github/workflows/l10n-packaging.yml
+++ b/.github/workflows/l10n-packaging.yml
@@ -15,7 +15,7 @@ jobs:
   package-l10n:
     strategy:
       fail-fast: false
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     steps:
     - name: Checkout
@@ -26,6 +26,8 @@ jobs:
     # Install the .NET Core workload
     - name: Install .NET Core
       uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
+      with:
+        dotnet-version: 8.x
 
     # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe (Windows OS)
diff --git a/.github/workflows/l10n-source.yml b/.github/workflows/l10n-source.yml
index 146e69a00..5b736c725 100644
--- a/.github/workflows/l10n-source.yml
+++ b/.github/workflows/l10n-source.yml
@@ -15,7 +15,7 @@ jobs:
   extract-and-upload-strings:
     strategy:
       fail-fast: false
-    runs-on: windows-2019
+    runs-on: windows-latest
 
     steps:
     - name: Checkout
@@ -26,6 +26,8 @@ jobs:
       # Install the .NET Core workload
     - name: Install .NET Core
       uses: actions/setup-dotnet@6bd8b7f7774af54e05809fcc5431931b3eb1ddee # v4.0.1
+      with:
+        dotnet-version: 8.x
 
     # Add  MSBuild to the PATH: https://github.com/microsoft/setup-msbuild
     - name: Setup MSBuild.exe (Windows OS)
diff --git a/SIL.WritingSystems.Tests/SldrTests.cs b/SIL.WritingSystems.Tests/SldrTests.cs
index cff4632a7..6c75407b6 100644
--- a/SIL.WritingSystems.Tests/SldrTests.cs
+++ b/SIL.WritingSystems.Tests/SldrTests.cs
@@ -68,6 +68,13 @@ public void Dispose()
 			}
 		}
 
+		[SetUp]
+		public void Setup()
+		{
+			if (!Sldr.IsInitialized)
+				Sldr.Initialize(true, Sldr.DefaultSldrCachePath);
+		}
+
 		[Test]
 		public void GetLdmlFile_EmptyPath_Throws()
 		{