Chore: Bump Microsoft.Build.Utilities.Core and 12 others (#734)

* Chore: Bump Microsoft.Build.Utilities.Core and 12 others

  Bumps Microsoft.Build.Utilities.Core from 18.0.2 to 18.3.3
  Bumps Microsoft.Extensions.DependencyModel to 2.1.0, 9.0.13
  Bumps Microsoft.NET.Test.Sdk from 17.11.1 to 17.14.1
  Bumps NUnit from 3.13.3 to 3.14.0
  Bumps NUnit3TestAdapter from 4.5.0 to 4.6.0
  Bumps SIL.BuildTasks from 3.1.2-beta0012 to 3.2.0
  Bumps SIL.LCModel from 11.0.0-beta0156 to 11.0.0-beta0158
  Bumps SIL.LCModel.Utils from 11.0.0-beta0156 to 11.0.0-beta0158
  Bumps SIL.TestUtilities from 12.0.0 to 12.0.1
  Bumps System.Drawing.Common from 9.0.9 to 9.0.13
  Bumps System.Reflection.Metadata from 9.0.0 to 9.0.13
  Bumps System.Resources.Extensions from 9.0.0 to 9.0.13
  Bumps System.Security.Permissions from 9.0.9 to 9.0.13
* Adjust to latest version of NUnit and Newtonsoft.Json

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Jason Naylor <jason_naylor@sil.org>

Author: dependabot[bot]

Build/SilVersions.props

@@ -12,7 +12,7 @@
 		=============================================================
 	-->
 	<PropertyGroup Label="SIL Ecosystem Versions">
-		<SilLcmVersion>11.0.0-beta0156</SilLcmVersion>
+		<SilLcmVersion>11.0.0-beta0158</SilLcmVersion>
 		<SilLibPalasoVersion>17.0.0</SilLibPalasoVersion>
 		<SilChorusVersion>6.0.0-beta0063</SilChorusVersion>
 		<SilMachineVersion>3.7.13</SilMachineVersion>

Build/Src/FwBuildTasks/FwBuildTasks.csproj

@@ -21,12 +21,14 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.0.2" />
-    <PackageReference Include="NUnit" Version="3.13.3" PrivateAssets="All" />
+    <PackageReference Include="Microsoft.Build.Utilities.Core" Version="18.3.3" />
+    <PackageReference Include="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
+    <PackageReference Include="NUnit" Version="3.14.0" PrivateAssets="All" />
     <PackageReference Include="NUnit3TestAdapter" Version="5.2.0" PrivateAssets="All" />
-    <PackageReference Include="SIL.BuildTasks" Version="3.1.2-beta0012" />
-    <PackageReference Include="SIL.TestUtilities" Version="12.0.0-*" PrivateAssets="All" />
-    <PackageReference Include="System.Reflection.Metadata" Version="9.0.0" />
+    <PackageReference Include="SIL.BuildTasks" Version="3.2.0" />
+    <PackageReference Include="SIL.TestUtilities" Version="12.0.1" PrivateAssets="All" />
+    <PackageReference Include="System.Reflection.Metadata" Version="9.0.13" />
+    <PackageReference Include="System.Resources.Extensions" Version="9.0.13" />
     <Reference Include="netstandard" />
     <Reference Include="Microsoft.Build.Framework" />
     <Reference Include="System.IO.Compression" />

Build/Src/FwBuildTasks/app.config

@@ -8,7 +8,7 @@
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>
 				<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-3.13.3.0" newVersion="3.13.3.0" />
+			<bindingRedirect oldVersion="0.0.0.0-3.14.0.0" newVersion="3.14.0.0" />
 			</dependentAssembly>
 		</assemblyBinding>
 	</runtime>

Directory.Packages.props

@@ -25,20 +25,21 @@
 	<ItemGroup Label="Transitive Pins">
 		<!-- System.Drawing.Common: SIL.LCModel.Core pulls 6.0.0 transitively,
 		     but ParatextData 9.5.x requires >= 9.0.9. Pin to 9.0.9. -->
-		<PackageVersion Include="System.Drawing.Common" Version="9.0.9" />
+		<PackageVersion Include="System.Drawing.Common" Version="9.0.13" />
+		<PackageVersion Include="System.Reflection.Metadata" Version="9.0.13" />
 		<!-- System.Resources.Extensions: required for non-string resources (images, icons)
 		     in .NET Framework SDK-style projects. -->
-		<PackageVersion Include="System.Resources.Extensions" Version="9.0.0" />
+		<PackageVersion Include="System.Resources.Extensions" Version="9.0.13" />
 		<!-- DependencyModel: icu.net wants 2.0.4, ParatextData wants 9.0.9.
 		     9.0.9 is backward compatible with 2.0.4 API surface. -->
-		<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.9" />
+		<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.13" />
 		<!-- System.Memory: ParatextData requires 4.6.3; other packages want 4.5.0–4.6.0. -->
 		<PackageVersion Include="System.Memory" Version="4.6.3" />
 		<!-- Microsoft.Bcl.HashCode: System.Resources.Extensions 9.0.0 requires HashCode. -->
 		<PackageVersion Include="Microsoft.Bcl.HashCode" Version="6.0.0" />
 		<!-- System.Security.Permissions (LT-22394): ProDotNetZip needs >= 8.0.0,
 		     System.Security.AccessControl needs >= 6.0.0. Pin to 9.0.9. -->
-		<PackageVersion Include="System.Security.Permissions" Version="9.0.9" />
+		<PackageVersion Include="System.Security.Permissions" Version="9.0.13" />
 	</ItemGroup>
 
 	<!--
@@ -148,9 +149,9 @@
 	-->
 	<ItemGroup Label="Test Infrastructure">
 		<PackageVersion Include="Moq" Version="4.20.70" />
-		<PackageVersion Include="NUnit" Version="3.13.3" />
-		<PackageVersion Include="NUnit3TestAdapter" Version="4.5.0" />
+		<PackageVersion Include="NUnit" Version="3.14.0" />
+		<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
 		<PackageVersion Include="NUnitForms" Version="1.3.1" />
-		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.1" />
+		<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
 	</ItemGroup>
 </Project>

Src/InstallValidator/InstallValidatorTests/InstallValidatorTests.csproj

@@ -37,12 +37,15 @@
     </Reference>
     <Reference Include="Microsoft.Build.Utilities.Core">
       <HintPath>../../../BuildTools/FwBuildTasks/$(Configuration)/Microsoft.Build.Utilities.Core.dll</HintPath>
-      <Private>False</Private>
+      <Private>True</Private>
     </Reference>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="../InstallValidator.csproj" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="../../AppForTests.config" Link="App.config" />
+  </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\CommonAssemblyInfo.cs">
       <Link>Properties\CommonAssemblyInfo.cs</Link>

Src/xWorks/UploadToWebonaryController.cs

@@ -240,7 +240,7 @@ private string PostContentToWebonary(UploadToWebonaryModel model, IUploadToWebon
 				string response;
 				try
 				{
-					response = client.PostDictionaryMetadata(targetURI, postContent.ToString(Formatting.None));
+					response = client.PostDictionaryMetadata(targetURI, postContent.ToString(Formatting.None, new JsonConverter[0]));
 				}
 				catch (WebonaryClient.WebonaryException e)
 				{
@@ -327,7 +327,7 @@ private bool PostEntriesToWebonary(UploadToWebonaryModel model, IUploadToWebonar
 				string response;
 				try
 				{
-					response = client.PostEntry(targetURI, postContent.ToString(Formatting.None), isReversal);
+					response = client.PostEntry(targetURI, postContent.ToString(Formatting.None, new JsonConverter[0]), isReversal);
 				}
 				catch (WebonaryClient.WebonaryException e)
 				{

Src/xWorks/xWorksTests/LcmJsonGeneratorTests.cs

@@ -1144,7 +1144,7 @@ public void SavePublishedJsonWithStyles_DisplayXhtmlPopulated()
 			var expectedWithoutWs = (JObject)JsonConvert.DeserializeObject(expectedResultsWithoutWs, new JsonSerializerSettings { Formatting = Formatting.None });
 			var expectedWithWs = (JObject)JsonConvert.DeserializeObject(expectedResultsWithWs, new JsonSerializerSettings { Formatting = Formatting.None });
 
-			dynamic jsonResult = JsonConvert.DeserializeObject(results[0][0].ToString(Formatting.None), new JsonSerializerSettings { Formatting = Formatting.None });
+			dynamic jsonResult = JsonConvert.DeserializeObject(results[0][0].ToString(Formatting.None, new JsonConverter[0]), new JsonSerializerSettings { Formatting = Formatting.None });
 			string actualReformatted = JsonConvert.SerializeObject(jsonResult, Formatting.Indented);
 			Assert.That(actualReformatted, Is.AnyOf(JsonConvert.SerializeObject(expectedWithoutWs, Formatting.Indented),
 				JsonConvert.SerializeObject(expectedWithWs, Formatting.Indented)));

Src/xWorks/xWorksTests/xWorksTests.csproj

@@ -41,10 +41,6 @@
   </ItemGroup>
   <ItemGroup>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="nunit.framework">
-      <HintPath>..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll</HintPath>
-      <SpecificVersion>False</SpecificVersion>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />

test.ps1

@@ -269,8 +269,10 @@ try {
             # Find all test DLLs, excluding:
             # - Test framework DLLs (nunit, Microsoft.*, xunit)
             # - External NuGet package tests (SIL.LCModel.*.Tests) - these test liblcm, not FieldWorks
+            # - SIL.WritingSystems.Tests - NuGet-delivered libpalaso test DLL compiled against
+            #   NUnit 3.13.3; loading it causes binding-redirect failures (not a FieldWorks test)
             $testDlls = Get-ChildItem -Path $outputDir -Filter "*Tests.dll" -ErrorAction SilentlyContinue |
-                Where-Object { $_.Name -notmatch '^nunit|^Microsoft|^xunit|^SIL\.LCModel' } |
+                Where-Object { $_.Name -notmatch '^nunit|^Microsoft|^xunit|^SIL\.LCModel|^SIL\.WritingSystems\.Tests' } |
                 Select-Object -ExpandProperty FullName
 
             # Some test projects (e.g., under Lib/src) are not copied into Output/<Configuration>.