diff --git a/.github/workflows/ci+cd.yml b/.github/workflows/ci+cd.yml
index cf5c2be5..b7a8733c 100644
--- a/.github/workflows/ci+cd.yml
+++ b/.github/workflows/ci+cd.yml
@@ -33,16 +33,18 @@ jobs:
         fetch-depth: 0 # fetch full history for GitVersion
 
     - name: Setup .NET
-      uses: actions/setup-dotnet@c0d4ad69d8bd405d234f1c9166d383b7a4f69ed8 # v2.1.0
+      uses: actions/setup-dotnet@4d6c8fcf3c8f7a60068d26b594648e99df24cee3 # v4.0.0
       with:
-        dotnet-version: 6.0.x
+        dotnet-version: |
+          6.0.x
+          8.0.x
 
     - name: Restore
       run: dotnet restore
 
     - name: Build
       run: dotnet build --no-restore -c Release
-      
+
     - name: Install python2 for test execution
       run: sudo apt-get install python2
       if: matrix.os == 'ubuntu-latest'
diff --git a/Directory.Build.props b/Directory.Build.props
index c0301c68..264f8f66 100644
--- a/Directory.Build.props
+++ b/Directory.Build.props
@@ -29,6 +29,6 @@ See full changelog at https://github.com/sillsdev/chorus/blob/master/CHANGELOG.m
     RuntimeIdentifiers when building with .NET 5 on AppVeyor. Otherwise the build
     fails with an error that there is no target for'net461/win7-x86'. -->
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <RuntimeIdentifiers>win7-x86;win7-x64</RuntimeIdentifiers>
+    <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
   </PropertyGroup>
 </Project>
\ No newline at end of file
diff --git a/src/ChorusMerge/ChorusMerge.csproj b/src/ChorusMerge/ChorusMerge.csproj
index aede7c9e..562d4a4a 100644
--- a/src/ChorusMerge/ChorusMerge.csproj
+++ b/src/ChorusMerge/ChorusMerge.csproj
@@ -5,7 +5,7 @@
     <AssemblyTitle>ChorusMerge</AssemblyTitle>
     <PackageId>SIL.Chorus.ChorusMerge</PackageId>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net461;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;net6.0;net8.0</TargetFrameworks>
     <RepositoryUrl>https://github.com/sillsdev/chorus.git</RepositoryUrl>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
   </PropertyGroup>
diff --git a/src/Installer/ChorusMergeModule.wixproj b/src/Installer/ChorusMergeModule.wixproj
index cb054a78..63a9e0e6 100644
--- a/src/Installer/ChorusMergeModule.wixproj
+++ b/src/Installer/ChorusMergeModule.wixproj
@@ -18,6 +18,8 @@
 	<DefineConstants>ProductVersion=$(ProductVersion)</DefineConstants>
 	<DefineConstants Condition="'$(Configuration)' == 'Debug'">Debug;$(DefineConstants)</DefineConstants>
 	<SuppressPdbOutput>True</SuppressPdbOutput>
+	<!-- Per https://wixtoolset.org/docs/tools/validation/, validation doesn't work in CIs like GitHub Actions -->
+	<SuppressValidation>true</SuppressValidation>
   </PropertyGroup>
   <ItemGroup>
 	<Compile Include="GeneratedMercurial.wxs" />
diff --git a/src/LibChorusTests/LibChorus.Tests.csproj b/src/LibChorusTests/LibChorus.Tests.csproj
index 09123e66..1654a1ba 100644
--- a/src/LibChorusTests/LibChorus.Tests.csproj
+++ b/src/LibChorusTests/LibChorus.Tests.csproj
@@ -4,7 +4,7 @@
     <RootNamespace>LibChorus.Tests</RootNamespace>
     <AssemblyTitle>LibChorus.Tests</AssemblyTitle>
     <Description>Unit tests for LibChorus.dll</Description>
-    <TargetFrameworks>net461;net6.0</TargetFrameworks>
+    <TargetFrameworks>net461;net6.0;net8.0</TargetFrameworks>
     <IsTestProject>true</IsTestProject>
     <IsPackable>false</IsPackable>
   </PropertyGroup>
diff --git a/src/LibChorusTests/notes/AnnotationRepositoryTests.cs b/src/LibChorusTests/notes/AnnotationRepositoryTests.cs
index 9c2e7882..441a8438 100644
--- a/src/LibChorusTests/notes/AnnotationRepositoryTests.cs
+++ b/src/LibChorusTests/notes/AnnotationRepositoryTests.cs
@@ -224,7 +224,7 @@ public void AddAnnotation_NotifiesIndices()
 		// the setup of the watcher or the code in Save that tries to prevent the notifications at all,
 		// which is more than half the code this test wants to exercise.
 		[Test]
-		[Platform(Exclude = "Win", Reason = "flaky (on both platforms)")]
+		[Ignore("flaky (on both platforms)")]
 		public void ExternalFileModification_NotifiesIndices_ButSaveDoesNot()
 		{
 			const int SleepTime = 25; // milliseconds