Skip to content

Commit a1c6094

Browse files
mark-silmark-sil
authored
Update dependencies: libPalaso, Chorus, LCM, L10NSharp (#487)
Update Palaso dependency from 15.0.0-beta0117 to 17.0.0-beta0072 Update Chorus dependency from 5.2.0-beta0003 to 6.0.0-beta0063 Update LCM dependency from 11.0.0-beta0136 to 11.0.0-beta0140 Update L10NSharp dependency from 7.0.0 to 9.0.0-beta0001
1 parent 8df2ecb commit a1c6094

13 files changed

Lines changed: 79 additions & 90 deletions

File tree

‎Build/buildLocalLibraries.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ libpalaso_dir=""
66
liblcm_dir=""
77
chorus_dir=""
88
libpalaso_net_ver="net462"
9-
liblcm_net_ver="net461"
9+
liblcm_net_ver="net462"
1010
chorus_net_ver="net462"
1111
mkall_targets_file="mkall.targets"
1212
packages_dir="../packages"

‎Build/mkall.targets‎

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -231,10 +231,10 @@
231231
<TeamCityUrl>https://build.palaso.org/</TeamCityUrl>
232232

233233
<!-- Versions of NuGet packages. These need to match the versions in nuget-common/packages.config -->
234-
<ChorusNugetVersion>5.2.0-beta0003</ChorusNugetVersion>
235-
<PalasoNugetVersion>15.0.0-beta0117</PalasoNugetVersion>
234+
<ChorusNugetVersion>6.0.0-beta0063</ChorusNugetVersion>
235+
<PalasoNugetVersion>17.0.0-beta0072</PalasoNugetVersion>
236236
<ParatextNugetVersion>9.4.0.1-beta</ParatextNugetVersion>
237-
<LcmNugetVersion>11.0.0-beta0136</LcmNugetVersion>
237+
<LcmNugetVersion>11.0.0-beta0140</LcmNugetVersion>
238238
<IcuNugetVersion>70.1.123</IcuNugetVersion>
239239
<HermitCrabNugetVersion>3.7.4</HermitCrabNugetVersion>
240240
<IPCFrameworkVersion>1.1.1-beta0001</IPCFrameworkVersion>
@@ -275,6 +275,7 @@
275275
<PalasoFiles Include="SIL.Lexicon.dll"/>
276276
<PalasoFiles Include="SIL.TestUtilities.dll"/>
277277
<PalasoFiles Include="L10NSharp.dll"/>
278+
<PalasoFiles Include="L10NSharp.Windows.Forms.dll"/>
278279
<PalasoFiles Include="Interop.WIA.dll"/>
279280
<PalasoFiles Include="lib/win-x86/irrKlang.NET4.dll" Condition="'$(OS)'=='Windows_NT' AND '$(Platform)'!='x64'"/>
280281
<PalasoFiles Include="lib/win-x64/irrKlang.NET4.dll" Condition="'$(OS)'=='Windows_NT' AND '$(Platform)'=='x64'"/>
@@ -411,17 +412,17 @@
411412
<!-- If the build is run with /p:UsingLocalLibraryBuild use that for NoSymbols when the package comes from liblcm, libpalaso, or chorus -->
412413
<!-- a true value will skip downloading and extracting the .pdb files from the nuget server. -->
413414
<!-- If this is used with buildLocalLibraries.sh you should end up with locally built .pdb files -->
414-
<SILNugetPackages Include="SIL.LCModel"><Version>$(LcmNugetVersion)</Version><Path>lib/net461/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
415+
<SILNugetPackages Include="SIL.LCModel"><Version>$(LcmNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
415416
<SILNugetPackages Include="SIL.LCModel"><Version>$(LcmNugetVersion)</Version><Path>contentFiles/**/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
416-
<SILNugetPackages Include="SIL.LCModel.Build.Tasks"><Version>$(LcmNugetVersion)</Version><Path>tools/net461/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
417-
<SILNugetPackages Include="SIL.LCModel.Core"><Version>$(LcmNugetVersion)</Version><Path>lib/net461/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
417+
<SILNugetPackages Include="SIL.LCModel.Build.Tasks"><Version>$(LcmNugetVersion)</Version><Path>tools/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
418+
<SILNugetPackages Include="SIL.LCModel.Core"><Version>$(LcmNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
418419
<SILNugetPackages Include="SIL.LCModel.Core"><Version>$(LcmNugetVersion)</Version><Path>contentFiles/**/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
419-
<SILNugetPackages Include="SIL.LCModel.Core.Tests"><Version>$(LcmNugetVersion)</Version><Path>lib/net461/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
420-
<SILNugetPackages Include="SIL.LCModel.FixData"><Version>$(LcmNugetVersion)</Version><Path>lib/net461/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
421-
<SILNugetPackages Include="SIL.LCModel.Utils"><Version>$(LcmNugetVersion)</Version><Path>lib/net461/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
422-
<SILNugetPackages Include="SIL.LCModel.Utils.Tests"><Version>$(LcmNugetVersion)</Version><Path>lib/net461/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
423-
<SILNugetPackages Include="SIL.LCModel.Tests"><Version>$(LcmNugetVersion)</Version><Path>lib/net461/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
424-
<SILNugetPackages Include="SIL.LCModel.Tools"><Version>$(LcmNugetVersion)</Version><Path>lib/net461/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
420+
<SILNugetPackages Include="SIL.LCModel.Core.Tests"><Version>$(LcmNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
421+
<SILNugetPackages Include="SIL.LCModel.FixData"><Version>$(LcmNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
422+
<SILNugetPackages Include="SIL.LCModel.Utils"><Version>$(LcmNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
423+
<SILNugetPackages Include="SIL.LCModel.Utils.Tests"><Version>$(LcmNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
424+
<SILNugetPackages Include="SIL.LCModel.Tests"><Version>$(LcmNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
425+
<SILNugetPackages Include="SIL.LCModel.Tools"><Version>$(LcmNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
425426
<SILNugetPackages Include="CommonServiceLocator"><Version>2.0.7</Version><Path>lib/net46/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
426427
<SILNugetPackages Include="WeCantSpell.Hunspell"><Version>6.0.0</Version><Path>lib/netstandard2.0/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
427428
<SILNugetPackages Include="protobuf-net"><Version>2.4.6</Version><Path>lib/net40/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
@@ -456,17 +457,19 @@
456457
<SILNugetPackages Include="System.Drawing.Common"><Version>9.0.0</Version><Path>lib/net462/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
457458
<SILNugetPackages Include="System.Memory"><Version>4.5.4</Version><Path>lib/net461/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
458459
<SILNugetPackages Include="System.Resources.Extensions"><Version>4.6.0</Version><Path>lib/netstandard2.0/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
459-
<SILNugetPackages Include="L10NSharp"><Version>7.0.0</Version><Path>lib/net461/*.*</Path></SILNugetPackages>
460+
<SILNugetPackages Include="L10NSharp"><Version>9.0.0-beta0001</Version><Path>lib/net461/*.*</Path></SILNugetPackages>
461+
<SILNugetPackages Include="L10NSharp.Windows.Forms"><Version>9.0.0-beta0001</Version><Path>lib/net461/*.*</Path></SILNugetPackages>
460462
<SILNugetPackages Include="Enchant.Net"><Version>1.4.3-beta0010</Version><Path>lib/net461/*.*</Path></SILNugetPackages>
461463
<SILNugetPackages Include="Enchant.Net"><Version>1.4.3-beta0010</Version><Path>contentFiles/any/any/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
462464
<SILNugetPackages Include="NDesk.DBus"><Version>0.15.0</Version><Path>lib/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
463465
<SILNugetPackages Include="Spart"><Version>1.0.0</Version><Path>lib/net461/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
464466
<SILNugetPackages Include="TagLibSharp"><Version>2.2.0</Version><Path>lib/net45/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
465467
<SILNugetPackages Include="Tenuto"><Version>1.0.0.39</Version><Path>lib/net461/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
466468
<SILNugetPackages Include="relaxngDatatype"><Version>1.0.0.39</Version><Path>lib/net461/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
469+
<SILNugetPackages Include="KeymanLegacyBundle"><Version>1.0.0</Version><Path>lib/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
467470
<!-- Chorus and related packages -->
468-
<SILNugetPackages Include="SIL.Chorus.LibChorus"><Version>$(ChorusNugetVersion)</Version><Path>lib/net461/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
469-
<SILNugetPackages Include="SIL.Chorus.App"><Version>$(ChorusNugetVersion)</Version><Path>lib/net461/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
471+
<SILNugetPackages Include="SIL.Chorus.LibChorus"><Version>$(ChorusNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
472+
<SILNugetPackages Include="SIL.Chorus.App"><Version>$(ChorusNugetVersion)</Version><Path>lib/net462/*.*</Path><NoSymbols>$(UsingLocalLibraryBuild)</NoSymbols></SILNugetPackages>
470473
<SILNugetPackages Include="Autofac"><Version>4.9.4</Version><Path>lib/net45/*.*</Path><NoSymbols>true</NoSymbols></SILNugetPackages>
471474
<SILNugetPackages Include="Vulcan.Uczniowie.HelpProvider"><Version>1.0.16</Version><Path>lib/net461/*.*</Path></SILNugetPackages>
472475
<!-- HermitCrab and related packages -->
@@ -588,7 +591,7 @@
588591
<NuGottenFiles Include="$(PackagesDir)/NAudio.Lame.1.1.5/lib/netstandard2.0/NAudio.Lame.dll"/>
589592
<NuGottenFiles Include="$(PackagesDir)/NAudio.Lame.1.1.5/build/libmp3lame.32.dll" Condition="'$(OS)'=='Windows_NT' AND '$(arch)'!='x64'"/>
590593
<NuGottenFiles Include="$(PackagesDir)/NAudio.Lame.1.1.5/build/libmp3lame.64.dll" Condition="'$(OS)'=='Windows_NT' AND '$(arch)'=='x64'"/>
591-
<NuGottenFiles Include="$(PackagesDir)/Newtonsoft.Json.13.0.2/lib/net45/Newtonsoft.Json.dll"/>
594+
<NuGottenFiles Include="$(PackagesDir)/Newtonsoft.Json.13.0.3/lib/net45/Newtonsoft.Json.dll"/>
592595
<NuGottenFiles Include="$(PackagesDir)/ParatextData.$(ParatextNugetVersion)/lib/netstandard2.0/Paratext.LexicalContracts.dll" />
593596
<NuGottenFiles Include="$(PackagesDir)/ParatextData.$(ParatextNugetVersion)/lib/netstandard2.0/Paratext.LexicalContractsV2.dll" />
594597
<NuGottenFiles Include="$(PackagesDir)/ParatextData.$(ParatextNugetVersion)/lib/netstandard2.0/ParatextData.dll"/>

‎Build/nuget-common/packages.config‎

Lines changed: 31 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@
1919
<package id="icu.net" version="3.0.0-beta.297" exclude="Build,Analyzers" targetFramework="netstandard2.0" />
2020
<package id="Icu4c.Win.Fw.Lib" version="70.1.123" />
2121
<package id="ILRepack" version="2.0.16" targetFramework="net461" />
22-
<package id="L10NSharp" version="7.0.0" />
22+
<package id="KeymanLegacyBundle" version="1.0.0" />
23+
<package id="L10NSharp" version="9.0.0-beta0001" />
24+
<package id="L10NSharp.Windows.Forms" version="9.0.0-beta0001" />
2325
<package id="Markdig.Signed" version="0.30.0" targetFramework="net461" />
2426
<package id="Microsoft.Extensions.DependencyModel" version="2.0.4" targetFramework="net461" />
2527
<package id="mixpanel-csharp" version="6.0.0" targetFramework="net461" />
@@ -29,7 +31,7 @@
2931
<package id="NAudio.Lame" version="1.1.5" targetFramework="net461" />
3032
<package id="NAudio" version="1.10.0" targetFramework="net461" />
3133
<package id="NDesk.DBus" version="0.15.0" targetFramework="net461" />
32-
<package id="Newtonsoft.Json" version="13.0.2" targetFramework="net461" />
34+
<package id="Newtonsoft.Json" version="13.0.3" targetFramework="net45" />
3335
<package id="NUnit" version="3.13.3" targetFramework="net45" />
3436
<package id="NUnit.ConsoleRunner" version="3.12.0" targetFramework="net40" />
3537
<package id="NUnit.Extension.NUnitV2ResultWriter" version="3.7.0" />
@@ -38,43 +40,43 @@
3840
<package id="protobuf-net" version="2.4.6" exclude="Build,Analyzers" />
3941
<package id="Sandwych.QuickGraph.Core" version="1.0.0" />
4042
<package id="SharpZipLib" version="1.4.0" exclude="Build,Analyzers" />
41-
<package id="SIL.Archiving" version="15.0.0-beta0117" targetFramework="net461" />
43+
<package id="SIL.Archiving" version="17.0.0-beta0072" targetFramework="net462" />
4244
<package id="SIL.BuildTasks" version="2.6.0-beta0008" />
43-
<package id="SIL.Chorus.App" version="5.2.0-beta0003" targetFramework="net461" />
45+
<package id="SIL.Chorus.App" version="6.0.0-beta0063" targetFramework="net462" />
4446
<package id="SIL.IdlImporter" version="4.0.0-beta0052" targetFramework="net8" />
45-
<package id="SIL.Chorus.l10ns" version="3.0.1" targetFramework="net461" />
46-
<package id="SIL.Chorus.LibChorus" version="5.2.0-beta0003" targetFramework="net461" />
47-
<package id="SIL.Core.Desktop" version="15.0.0-beta0117" targetFramework="net461" />
47+
<package id="SIL.Chorus.l10ns" version="3.0.1" targetFramework="net462" />
48+
<package id="SIL.Chorus.LibChorus" version="6.0.0-beta0063" targetFramework="net462" />
49+
<package id="SIL.Core.Desktop" version="17.0.0-beta0072" targetFramework="net462" />
4850
<!-- A few SIL.* packages version 8.1.0-beta0035 are dependencies of ParatextData -->
49-
<package id="SIL.Core" version="15.0.0-beta0117" targetFramework="net461" />
51+
<package id="SIL.Core" version="17.0.0-beta0072" targetFramework="net462" />
5052
<package id="SIL.Core" version="8.1.0-beta0035" targetFramework="net461" />
5153
<package id="SIL.DesktopAnalytics" version="4.0.0" targetFramework="net461" />
5254
<package id="SIL.FLExBridge.IPCFramework" version="1.1.1-beta0001" targetFramework="net461" />
53-
<package id="SIL.LCModel.Build.Tasks" version="11.0.0-beta0136" targetFramework="net461" />
54-
<package id="SIL.LCModel.Core.Tests" version="11.0.0-beta0136" targetFramework="net461" />
55-
<package id="SIL.LCModel.Core" version="11.0.0-beta0136" targetFramework="net461" />
56-
<package id="SIL.LCModel.FixData" version="11.0.0-beta0136" targetFramework="net461" />
57-
<package id="SIL.LCModel.Tests" version="11.0.0-beta0136" targetFramework="net461" />
58-
<package id="SIL.LCModel.Tools" version="11.0.0-beta0136" targetFramework="net461" />
59-
<package id="SIL.LCModel.Utils.Tests" version="11.0.0-beta0136" targetFramework="net461" />
60-
<package id="SIL.LCModel.Utils" version="11.0.0-beta0136" targetFramework="net461" />
61-
<package id="SIL.LCModel" version="11.0.0-beta0136" targetFramework="net461" />
62-
<package id="SIL.Lexicon" version="15.0.0-beta0117" targetFramework="net462" />
55+
<package id="SIL.LCModel.Build.Tasks" version="11.0.0-beta0140" targetFramework="net462" />
56+
<package id="SIL.LCModel.Core.Tests" version="11.0.0-beta0140" targetFramework="net462" />
57+
<package id="SIL.LCModel.Core" version="11.0.0-beta0140" targetFramework="net462" />
58+
<package id="SIL.LCModel.FixData" version="11.0.0-beta0140" targetFramework="net462" />
59+
<package id="SIL.LCModel.Tests" version="11.0.0-beta0140" targetFramework="net462" />
60+
<package id="SIL.LCModel.Tools" version="11.0.0-beta0140" targetFramework="net462" />
61+
<package id="SIL.LCModel.Utils.Tests" version="11.0.0-beta0140" targetFramework="net462" />
62+
<package id="SIL.LCModel.Utils" version="11.0.0-beta0140" targetFramework="net462" />
63+
<package id="SIL.LCModel" version="11.0.0-beta0140" targetFramework="net462" />
64+
<package id="SIL.Lexicon" version="17.0.0-beta0072" targetFramework="net462" />
6365
<package id="SIL.libpalaso.l10ns" version="6.0.0" targetFramework="net461" />
64-
<package id="SIL.Lift" version="15.0.0-beta0117" targetFramework="net462" />
65-
<package id="SIL.Media" version="15.0.0-beta0117" targetFramework="net462" />
66+
<package id="SIL.Lift" version="17.0.0-beta0072" targetFramework="net462" />
67+
<package id="SIL.Media" version="17.0.0-beta0072" targetFramework="net462" />
6668
<package id="SIL.Machine" version="3.7.4" targetFramework="netstandard2.0" />
6769
<package id="SIL.Machine.Morphology.HermitCrab" version="3.7.4" targetFramework="netstandard2.0" />
6870
<package id="SIL.ParatextShared" version="7.4.0.1" targetFramework="net40" /> <!-- REVIEW (Hasso) 2023.05: do we still integrate with PT 7? -->
69-
<package id="SIL.Scripture" version="15.0.0-beta0117" targetFramework="net461" />
70-
<package id="SIL.TestUtilities" version="15.0.0-beta0117" targetFramework="net461" />
71-
<package id="SIL.Windows.Forms.Archiving" version="15.0.0-beta0117" targetFramework="net461" />
72-
<package id="SIL.Windows.Forms.GeckoBrowserAdapter" version="15.0.0-beta0117" targetFramework="net461" />
73-
<package id="SIL.Windows.Forms.Keyboarding" version="15.0.0-beta0117" targetFramework="net461" />
74-
<package id="SIL.Windows.Forms.WritingSystems" version="15.0.0-beta0117" targetFramework="net461" />
75-
<package id="SIL.Windows.Forms" version="15.0.0-beta0117" targetFramework="net461" />
76-
<package id="SIL.WritingSystems.Tests" version="15.0.0-beta0117" targetFramework="net461" />
77-
<package id="SIL.WritingSystems" version="15.0.0-beta0117" targetFramework="net461" />
71+
<package id="SIL.Scripture" version="17.0.0-beta0072" targetFramework="net462" />
72+
<package id="SIL.TestUtilities" version="17.0.0-beta0072" targetFramework="net462" />
73+
<package id="SIL.Windows.Forms.Archiving" version="17.0.0-beta0072" targetFramework="net462" />
74+
<package id="SIL.Windows.Forms.GeckoBrowserAdapter" version="17.0.0-beta0072" targetFramework="net462" />
75+
<package id="SIL.Windows.Forms.Keyboarding" version="17.0.0-beta0072" targetFramework="net462" />
76+
<package id="SIL.Windows.Forms.WritingSystems" version="17.0.0-beta0072" targetFramework="net462" />
77+
<package id="SIL.Windows.Forms" version="17.0.0-beta0072" targetFramework="net462" />
78+
<package id="SIL.WritingSystems.Tests" version="17.0.0-beta0072" targetFramework="net462" />
79+
<package id="SIL.WritingSystems" version="17.0.0-beta0072" targetFramework="net462" />
7880
<package id="Spart" version="1.0.0" targetFramework="net461" />
7981
<package id="structuremap.patched" version="4.7.3" exclude="Build,Analyzers" />
8082
<package id="System.Buffers" version="4.6.0" />

‎Src/AppForTests.config‎

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,6 @@
3232
<assemblyIdentity name="System.Drawing.Common" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral"/>
3333
<bindingRedirect oldVersion="0.0.0.0-6.0.0.0" newVersion="9.0.0.0"/>
3434
</dependentAssembly>
35-
<dependentAssembly>
36-
<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
37-
<bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
38-
</dependentAssembly>
3935
<dependentAssembly>
4036
<assemblyIdentity name="nunit.framework" publicKeyToken="2638cd05610744eb" culture="neutral" />
4137
<bindingRedirect oldVersion="0.0.0.0-3.13.3.0" newVersion="3.13.3.0" />
@@ -50,27 +46,27 @@ Comment out the following section when the ParatextData and FieldWorks versions
5046
<dependentAssembly>
5147
<assemblyIdentity name="SIL.Core" publicKeyToken="cab3c8c5232dfcf2" culture="neutral" />
5248
<!-- Until Chorus starts using libpalaso 13.0.0.0 -->
53-
<bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
49+
<bindingRedirect oldVersion="0.0.0.0-17.0.0.0" newVersion="17.0.0.0" />
5450
</dependentAssembly>
5551
<dependentAssembly>
5652
<assemblyIdentity name="SIL.Lexicon" publicKeyToken="cab3c8c5232dfcf2" culture="neutral" />
5753
<!-- Until Chorus starts using libpalaso 13.0.0.0 -->
58-
<bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
54+
<bindingRedirect oldVersion="0.0.0.0-17.0.0.0" newVersion="17.0.0.0" />
5955
</dependentAssembly>
6056
<dependentAssembly>
6157
<assemblyIdentity name="SIL.Scripture" publicKeyToken="cab3c8c5232dfcf2" culture="neutral" />
6258
<!-- Until Chorus starts using libpalaso 13.0.0.0 -->
63-
<bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
59+
<bindingRedirect oldVersion="0.0.0.0-17.0.0.0" newVersion="17.0.0.0" />
6460
</dependentAssembly>
6561
<dependentAssembly>
6662
<assemblyIdentity name="SIL.TestUtilities" publicKeyToken="cab3c8c5232dfcf2" culture="neutral" />
6763
<!-- Until Chorus starts using libpalaso 13.0.0.0 -->
68-
<bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
64+
<bindingRedirect oldVersion="0.0.0.0-17.0.0.0" newVersion="17.0.0.0" />
6965
</dependentAssembly>
7066
<dependentAssembly>
7167
<assemblyIdentity name="SIL.WritingSystems" publicKeyToken="cab3c8c5232dfcf2" culture="neutral" />
7268
<!-- Until Chorus starts using libpalaso 13.0.0.0 -->
73-
<bindingRedirect oldVersion="0.0.0.0-15.0.0.0" newVersion="15.0.0.0" />
69+
<bindingRedirect oldVersion="0.0.0.0-17.0.0.0" newVersion="17.0.0.0" />
7470
</dependentAssembly>
7571
</assemblyBinding>
7672
</runtime>

0 commit comments

Comments
 (0)