Skip to content

Commit

Permalink
Added binding redirect for some assemblies to fix things + updated ve…
Browse files Browse the repository at this point in the history
…rsion
  • Loading branch information
MscrmTools committed Jan 31, 2023
1 parent 6e8e74e commit f5e9270
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 9 deletions.
4 changes: 2 additions & 2 deletions XrmToolBox.Extensibility/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
[assembly: AssemblyVersion("1.2023.1.63")]
[assembly: AssemblyFileVersion("1.2023.1.63")]
4 changes: 2 additions & 2 deletions XrmToolBox.PluginsStore/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
[assembly: AssemblyVersion("1.2023.1.63")]
[assembly: AssemblyFileVersion("1.2023.1.63")]
4 changes: 2 additions & 2 deletions XrmToolBox.ToolLibrary/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
[assembly: AssemblyVersion("1.2023.1.63")]
[assembly: AssemblyFileVersion("1.2023.1.63")]
1 change: 1 addition & 0 deletions XrmToolBox/Program.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
4 changes: 2 additions & 2 deletions XrmToolBox/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
[assembly: AssemblyVersion("1.2023.1.63")]
[assembly: AssemblyFileVersion("1.2023.1.63")]
6 changes: 5 additions & 1 deletion XrmToolBox/app.config
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down Expand Up @@ -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>

0 comments on commit f5e9270

Please sign in to comment.