Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions Build/SilVersions.props
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@
=============================================================
-->
<PropertyGroup Label="SIL Ecosystem Versions">
<SilLcmVersion>11.0.0-beta0167</SilLcmVersion>
<SilLibPalasoVersion>18.0.0-beta0013</SilLibPalasoVersion>
<SilLcmVersion>11.0.0-beta0170</SilLcmVersion>
<SilLibPalasoVersion>18.0.0-beta0027</SilLibPalasoVersion>
<SilLibPalasoL10nsVersion>18.0.0-beta0012</SilLibPalasoL10nsVersion>
<SilChorusVersion>6.0.0-beta0065</SilChorusVersion>
<SilChorusL10nsVersion>3.0.1</SilChorusL10nsVersion>
Expand Down
2 changes: 1 addition & 1 deletion Build/Src/Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

<!-- Use Update for root-pinned packages and Include for build-only packages absent from the root CPM file. -->
<ItemGroup Label="Build Tool Package Versions">
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.6.3" />
<PackageVersion Include="Microsoft.Build.Utilities.Core" Version="18.7.1" />
<PackageVersion Update="Microsoft.Extensions.DependencyModel" Version="2.1.0" />
<PackageVersion Update="NUnit3TestAdapter" Version="5.2.0" />
<PackageVersion Include="SIL.BuildTasks" Version="3.2.0" />
Expand Down
10 changes: 5 additions & 5 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
Expand Up @@ -29,22 +29,22 @@
9.0.16 breaks ICU initialization in the .NET Framework test host. -->
<!-- System.Drawing.Common: SIL.LCModel.Core pulls 6.0.0 transitively,
but ParatextData 9.5.x requires >= 9.0.9. Pin to 9.0.16. -->
<PackageVersion Include="System.Drawing.Common" Version="9.0.16" />
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.8" />
<PackageVersion Include="System.Drawing.Common" Version="9.0.17" />
<PackageVersion Include="System.Reflection.Metadata" Version="10.0.9" />
<!-- System.Resources.Extensions: required for non-string resources (images, icons)
in .NET Framework SDK-style projects. -->
<PackageVersion Include="System.Resources.Extensions" Version="9.0.16" />
<PackageVersion Include="System.Resources.Extensions" Version="9.0.17" />
<!-- DependencyModel: other current-line pins in this block move to 9.0.16,
but this package stays at 9.0.14. icu.net wants 2.0.4, ParatextData wants
>= 9.0.9, and 9.0.16 breaks ICU initialization in the .NET Framework test host. -->
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.16" />
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="9.0.17" />
<!-- 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 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.16. -->
<PackageVersion Include="System.Security.Permissions" Version="9.0.16" />
<PackageVersion Include="System.Security.Permissions" Version="9.0.17" />
<!-- System.Text.Encoding.CodePages: SIL.Machine requires 10.0.x,
other chains resolve to 9.0.9. Pin to 10.0.3 to match the plugin project. -->
<PackageVersion Include="System.Text.Encoding.CodePages" Version="10.0.3" />
Expand Down
2 changes: 1 addition & 1 deletion Obj/FwBuildTasks/FwBuildTasks.csproj.nuget.g.props
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<Import Project="$(NuGetPackageRoot)/nunit3testadapter/5.2.0/build/net462/NUnit3TestAdapter.props" Condition="Exists('$(NuGetPackageRoot)/nunit3testadapter/5.2.0/build/net462/NUnit3TestAdapter.props')" />
</ImportGroup>
<PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<PkgMicrosoft_Build_Framework Condition=" '$(PkgMicrosoft_Build_Framework)' == '' ">/home/dependabot/dependabot-updater/repo/packages/microsoft.build.framework/18.6.3</PkgMicrosoft_Build_Framework>
<PkgMicrosoft_Build_Framework Condition=" '$(PkgMicrosoft_Build_Framework)' == '' ">/home/dependabot/dependabot-updater/repo/packages/microsoft.build.framework/18.7.1</PkgMicrosoft_Build_Framework>
<PkgSIL_BuildTasks Condition=" '$(PkgSIL_BuildTasks)' == '' ">/home/dependabot/dependabot-updater/repo/packages/sil.buildtasks/3.2.0</PkgSIL_BuildTasks>
</PropertyGroup>
</Project>
4 changes: 2 additions & 2 deletions Obj/FwBuildTasks/FwBuildTasks.csproj.nuget.g.targets
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<Project ToolsVersion="14.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
<Import Project="$(NuGetPackageRoot)/system.valuetuple/4.6.1/buildTransitive/net471/System.ValueTuple.targets" Condition="Exists('$(NuGetPackageRoot)/system.valuetuple/4.6.1/buildTransitive/net471/System.ValueTuple.targets')" />
<Import Project="$(NuGetPackageRoot)/system.text.json/10.0.3/buildTransitive/net462/System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)/system.text.json/10.0.3/buildTransitive/net462/System.Text.Json.targets')" />
<Import Project="$(NuGetPackageRoot)/system.resources.extensions/9.0.16/buildTransitive/net462/System.Resources.Extensions.targets" Condition="Exists('$(NuGetPackageRoot)/system.resources.extensions/9.0.16/buildTransitive/net462/System.Resources.Extensions.targets')" />
<Import Project="$(NuGetPackageRoot)/system.text.json/10.0.4/buildTransitive/net462/System.Text.Json.targets" Condition="Exists('$(NuGetPackageRoot)/system.text.json/10.0.4/buildTransitive/net462/System.Text.Json.targets')" />
<Import Project="$(NuGetPackageRoot)/system.resources.extensions/9.0.17/buildTransitive/net462/System.Resources.Extensions.targets" Condition="Exists('$(NuGetPackageRoot)/system.resources.extensions/9.0.17/buildTransitive/net462/System.Resources.Extensions.targets')" />
<Import Project="$(NuGetPackageRoot)/microsoft.testing.platform/1.9.0/buildTransitive/netstandard2.0/Microsoft.Testing.Platform.targets" Condition="Exists('$(NuGetPackageRoot)/microsoft.testing.platform/1.9.0/buildTransitive/netstandard2.0/Microsoft.Testing.Platform.targets')" />
<Import Project="$(NuGetPackageRoot)/microsoft.testing.platform.msbuild/1.9.0/buildTransitive/Microsoft.Testing.Platform.MSBuild.targets" Condition="Exists('$(NuGetPackageRoot)/microsoft.testing.platform.msbuild/1.9.0/buildTransitive/Microsoft.Testing.Platform.MSBuild.targets')" />
<Import Project="$(NuGetPackageRoot)/nunit3testadapter/5.2.0/build/net462/NUnit3TestAdapter.targets" Condition="Exists('$(NuGetPackageRoot)/nunit3testadapter/5.2.0/build/net462/NUnit3TestAdapter.targets')" />
Expand Down
Loading