Merge branch 'release/9.1' into RootNames

sillsdev · Jun 20, 2024 · 5a8c960 · 5a8c960
2 parents 493fde8 + 4549fe5
commit 5a8c960
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/Build/mkall.targets b/Build/mkall.targets
@@ -654,7 +654,7 @@
 			<NuGottenFiles Include="$(PackagesDir)/Analytics.3.6.0/lib/net461/Analytics.dll"/>
 			<NuGottenFiles Include="$(PackagesDir)/DocumentFormat.OpenXml.2.20.0/lib/net46/DocumentFormat.OpenXml.dll"/>
 			<NuGottenFiles Include="$(PackagesDir)/DotNetZip.1.16.0/lib/net40/*.*"/>
-			<NuGottenFiles Include="$(PackagesDir)/icu.net.2.9.0-beta.13/lib/net451/icu.net.dll"/>
+			<NuGottenFiles Include="$(PackagesDir)/icu.net.2.10.0/lib/net451/icu.net.dll"/>
 			<NuGottenFiles Include="$(PackagesDir)/Markdig.Signed.0.30.0/lib/net452/Markdig.Signed.dll"/>
 			<NuGottenFiles Include="$(PackagesDir)/Microsoft.Extensions.DependencyModel.2.0.4/lib/net451/Microsoft.Extensions.DependencyModel.dll"/>
 			<NuGottenFiles Include="$(PackagesDir)/Microsoft.Win32.Registry.4.7.0/lib/net461/Microsoft.Win32.Registry.dll" Condition="'$(OS)'=='Windows_NT'"/>

diff --git a/Build/nuget-common/packages.config b/Build/nuget-common/packages.config
@@ -16,7 +16,7 @@
   <package id="GLibSharp-signed" version="3.22.24.37" />
   <package id="GtkSharp-signed" version="3.22.24.37" />
   <package id="ibusdotnet" version="2.0.3" targetFramework="net461" />
-  <package id="icu.net" version="2.9.0-beta.13" exclude="Build,Analyzers" targetFramework="net461" />
+  <package id="icu.net" version="2.10.0" exclude="Build,Analyzers" targetFramework="net461" />
   <package id="Icu4c.Win.Fw.Lib" version="70.1.123" />
   <package id="ILRepack" version="2.0.16" targetFramework="net461" />
   <package id="L10NSharp" version="6.0.0" />

diff --git a/Src/AppForTests.config b/Src/AppForTests.config
@@ -14,7 +14,7 @@
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>
 				<assemblyIdentity name="icu.net" publicKeyToken="416fdd914afa6b66" culture="neutral" />
-				<bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+				<bindingRedirect oldVersion="0.0.0.0-2.10.0.0" newVersion="2.10.0.0" />
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />

diff --git a/Src/Common/FieldWorks/App.config b/Src/Common/FieldWorks/App.config
@@ -16,7 +16,7 @@
 		</dependentAssembly>
 		<dependentAssembly>
 			<assemblyIdentity name="icu.net" publicKeyToken="416fdd914afa6b66" culture="neutral" />
-			<bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0" />
+			<bindingRedirect oldVersion="0.0.0.0-2.10.0.0" newVersion="2.10.0.0" />
 		</dependentAssembly>
 		<dependentAssembly>
 			<assemblyIdentity name="DotnetZip" publicKeyToken="6583c7c814667745" culture="neutral" />

diff --git a/Src/Paratext8Plugin/ParaText8PluginTests/App.config b/Src/Paratext8Plugin/ParaText8PluginTests/App.config
@@ -4,7 +4,7 @@
 		<assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
 			<dependentAssembly>
 				<assemblyIdentity name="icu.net" publicKeyToken="416fdd914afa6b66" culture="neutral"/>
-				<bindingRedirect oldVersion="0.0.0.0-2.9.0.0" newVersion="2.9.0.0"/>
+				<bindingRedirect oldVersion="0.0.0.0-2.10.0.0" newVersion="2.10.0.0"/>
 			</dependentAssembly>
 			<dependentAssembly>
 				<assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>