From f5e92707f1506e71ea7db89b03b1782548829ad2 Mon Sep 17 00:00:00 2001
From: MscrmTools <tanguy92@hotmail.com>
Date: Tue, 31 Jan 2023 20:42:12 +0100
Subject: [PATCH] Added binding redirect for some assemblies to fix things +
 updated version

---
 XrmToolBox.Extensibility/Properties/AssemblyInfo.cs | 4 ++--
 XrmToolBox.PluginsStore/Properties/AssemblyInfo.cs  | 4 ++--
 XrmToolBox.ToolLibrary/Properties/AssemblyInfo.cs   | 4 ++--
 XrmToolBox/Program.cs                               | 1 +
 XrmToolBox/Properties/AssemblyInfo.cs               | 4 ++--
 XrmToolBox/app.config                               | 6 +++++-
 6 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/XrmToolBox.Extensibility/Properties/AssemblyInfo.cs b/XrmToolBox.Extensibility/Properties/AssemblyInfo.cs
index 4742da66..ed078803 100644
--- a/XrmToolBox.Extensibility/Properties/AssemblyInfo.cs
+++ b/XrmToolBox.Extensibility/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2023.1.62")]
-[assembly: AssemblyFileVersion("1.2023.1.62")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2023.1.63")]
+[assembly: AssemblyFileVersion("1.2023.1.63")]
\ No newline at end of file
diff --git a/XrmToolBox.PluginsStore/Properties/AssemblyInfo.cs b/XrmToolBox.PluginsStore/Properties/AssemblyInfo.cs
index 896f7fdd..1413ce14 100644
--- a/XrmToolBox.PluginsStore/Properties/AssemblyInfo.cs
+++ b/XrmToolBox.PluginsStore/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2023.1.62")]
-[assembly: AssemblyFileVersion("1.2023.1.62")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2023.1.63")]
+[assembly: AssemblyFileVersion("1.2023.1.63")]
\ No newline at end of file
diff --git a/XrmToolBox.ToolLibrary/Properties/AssemblyInfo.cs b/XrmToolBox.ToolLibrary/Properties/AssemblyInfo.cs
index 6fa6ae74..3dccbfb0 100644
--- a/XrmToolBox.ToolLibrary/Properties/AssemblyInfo.cs
+++ b/XrmToolBox.ToolLibrary/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2023.1.62")]
-[assembly: AssemblyFileVersion("1.2023.1.62")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2023.1.63")]
+[assembly: AssemblyFileVersion("1.2023.1.63")]
\ No newline at end of file
diff --git a/XrmToolBox/Program.cs b/XrmToolBox/Program.cs
index 53cb07a4..b33fbe86 100644
--- a/XrmToolBox/Program.cs
+++ b/XrmToolBox/Program.cs
@@ -323,6 +323,7 @@ private static void Main(string[] args)
             RedirectAssembly("WeifenLuo.WinFormsUI.Docking");
             RedirectAssembly("WeifenLuo.WinFormsUI.Docking.ThemeVS2015");
             RedirectAssembly("ScintillaNET");
+            RedirectAssembly("Microsoft.Web.WebView2.Core");
             RedirectAssembly("Microsoft.Web.WebView2.WinForms");
 
             OptimizeConnectionSettings();
diff --git a/XrmToolBox/Properties/AssemblyInfo.cs b/XrmToolBox/Properties/AssemblyInfo.cs
index 40788684..f6ef659e 100644
--- a/XrmToolBox/Properties/AssemblyInfo.cs
+++ b/XrmToolBox/Properties/AssemblyInfo.cs
@@ -36,5 +36,5 @@
 // Vous pouvez spécifier toutes les valeurs ou indiquer les numéros de build et de révision par défaut
 // en utilisant '*', comme indiqué ci-dessous :
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.2023.1.62")]
-[assembly: AssemblyFileVersion("1.2023.1.62")]
\ No newline at end of file
+[assembly: AssemblyVersion("1.2023.1.63")]
+[assembly: AssemblyFileVersion("1.2023.1.63")]
\ No newline at end of file
diff --git a/XrmToolBox/app.config b/XrmToolBox/app.config
index 4e96652a..c2ce92fd 100644
--- a/XrmToolBox/app.config
+++ b/XrmToolBox/app.config
@@ -90,6 +90,10 @@
         <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-7.0.0.1" newVersion="7.0.0.1" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.1.2" newVersion="4.0.1.2" />
+      </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Security.Cryptography.ProtectedData" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-7.0.0.0" newVersion="7.0.0.0" />
@@ -127,4 +131,4 @@
       <add name="CustomListener" type="Microsoft.Xrm.Tooling.Connector.DynamicsFileLogTraceListener, Microsoft.Xrm.Tooling.Connector" BaseFileName="XrmToolBox_Connection" Location="LocalUserApplicationDirectory" MaxFileSize="52428800" />
     </sharedListeners>
   </system.diagnostics>
-</configuration>
+</configuration>
\ No newline at end of file