Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jasonleenaylor merged 2 commits into from
Mar 5, 2026
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f4c5a06
Chore: Bump Nuget minor versions
dependabot[bot] Mar 4, 2026
b0d19e4
fix spacing
papeh Mar 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Build/SilVersions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 7 additions & 5 deletions Build/Src/FwBuildTasks/FwBuildTasks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
2 changes: 1 addition & 1 deletion Build/Src/FwBuildTasks/app.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
15 changes: 8 additions & 7 deletions Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>

<!--
Expand Down Expand Up @@ -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>
5 changes: 4 additions & 1 deletion Src/InstallValidator/InstallValidatorTests/InstallValidatorTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
4 changes: 2 additions & 2 deletions Src/xWorks/UploadToWebonaryController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
{
Expand Down Expand Up @@ -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)
{
Expand Down
2 changes: 1 addition & 1 deletion Src/xWorks/xWorksTests/LcmJsonGeneratorTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)));
Expand Down
4 changes: 0 additions & 4 deletions Src/xWorks/xWorksTests/xWorksTests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
4 changes: 3 additions & 1 deletion test.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>.
Expand Down
Loading