Skip to content

Commit 50e823b

Browse files
Update NServiceBus Core to 10.1.0 (#5208)
* Update NServiceBus Core to 10.1.0 * Don't load assembly when higher version is already loaded --------- Co-authored-by: dependencyupdates[bot] <218638057+dependencyupdates[bot]@users.noreply.github.com> Co-authored-by: Brandon Ording <bording@gmail.com>
1 parent 527bad0 commit 50e823b

2 files changed

Lines changed: 5 additions & 3 deletions

File tree

src/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@
3434
<PackageVersion Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
3535
<PackageVersion Include="Mindscape.Raygun4Net.NetCore" Version="11.2.5" />
3636
<PackageVersion Include="NLog.Extensions.Logging" Version="5.5.0" />
37-
<PackageVersion Include="NServiceBus" Version="10.0.0" />
38-
<PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.0.0" />
37+
<PackageVersion Include="NServiceBus" Version="10.1.0" />
38+
<PackageVersion Include="NServiceBus.AcceptanceTesting" Version="10.1.0" />
3939
<PackageVersion Include="NServiceBus.AmazonSQS" Version="9.0.0" />
4040
<PackageVersion Include="NServiceBus.CustomChecks" Version="6.0.0" />
4141
<PackageVersion Include="NServiceBus.Extensions.Hosting" Version="4.0.0" />

src/ServiceControl.Infrastructure/PluginAssemblyLoadContext.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,9 @@ protected override Assembly Load(AssemblyName assemblyName)
1919
// Since we ensure we are using the same version of dependencies in every project, it should be okay to use the already loaded copy.
2020
foreach (var assembly in Default.Assemblies)
2121
{
22-
if (assembly.FullName == assemblyName.FullName)
22+
var loadedAssembly = assembly.GetName();
23+
24+
if (loadedAssembly.Name == assemblyName.Name && loadedAssembly.Version >= assemblyName.Version)
2325
{
2426
return null;
2527
}

0 commit comments

Comments
 (0)