Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(deps)!: update Rebus from v6.6.5 to v7.0.0. #22

Merged
merged 1 commit into from
Nov 25, 2023
Merged

chore(deps)!: update Rebus from v6.6.5 to v7.0.0. #22

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/Rebus.Correlate/Rebus.Correlate.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

<ItemGroup>
<PackageReference Include="Correlate" Version="4.0.0" />
<PackageReference Include="Rebus" Version="6.6.5" />
<PackageReference Include="Rebus" Version="7.0.0" />
</ItemGroup>

</Project>
13 changes: 12 additions & 1 deletion test/Rebus.Correlate.Tests/Fixtures/RebusFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,18 @@ protected RebusFixture()
{
_configureActions.Add(configurer => configurer
.Transport(t => t.UseInMemoryTransport(new InMemNetwork(), "input"))
.Subscriptions(s => s.StoreInMemory(new InMemorySubscriberStore()))
.Subscriptions(s =>
{
try
{
s.StoreInMemory(new InMemorySubscriberStore());
}
catch (InvalidOperationException ex) when (ex.Message.Contains("a primary registration already exists"))
{
// Newer Rebus impl. of UseInMemoryTransport() registers a subscription storage provider by default
// in which case we just ignore the exception.
}
})
// Route all to input.
.Routing(r => r.TypeBased().MapFallback("input"))
);
Expand Down
13 changes: 11 additions & 2 deletions test/Rebus.Correlate.Tests/Rebus.Correlate.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,18 @@
<RootNamespace>Rebus.Correlate</RootNamespace>
</PropertyGroup>

<PropertyGroup>
<PackageRebusVersion>8.0.2</PackageRebusVersion>
</PropertyGroup>

<PropertyGroup Condition="'$(TargetFramework)'=='net5.0'">
<!-- Testing older dependencies with older SDK. -->
<PackageRebusVersion>7.0.0</PackageRebusVersion>
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Correlate.DependencyInjection" Version="4.0.0" />
<PackageReference Include="Rebus" Version="6.6.5" />
<PackageReference Include="Rebus" Version="$(PackageRebusVersion)" />
</ItemGroup>

<ItemGroup>
Expand All @@ -22,4 +31,4 @@
<ProjectReference Include="..\..\src\Rebus.Correlate\Rebus.Correlate.csproj" AdditionalProperties="TargetFramework=netstandard2.0" Condition="'$(TargetFramework)'=='net5.0'" />
</ItemGroup>

</Project>
</Project>