-
Notifications
You must be signed in to change notification settings - Fork 647
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Ref struct in scanned assembly results in app crash at startup, if sa…
…gas are present (#7196) * Fix ref struct scan for sagas (#7187) * Prevent saga conventions from throwing on ref struct * Better test * Tweaks --------- Co-authored-by: Mike Minutillo <mike.minutillo@particular.net> * Handle .net framework * Workaround for missing strongly typed check * Update src/NServiceBus.Core/Sagas/Sagas.cs Co-authored-by: Daniel Marbach <daniel.marbach@openplace.net> * Use string equals * Avoid null check --------- Co-authored-by: Mike Minutillo <mike.minutillo@particular.net> Co-authored-by: Daniel Marbach <daniel.marbach@openplace.net>
- Loading branch information
1 parent
cd17f8a
commit 4eb5c13
Showing
2 changed files
with
64 additions
and
0 deletions.
There are no files selected for viewing
57 changes: 57 additions & 0 deletions
57
...s/Core/Conventions/When_scanning_an_assembly_containing_a_ref_struct_and_sagas_enabled.cs
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,57 @@ | ||
namespace NServiceBus.AcceptanceTests.Core.Conventions | ||
{ | ||
using System; | ||
using System.Threading.Tasks; | ||
using AcceptanceTesting; | ||
using EndpointTemplates; | ||
using NServiceBus.AcceptanceTesting.Customization; | ||
using NUnit.Framework; | ||
|
||
public class When_scanning_an_assembly_containing_a_ref_struct_and_sagas_enabled : NServiceBusAcceptanceTest | ||
{ | ||
[Test] | ||
public void It_should_not_throw_an_exception() | ||
=> Assert.DoesNotThrowAsync( | ||
() => Scenario.Define<ScenarioContext>() | ||
.WithEndpoint<EndpointWithASaga>() | ||
.Run() | ||
); | ||
|
||
// HINT: This will get picked up by the AssemblyRouteSource created by the routing call below | ||
// Even though it is not a message type, it is still checked by passing it to conventions. | ||
// The conventions added by Sagas were throwing an exception when passed a ref struct. | ||
// See https://github.com/Particular/NServiceBus/issues/7179 for details. | ||
ref struct RefStruct | ||
{ | ||
} | ||
|
||
class EndpointWithASaga : EndpointConfigurationBuilder | ||
{ | ||
public EndpointWithASaga() => EndpointSetup<DefaultServer>(cfg => cfg | ||
.ConfigureTransport() | ||
.Routing() | ||
.RouteToEndpoint( | ||
typeof(RefStruct).Assembly, | ||
Conventions.EndpointNamingConvention(typeof(EndpointWithASaga)) | ||
) | ||
); | ||
class RealSagaToSetUpConventions : Saga<RealSagaToSetUpConventions.RealSagaToSetUpConventionsSagaData>, IAmStartedByMessages<SomeMessage> | ||
{ | ||
public Task Handle(SomeMessage message, IMessageHandlerContext context) => Task.CompletedTask; | ||
|
||
protected override void ConfigureHowToFindSaga(SagaPropertyMapper<RealSagaToSetUpConventionsSagaData> mapper) | ||
=> mapper.MapSaga(saga => saga.BusinessId).ToMessage<SomeMessage>(msg => msg.BusinessId); | ||
|
||
public class RealSagaToSetUpConventionsSagaData : ContainSagaData | ||
{ | ||
public virtual Guid BusinessId { get; set; } | ||
} | ||
} | ||
} | ||
|
||
public class SomeMessage : IMessage | ||
{ | ||
public Guid BusinessId { get; set; } | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters