diff --git a/eng/build.ps1 b/eng/build.ps1
index 308aaca..35a7fbc 100644
--- a/eng/build.ps1
+++ b/eng/build.ps1
@@ -25,9 +25,7 @@ if ($build)
 {
 	foreach ($configuration in $configurations)
 	{
-		# Restore NuGet packages first
-		msbuild $slnPath /p:Configuration=$configuration /t:Restore /v:$msBuildVerbosity /nologo
-		msbuild $slnPath /p:Configuration=$configuration /v:$msBuildVerbosity /nologo
+		dotnet build $slnPath /p:Configuration=$configuration /v:$msBuildVerbosity /nologo
 	}
 }
 
@@ -60,7 +58,7 @@ if ($publish)
 					# The Publish target in "C:\Program Files\dotnet\sdk\3.1.101\Sdks\Microsoft.NET.Sdk\targets\Microsoft.NET.Sdk.CrossTargeting.targets"
 					# throws an exception if the .csproj uses <TargetFrameworks>. We have to override that and force a specific <TargetFramework> instead.
 					$targetFramework = GetXmlPropertyValue $profile 'TargetFramework'
-					msbuild $slnPath /t:Publish /p:PublishProfile=$profileName /p:TargetFramework=$targetFramework /v:$msBuildVerbosity /nologo /p:Configuration=$configuration
+					dotnet publish $slnPath /t:Publish /p:PublishProfile=$profileName /p:TargetFramework=$targetFramework /v:$msBuildVerbosity /nologo /p:Configuration=$configuration
 
 					Remove-Item "$artifactsPath\$profileName\*.pdb"
 
diff --git a/src/Diff.Net/Diff.Net.csproj b/src/Diff.Net/Diff.Net.csproj
index 369d3b2..20fb2f2 100644
--- a/src/Diff.Net/Diff.Net.csproj
+++ b/src/Diff.Net/Diff.Net.csproj
@@ -5,10 +5,12 @@
 		<UseWindowsForms>true</UseWindowsForms>
 		<ApplicationIcon>Images\DiffDotNet.ico</ApplicationIcon>
 		<ApplicationManifest>app.manifest</ApplicationManifest>
+		<GenerateResourceUsePreserializedResources>true</GenerateResourceUsePreserializedResources>
 	</PropertyGroup>
 
 	<ItemGroup>
 		<PackageReference Include="Menees.Diffs.Windows.Forms" Version="5.0.3" />
+		<PackageReference Include="System.Resources.Extensions" Version="6.0.0"/>
 	</ItemGroup>
 
 	<ItemGroup>
diff --git a/src/Directory.Build.props b/src/Directory.Build.props
index 2afae5a..d0f3fe9 100644
--- a/src/Directory.Build.props
+++ b/src/Directory.Build.props
@@ -22,6 +22,7 @@
 		<Nullable>enable</Nullable>
 		<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
 		<ProduceReferenceAssembly>false</ProduceReferenceAssembly>
+		<_SkipUpgradeNetAnalyzersNuGetWarning >true</_SkipUpgradeNetAnalyzersNuGetWarning>
 
 		<!-- Make the assembly, file, and NuGet package versions the same. -->
 		<Version>4.1.2</Version>