Added binding redirects to fix failing unit tests

sillsdev · Aug 2, 2024 · f0310fb · f0310fb
1 parent 414f7ef
commit f0310fb
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 15 deletions.
diff --git a/SIL.Windows.Forms.Tests/App.config b/SIL.Windows.Forms.Tests/App.config
@@ -2,18 +2,18 @@
 <!-- This is needed because we use the web control, and it requires a single-threaded apartment -->
 <configuration>
   <configSections>
-	<sectionGroup name="NUnit">
-	  <section name="TestRunner" type="System.Configuration.NameValueSectionHandler"/>
-	</sectionGroup>
+    <sectionGroup name="NUnit">
+      <section name="TestRunner" type="System.Configuration.NameValueSectionHandler"/>
+    </sectionGroup>
     <sectionGroup name="userSettings" type="System.Configuration.UserSettingsGroup, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
       <section name="SIL.Windows.Forms.Tests.Properties.Settings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" allowExeDefinition="MachineToLocalUser" requirePermission="false"/>
     </sectionGroup>
   </configSections>
 
   <NUnit>
-	<TestRunner>
-	  <add key="ApartmentState" value="STA"/>
-	</TestRunner>
+    <TestRunner>
+      <add key="ApartmentState" value="STA"/>
+    </TestRunner>
   </NUnit>
   <userSettings>
     <SIL.Windows.Forms.Tests.Properties.Settings>
@@ -27,9 +27,11 @@
   </userSettings>
   <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/></startup>
   <runtime>
-    <dependentAssembly>
-      <assemblyIdentity name="System.Memory" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
-      <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
-    </dependentAssembly>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.2" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/SIL.Windows.Forms.WritingSystems.Tests/App.config b/SIL.Windows.Forms.WritingSystems.Tests/App.config
@@ -3,9 +3,11 @@
   <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" /></startup>
   <system.windows.forms jitDebugging="true" />
   <runtime>
-    <dependentAssembly>
-      <assemblyIdentity name="System.Memory" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
-      <bindingRedirect oldVersion="0.0.0.0-4.5.0.0" newVersion="4.5.0.0" />
-	</dependentAssembly>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" culture="neutral" publicKeyToken="cc7b13ffcd2ddd51" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.1" newVersion="4.0.1.2" />
+      </dependentAssembly>
+    </assemblyBinding>
   </runtime>
 </configuration>