Skip to content

Commit bf49b08

Browse files
authored
Merge pull request #1395 from adner/bcl-version-bump
Bumped Microsoft.Bcl.AsyncInterfaces to version 9 to fix version mismatches when loading plugins.
2 parents 319e5d9 + f0387c1 commit bf49b08

File tree

3 files changed

+13
-9
lines changed

3 files changed

+13
-9
lines changed

XrmToolBox/XrmToolBox.csproj

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -84,8 +84,8 @@
8484
<Reference Include="McTools.Xrm.Connection.WinForms, Version=1.2024.9.59, Culture=neutral, PublicKeyToken=f1559f79cf894e27, processorArchitecture=MSIL">
8585
<HintPath>..\packages\MscrmTools.Xrm.Connection.1.2024.9.59\lib\net48\McTools.Xrm.Connection.WinForms.dll</HintPath>
8686
</Reference>
87-
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=7.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
88-
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.7.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
87+
<Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.6, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
88+
<HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.6\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
8989
</Reference>
9090
<Reference Include="Microsoft.Crm.Sdk.Proxy, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
9191
<HintPath>..\packages\Microsoft.CrmSdk.CoreAssemblies.9.0.2.56\lib\net462\Microsoft.Crm.Sdk.Proxy.dll</HintPath>
@@ -845,11 +845,11 @@
845845
</PropertyGroup>
846846
<Error Condition="!Exists('..\packages\Microsoft.Web.WebView2.1.0.1518.46\build\Microsoft.Web.WebView2.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Web.WebView2.1.0.1518.46\build\Microsoft.Web.WebView2.targets'))" />
847847
</Target>
848-
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
849-
Other similar extension points exist, see Microsoft.Common.targets.
850-
<Target Name="BeforeBuild">
851-
</Target>
852-
<Target Name="AfterBuild">
853-
</Target>
848+
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
849+
Other similar extension points exist, see Microsoft.Common.targets.
850+
<Target Name="BeforeBuild">
851+
</Target>
852+
<Target Name="AfterBuild">
853+
</Target>
854854
-->
855855
</Project>

XrmToolBox/app.config

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -98,6 +98,10 @@
9898
<assemblyIdentity name="System.Security.Cryptography.ProtectedData" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
9999
<bindingRedirect oldVersion="0.0.0.0-8.0.0.0" newVersion="8.0.0.0" />
100100
</dependentAssembly>
101+
<dependentAssembly>
102+
<assemblyIdentity name="Microsoft.Bcl.AsyncInterfaces" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
103+
<bindingRedirect oldVersion="0.0.0.0-9.0.0.6" newVersion="9.0.0.6" />
104+
</dependentAssembly>
101105
</assemblyBinding>
102106
</runtime>
103107
<system.net>

XrmToolBox/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="DockPanelSuite" version="3.0.6" targetFramework="net462" />
44
<package id="DockPanelSuite.ThemeVS2015" version="3.0.6" targetFramework="net462" />
55
<package id="jacobslusser.ScintillaNET" version="3.6.3" targetFramework="net462" />
6-
<package id="Microsoft.Bcl.AsyncInterfaces" version="7.0.0" targetFramework="net462" />
6+
<package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.6" targetFramework="net48" />
77
<package id="Microsoft.CrmSdk.CoreAssemblies" version="9.0.2.56" targetFramework="net48" />
88
<package id="Microsoft.CrmSdk.Deployment" version="9.0.2.34" targetFramework="net462" />
99
<package id="Microsoft.CrmSdk.Workflow" version="9.0.2.56" targetFramework="net48" />

0 commit comments

Comments
 (0)