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..8d65ddf1d5 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/.