From f4c5a063918aea8f3d71c12d15b43ce70bbfc64a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 4 Mar 2026 16:16:47 +0000 Subject: [PATCH 1/2] Chore: Bump Nuget minor versions - 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 --- Build/SilVersions.props | 2 +- Build/Src/FwBuildTasks/FwBuildTasks.csproj | 12 +++++++----- Build/Src/FwBuildTasks/app.config | 2 +- Directory.Packages.props | 15 ++++++++------- .../InstallValidatorTests.csproj | 5 ++++- Src/xWorks/UploadToWebonaryController.cs | 4 ++-- Src/xWorks/xWorksTests/LcmJsonGeneratorTests.cs | 2 +- Src/xWorks/xWorksTests/xWorksTests.csproj | 4 ---- test.ps1 | 4 +++- 9 files changed, 27 insertions(+), 23 deletions(-) diff --git a/Build/SilVersions.props b/Build/SilVersions.props index de5e0cd9da..e99438cac3 100644 --- a/Build/SilVersions.props +++ b/Build/SilVersions.props @@ -12,7 +12,7 @@ ============================================================= --> - 11.0.0-beta0156 + 11.0.0-beta0158 17.0.0 6.0.0-beta0063 3.7.13 diff --git a/Build/Src/FwBuildTasks/FwBuildTasks.csproj b/Build/Src/FwBuildTasks/FwBuildTasks.csproj index ca96a9f190..3c5488190c 100644 --- a/Build/Src/FwBuildTasks/FwBuildTasks.csproj +++ b/Build/Src/FwBuildTasks/FwBuildTasks.csproj @@ -21,12 +21,14 @@ false - - + + + - - - + + + + diff --git a/Build/Src/FwBuildTasks/app.config b/Build/Src/FwBuildTasks/app.config index 3ec678391c..bc9ba036c7 100644 --- a/Build/Src/FwBuildTasks/app.config +++ b/Build/Src/FwBuildTasks/app.config @@ -8,7 +8,7 @@ - + diff --git a/Directory.Packages.props b/Directory.Packages.props index 7c13c8d7af..830029ab74 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -25,20 +25,21 @@ - + + - + - + - + - - + + - + diff --git a/Src/InstallValidator/InstallValidatorTests/InstallValidatorTests.csproj b/Src/InstallValidator/InstallValidatorTests/InstallValidatorTests.csproj index 02af747cfa..b5f34fede6 100644 --- a/Src/InstallValidator/InstallValidatorTests/InstallValidatorTests.csproj +++ b/Src/InstallValidator/InstallValidatorTests/InstallValidatorTests.csproj @@ -37,12 +37,15 @@ ../../../BuildTools/FwBuildTasks/$(Configuration)/Microsoft.Build.Utilities.Core.dll - False + True + + + Properties\CommonAssemblyInfo.cs diff --git a/Src/xWorks/UploadToWebonaryController.cs b/Src/xWorks/UploadToWebonaryController.cs index 6bcfa7c473..d6f62885c2 100644 --- a/Src/xWorks/UploadToWebonaryController.cs +++ b/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) { diff --git a/Src/xWorks/xWorksTests/LcmJsonGeneratorTests.cs b/Src/xWorks/xWorksTests/LcmJsonGeneratorTests.cs index ad17075e51..1cb1bd38f5 100644 --- a/Src/xWorks/xWorksTests/LcmJsonGeneratorTests.cs +++ b/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))); diff --git a/Src/xWorks/xWorksTests/xWorksTests.csproj b/Src/xWorks/xWorksTests/xWorksTests.csproj index f81af14f8d..cd017d24cd 100644 --- a/Src/xWorks/xWorksTests/xWorksTests.csproj +++ b/Src/xWorks/xWorksTests/xWorksTests.csproj @@ -41,10 +41,6 @@ - - ..\..\..\packages\NUnit.3.13.3\lib\net45\nunit.framework.dll - False - diff --git a/test.ps1 b/test.ps1 index e746ef20fd..1b03d9f5c1 100644 --- a/test.ps1 +++ b/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/. From b0d19e4685fc15a10c7c89c20e58fe61a026dda7 Mon Sep 17 00:00:00 2001 From: Hasso Date: Thu, 5 Mar 2026 08:35:53 -0600 Subject: [PATCH 2/2] fix spacing --- Build/Src/FwBuildTasks/FwBuildTasks.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Build/Src/FwBuildTasks/FwBuildTasks.csproj b/Build/Src/FwBuildTasks/FwBuildTasks.csproj index 3c5488190c..8d65ddf1d5 100644 --- a/Build/Src/FwBuildTasks/FwBuildTasks.csproj +++ b/Build/Src/FwBuildTasks/FwBuildTasks.csproj @@ -28,7 +28,7 @@ - +