diff --git a/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_publishing_from_asb_endpoint_oriented.cs b/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_publishing_from_asb_endpoint_oriented.cs index 91c210a..fce3abd 100644 --- a/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_publishing_from_asb_endpoint_oriented.cs +++ b/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_publishing_from_asb_endpoint_oriented.cs @@ -5,15 +5,12 @@ namespace NServiceBus.Router.AcceptanceTests.SingleRouter using System.Threading.Tasks; using System.Transactions; using AcceptanceTesting; - using Configuration.AdvancedExtensibility; using Events; using Features; using NServiceBus; using NServiceBus.AcceptanceTests; using NServiceBus.AcceptanceTests.EndpointTemplates; using NUnit.Framework; - using Serialization; - using Settings; using Conventions = AcceptanceTesting.Customization.Conventions; [TestFixture] @@ -32,17 +29,9 @@ public async Task It_should_deliver_the_message_to_both_subscribers() { var connString = Environment.GetEnvironmentVariable("AzureServiceBus.ConnectionString"); t.ConnectionString(connString); - var settings = t.GetSettings(); - - var builder = new ConventionsBuilder(settings); - builder.DefiningEventsAs(EventConvention); - settings.Set(builder.Conventions); var topology = t.UseEndpointOrientedTopology(); topology.RegisterPublisher(typeof(MyAsbEvent), Conventions.EndpointNamingConvention(typeof(Publisher))); - - var serializer = Tuple.Create(new NewtonsoftSerializer() as SerializationDefinition, new SettingsHolder()); - settings.Set("MainSerializer", serializer); }); leftIface.LimitMessageProcessingConcurrencyTo(1); //To ensure when tracer arrives the subscribe request has already been processed.; cfg.AddRule(_ => new SuppressTransactionScopeRule()); diff --git a/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_publishing_from_asb_endpoint_oriented_while_router_is_restarted.cs b/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_publishing_from_asb_endpoint_oriented_while_router_is_restarted.cs index 81a8624..8962534 100644 --- a/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_publishing_from_asb_endpoint_oriented_while_router_is_restarted.cs +++ b/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_publishing_from_asb_endpoint_oriented_while_router_is_restarted.cs @@ -5,15 +5,12 @@ namespace NServiceBus.Router.AcceptanceTests.SingleRouter using System.Threading.Tasks; using System.Transactions; using AcceptanceTesting; - using Configuration.AdvancedExtensibility; using Events; using Features; using NServiceBus; using NServiceBus.AcceptanceTests; using NServiceBus.AcceptanceTests.EndpointTemplates; using NUnit.Framework; - using Serialization; - using Settings; using Conventions = AcceptanceTesting.Customization.Conventions; [TestFixture] @@ -56,18 +53,10 @@ void ConfigureRouter(Context c, RouterConfiguration cfg) { var connString = Environment.GetEnvironmentVariable("AzureServiceBus.ConnectionString"); t.ConnectionString(connString); - var settings = t.GetSettings(); - - var builder = new ConventionsBuilder(settings); - builder.DefiningEventsAs(EventConvention); - settings.Set(builder.Conventions); var topology = t.UseEndpointOrientedTopology(); topology.EnableMigrationToForwardingTopology(); topology.RegisterPublisher(typeof(MyAsbEvent), Conventions.EndpointNamingConvention(typeof(Publisher))); - - var serializer = Tuple.Create(new NewtonsoftSerializer() as SerializationDefinition, new SettingsHolder()); - settings.Set("MainSerializer", serializer); }); leftIface.LimitMessageProcessingConcurrencyTo(1); //To ensure when tracer arrives the subscribe request has already been processed.; cfg.AddRule(_ => new SuppressTransactionScopeRule()); diff --git a/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_replying_to_a_message_with_asb.cs b/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_replying_to_a_message_with_asb.cs index a298fb4..268a107 100644 --- a/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_replying_to_a_message_with_asb.cs +++ b/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_replying_to_a_message_with_asb.cs @@ -29,9 +29,6 @@ public async Task Should_deliver_the_reply_without_the_need_to_configure_the_bri var connString = Environment.GetEnvironmentVariable("AzureServiceBus.ConnectionString"); t.ConnectionString(connString); t.UseForwardingTopology(); - var settings = t.GetSettings(); - var serializer = Tuple.Create(new NewtonsoftSerializer() as SerializationDefinition, new SettingsHolder()); - settings.Set("MainSerializer", serializer); }); cfg.CircuitBreakerThreshold = int.MaxValue; cfg.DelayedRetries = 0; diff --git a/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_subscribing_from_asb.cs b/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_subscribing_from_asb.cs index 58db670..83a6fcb 100644 --- a/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_subscribing_from_asb.cs +++ b/src/NServiceBus.Router.AcceptanceTests/SingleRouter/When_subscribing_from_asb.cs @@ -31,18 +31,10 @@ public async Task It_should_deliver_the_message_even_is_subscriber_name_exceeds_ { var connString = Environment.GetEnvironmentVariable("AzureServiceBus.ConnectionString"); t.ConnectionString(connString); - var settings = t.GetSettings(); t.Transactions(TransportTransactionMode.ReceiveOnly); - var builder = new ConventionsBuilder(settings); - builder.DefiningEventsAs(EventConvention); - settings.Set(builder.Conventions); - t.UseForwardingTopology(); t.Sanitization().UseStrategy(); - - var serializer = Tuple.Create(new NewtonsoftSerializer() as SerializationDefinition, new SettingsHolder()); - settings.Set("MainSerializer", serializer); }); leftIface.LimitMessageProcessingConcurrencyTo(1); //To ensure when tracer arrives the subscribe request has already been processed.; cfg.UseStaticRoutingProtocol().AddForwardRoute("Right", "Left"); diff --git a/src/NServiceBus.Router.Connector/NServiceBus.Router.Connector.csproj b/src/NServiceBus.Router.Connector/NServiceBus.Router.Connector.csproj index 772fb13..5fbbf6c 100644 --- a/src/NServiceBus.Router.Connector/NServiceBus.Router.Connector.csproj +++ b/src/NServiceBus.Router.Connector/NServiceBus.Router.Connector.csproj @@ -7,7 +7,7 @@ latest - + diff --git a/src/NServiceBus.Router.Migrator/NServiceBus.Router.Migrator.csproj b/src/NServiceBus.Router.Migrator/NServiceBus.Router.Migrator.csproj index 84a588c..e17891d 100644 --- a/src/NServiceBus.Router.Migrator/NServiceBus.Router.Migrator.csproj +++ b/src/NServiceBus.Router.Migrator/NServiceBus.Router.Migrator.csproj @@ -9,9 +9,9 @@ - + - + diff --git a/src/NServiceBus.Router.SqlServer/NServiceBus.Router.SqlServer.csproj b/src/NServiceBus.Router.SqlServer/NServiceBus.Router.SqlServer.csproj index 353d9bf..83caca7 100644 --- a/src/NServiceBus.Router.SqlServer/NServiceBus.Router.SqlServer.csproj +++ b/src/NServiceBus.Router.SqlServer/NServiceBus.Router.SqlServer.csproj @@ -8,9 +8,9 @@ - + - + diff --git a/src/NServiceBus.Router.sln b/src/NServiceBus.Router.sln index 4129ad1..92b30cf 100644 --- a/src/NServiceBus.Router.sln +++ b/src/NServiceBus.Router.sln @@ -1,161 +1,161 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 16 -VisualStudioVersion = 16.0.29215.179 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router", "NServiceBus.Router\NServiceBus.Router.csproj", "{6307EF93-26B0-4E6C-BA94-85B1DCDCFA07}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router.Tests", "NServiceBus.Router.Tests\NServiceBus.Router.Tests.csproj", "{96687744-B1E0-4B98-AD61-ED385014E7AD}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router.AcceptanceTests", "NServiceBus.Router.AcceptanceTests\NServiceBus.Router.AcceptanceTests.csproj", "{0D2C045B-B55B-4738-B580-58F259690DF0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router.Connector", "NServiceBus.Router.Connector\NServiceBus.Router.Connector.csproj", "{27325DEC-0BD0-4260-84B5-E0F3D6FCA519}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2FC95206-1B2A-4F33-9797-8AA059204D2A}" - ProjectSection(SolutionItems) = preProject - Directory.Build.targets = Directory.Build.targets - EndProjectSection -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AcceptanceTesting", "AcceptanceTesting\AcceptanceTesting.csproj", "{0F1838F0-4870-45B0-A85C-9197104C6F05}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3A44ACF0-10D4-4322-976E-364B8ED98602}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LoadTests", "LoadTests", "{8FAB9D0C-AE8E-4183-A2C5-77464A300549}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadTests.Sender", "LoadTests.Sender\LoadTests.Sender.csproj", "{B9C2D1F0-CA82-4778-BAF3-594C2726A4F1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadTests.Sender.Router", "LoadTests.Sender.Router\LoadTests.Sender.Router.csproj", "{A7C137C2-F867-4BEB-8079-E77A21A8AE55}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadTests.Receiver", "LoadTests.Receiver\LoadTests.Receiver.csproj", "{82432CCF-502A-423B-871B-B86ABFBAE47B}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadTests.Receiver.Router", "LoadTests.Receiver.Router\LoadTests.Receiver.Router.csproj", "{6D01212B-3BBC-4C11-A5C7-C608ECE12186}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadTests.Shared", "LoadTests.Shared\LoadTests.Shared.csproj", "{33DE78E8-D222-4F04-885A-47A5BDD23A4A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router.SqlServer", "NServiceBus.Router.SqlServer\NServiceBus.Router.SqlServer.csproj", "{EB3B589F-FEC4-452D-A95B-EA513983ABD1}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router.Migrator", "NServiceBus.Router.Migrator\NServiceBus.Router.Migrator.csproj", "{4317A94C-E36C-48AC-A927-6E36BCA68C27}" -EndProject -Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MigratorSample", "MigratorSample", "{463FEF84-A047-45F2-AB9D-6E3AA36518B5}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Client", "Client\Client.csproj", "{83AAE3E1-FE94-4E01-A649-99A2B5938D29}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Shared", "Shared\Shared.csproj", "{58F8E14B-E6F5-4FCD-8BD8-41651F885518}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Billing", "Billing\Billing.csproj", "{093B790B-D506-4F10-9FD7-9084D9F1200A}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shipping", "Shipping\Shipping.csproj", "{529D9655-181F-4EF6-897E-4449D08ACCC7}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sales", "Sales\Sales.csproj", "{2E28DA2A-56E3-414D-B41F-22ADCCB516A0}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PaymentGateway", "PaymentGateway\PaymentGateway.csproj", "{0187BA47-FE5B-4951-8F22-A65C9A031112}" -EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShippingGateway", "ShippingGateway\ShippingGateway.csproj", "{1E39608E-3A4D-4AE7-A980-B46B5D168B1A}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {6307EF93-26B0-4E6C-BA94-85B1DCDCFA07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6307EF93-26B0-4E6C-BA94-85B1DCDCFA07}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6307EF93-26B0-4E6C-BA94-85B1DCDCFA07}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6307EF93-26B0-4E6C-BA94-85B1DCDCFA07}.Release|Any CPU.Build.0 = Release|Any CPU - {96687744-B1E0-4B98-AD61-ED385014E7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {96687744-B1E0-4B98-AD61-ED385014E7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {96687744-B1E0-4B98-AD61-ED385014E7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {96687744-B1E0-4B98-AD61-ED385014E7AD}.Release|Any CPU.Build.0 = Release|Any CPU - {0D2C045B-B55B-4738-B580-58F259690DF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0D2C045B-B55B-4738-B580-58F259690DF0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0D2C045B-B55B-4738-B580-58F259690DF0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0D2C045B-B55B-4738-B580-58F259690DF0}.Release|Any CPU.Build.0 = Release|Any CPU - {27325DEC-0BD0-4260-84B5-E0F3D6FCA519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {27325DEC-0BD0-4260-84B5-E0F3D6FCA519}.Debug|Any CPU.Build.0 = Debug|Any CPU - {27325DEC-0BD0-4260-84B5-E0F3D6FCA519}.Release|Any CPU.ActiveCfg = Release|Any CPU - {27325DEC-0BD0-4260-84B5-E0F3D6FCA519}.Release|Any CPU.Build.0 = Release|Any CPU - {0F1838F0-4870-45B0-A85C-9197104C6F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0F1838F0-4870-45B0-A85C-9197104C6F05}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0F1838F0-4870-45B0-A85C-9197104C6F05}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0F1838F0-4870-45B0-A85C-9197104C6F05}.Release|Any CPU.Build.0 = Release|Any CPU - {B9C2D1F0-CA82-4778-BAF3-594C2726A4F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B9C2D1F0-CA82-4778-BAF3-594C2726A4F1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B9C2D1F0-CA82-4778-BAF3-594C2726A4F1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B9C2D1F0-CA82-4778-BAF3-594C2726A4F1}.Release|Any CPU.Build.0 = Release|Any CPU - {A7C137C2-F867-4BEB-8079-E77A21A8AE55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {A7C137C2-F867-4BEB-8079-E77A21A8AE55}.Debug|Any CPU.Build.0 = Debug|Any CPU - {A7C137C2-F867-4BEB-8079-E77A21A8AE55}.Release|Any CPU.ActiveCfg = Release|Any CPU - {A7C137C2-F867-4BEB-8079-E77A21A8AE55}.Release|Any CPU.Build.0 = Release|Any CPU - {82432CCF-502A-423B-871B-B86ABFBAE47B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {82432CCF-502A-423B-871B-B86ABFBAE47B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {82432CCF-502A-423B-871B-B86ABFBAE47B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {82432CCF-502A-423B-871B-B86ABFBAE47B}.Release|Any CPU.Build.0 = Release|Any CPU - {6D01212B-3BBC-4C11-A5C7-C608ECE12186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {6D01212B-3BBC-4C11-A5C7-C608ECE12186}.Debug|Any CPU.Build.0 = Debug|Any CPU - {6D01212B-3BBC-4C11-A5C7-C608ECE12186}.Release|Any CPU.ActiveCfg = Release|Any CPU - {6D01212B-3BBC-4C11-A5C7-C608ECE12186}.Release|Any CPU.Build.0 = Release|Any CPU - {33DE78E8-D222-4F04-885A-47A5BDD23A4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {33DE78E8-D222-4F04-885A-47A5BDD23A4A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {33DE78E8-D222-4F04-885A-47A5BDD23A4A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {33DE78E8-D222-4F04-885A-47A5BDD23A4A}.Release|Any CPU.Build.0 = Release|Any CPU - {EB3B589F-FEC4-452D-A95B-EA513983ABD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {EB3B589F-FEC4-452D-A95B-EA513983ABD1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {EB3B589F-FEC4-452D-A95B-EA513983ABD1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {EB3B589F-FEC4-452D-A95B-EA513983ABD1}.Release|Any CPU.Build.0 = Release|Any CPU - {4317A94C-E36C-48AC-A927-6E36BCA68C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {4317A94C-E36C-48AC-A927-6E36BCA68C27}.Debug|Any CPU.Build.0 = Debug|Any CPU - {4317A94C-E36C-48AC-A927-6E36BCA68C27}.Release|Any CPU.ActiveCfg = Release|Any CPU - {4317A94C-E36C-48AC-A927-6E36BCA68C27}.Release|Any CPU.Build.0 = Release|Any CPU - {83AAE3E1-FE94-4E01-A649-99A2B5938D29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {83AAE3E1-FE94-4E01-A649-99A2B5938D29}.Debug|Any CPU.Build.0 = Debug|Any CPU - {83AAE3E1-FE94-4E01-A649-99A2B5938D29}.Release|Any CPU.ActiveCfg = Release|Any CPU - {83AAE3E1-FE94-4E01-A649-99A2B5938D29}.Release|Any CPU.Build.0 = Release|Any CPU - {58F8E14B-E6F5-4FCD-8BD8-41651F885518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {58F8E14B-E6F5-4FCD-8BD8-41651F885518}.Debug|Any CPU.Build.0 = Debug|Any CPU - {58F8E14B-E6F5-4FCD-8BD8-41651F885518}.Release|Any CPU.ActiveCfg = Release|Any CPU - {58F8E14B-E6F5-4FCD-8BD8-41651F885518}.Release|Any CPU.Build.0 = Release|Any CPU - {093B790B-D506-4F10-9FD7-9084D9F1200A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {093B790B-D506-4F10-9FD7-9084D9F1200A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {093B790B-D506-4F10-9FD7-9084D9F1200A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {093B790B-D506-4F10-9FD7-9084D9F1200A}.Release|Any CPU.Build.0 = Release|Any CPU - {529D9655-181F-4EF6-897E-4449D08ACCC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {529D9655-181F-4EF6-897E-4449D08ACCC7}.Debug|Any CPU.Build.0 = Debug|Any CPU - {529D9655-181F-4EF6-897E-4449D08ACCC7}.Release|Any CPU.ActiveCfg = Release|Any CPU - {529D9655-181F-4EF6-897E-4449D08ACCC7}.Release|Any CPU.Build.0 = Release|Any CPU - {2E28DA2A-56E3-414D-B41F-22ADCCB516A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {2E28DA2A-56E3-414D-B41F-22ADCCB516A0}.Debug|Any CPU.Build.0 = Debug|Any CPU - {2E28DA2A-56E3-414D-B41F-22ADCCB516A0}.Release|Any CPU.ActiveCfg = Release|Any CPU - {2E28DA2A-56E3-414D-B41F-22ADCCB516A0}.Release|Any CPU.Build.0 = Release|Any CPU - {0187BA47-FE5B-4951-8F22-A65C9A031112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0187BA47-FE5B-4951-8F22-A65C9A031112}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0187BA47-FE5B-4951-8F22-A65C9A031112}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0187BA47-FE5B-4951-8F22-A65C9A031112}.Release|Any CPU.Build.0 = Release|Any CPU - {1E39608E-3A4D-4AE7-A980-B46B5D168B1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1E39608E-3A4D-4AE7-A980-B46B5D168B1A}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1E39608E-3A4D-4AE7-A980-B46B5D168B1A}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1E39608E-3A4D-4AE7-A980-B46B5D168B1A}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(NestedProjects) = preSolution - {96687744-B1E0-4B98-AD61-ED385014E7AD} = {3A44ACF0-10D4-4322-976E-364B8ED98602} - {0D2C045B-B55B-4738-B580-58F259690DF0} = {3A44ACF0-10D4-4322-976E-364B8ED98602} - {0F1838F0-4870-45B0-A85C-9197104C6F05} = {3A44ACF0-10D4-4322-976E-364B8ED98602} - {B9C2D1F0-CA82-4778-BAF3-594C2726A4F1} = {8FAB9D0C-AE8E-4183-A2C5-77464A300549} - {A7C137C2-F867-4BEB-8079-E77A21A8AE55} = {8FAB9D0C-AE8E-4183-A2C5-77464A300549} - {82432CCF-502A-423B-871B-B86ABFBAE47B} = {8FAB9D0C-AE8E-4183-A2C5-77464A300549} - {6D01212B-3BBC-4C11-A5C7-C608ECE12186} = {8FAB9D0C-AE8E-4183-A2C5-77464A300549} - {33DE78E8-D222-4F04-885A-47A5BDD23A4A} = {8FAB9D0C-AE8E-4183-A2C5-77464A300549} - {83AAE3E1-FE94-4E01-A649-99A2B5938D29} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} - {58F8E14B-E6F5-4FCD-8BD8-41651F885518} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} - {093B790B-D506-4F10-9FD7-9084D9F1200A} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} - {529D9655-181F-4EF6-897E-4449D08ACCC7} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} - {2E28DA2A-56E3-414D-B41F-22ADCCB516A0} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} - {0187BA47-FE5B-4951-8F22-A65C9A031112} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} - {1E39608E-3A4D-4AE7-A980-B46B5D168B1A} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {F146A5AC-8618-4967-A758-8FB3980BC90F} - EndGlobalSection -EndGlobal + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.29215.179 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router", "NServiceBus.Router\NServiceBus.Router.csproj", "{6307EF93-26B0-4E6C-BA94-85B1DCDCFA07}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router.Tests", "NServiceBus.Router.Tests\NServiceBus.Router.Tests.csproj", "{96687744-B1E0-4B98-AD61-ED385014E7AD}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router.AcceptanceTests", "NServiceBus.Router.AcceptanceTests\NServiceBus.Router.AcceptanceTests.csproj", "{0D2C045B-B55B-4738-B580-58F259690DF0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router.Connector", "NServiceBus.Router.Connector\NServiceBus.Router.Connector.csproj", "{27325DEC-0BD0-4260-84B5-E0F3D6FCA519}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{2FC95206-1B2A-4F33-9797-8AA059204D2A}" + ProjectSection(SolutionItems) = preProject + Directory.Build.targets = Directory.Build.targets + EndProjectSection +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AcceptanceTesting", "AcceptanceTesting\AcceptanceTesting.csproj", "{0F1838F0-4870-45B0-A85C-9197104C6F05}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{3A44ACF0-10D4-4322-976E-364B8ED98602}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "LoadTests", "LoadTests", "{8FAB9D0C-AE8E-4183-A2C5-77464A300549}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadTests.Sender", "LoadTests.Sender\LoadTests.Sender.csproj", "{B9C2D1F0-CA82-4778-BAF3-594C2726A4F1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadTests.Sender.Router", "LoadTests.Sender.Router\LoadTests.Sender.Router.csproj", "{A7C137C2-F867-4BEB-8079-E77A21A8AE55}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadTests.Receiver", "LoadTests.Receiver\LoadTests.Receiver.csproj", "{82432CCF-502A-423B-871B-B86ABFBAE47B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadTests.Receiver.Router", "LoadTests.Receiver.Router\LoadTests.Receiver.Router.csproj", "{6D01212B-3BBC-4C11-A5C7-C608ECE12186}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LoadTests.Shared", "LoadTests.Shared\LoadTests.Shared.csproj", "{33DE78E8-D222-4F04-885A-47A5BDD23A4A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router.SqlServer", "NServiceBus.Router.SqlServer\NServiceBus.Router.SqlServer.csproj", "{EB3B589F-FEC4-452D-A95B-EA513983ABD1}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NServiceBus.Router.Migrator", "NServiceBus.Router.Migrator\NServiceBus.Router.Migrator.csproj", "{4317A94C-E36C-48AC-A927-6E36BCA68C27}" +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "MigratorSample", "MigratorSample", "{463FEF84-A047-45F2-AB9D-6E3AA36518B5}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Client", "Client\Client.csproj", "{83AAE3E1-FE94-4E01-A649-99A2B5938D29}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shared", "Shared\Shared.csproj", "{58F8E14B-E6F5-4FCD-8BD8-41651F885518}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Billing", "Billing\Billing.csproj", "{093B790B-D506-4F10-9FD7-9084D9F1200A}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Shipping", "Shipping\Shipping.csproj", "{529D9655-181F-4EF6-897E-4449D08ACCC7}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Sales", "Sales\Sales.csproj", "{2E28DA2A-56E3-414D-B41F-22ADCCB516A0}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PaymentGateway", "PaymentGateway\PaymentGateway.csproj", "{0187BA47-FE5B-4951-8F22-A65C9A031112}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShippingGateway", "ShippingGateway\ShippingGateway.csproj", "{1E39608E-3A4D-4AE7-A980-B46B5D168B1A}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {6307EF93-26B0-4E6C-BA94-85B1DCDCFA07}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6307EF93-26B0-4E6C-BA94-85B1DCDCFA07}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6307EF93-26B0-4E6C-BA94-85B1DCDCFA07}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6307EF93-26B0-4E6C-BA94-85B1DCDCFA07}.Release|Any CPU.Build.0 = Release|Any CPU + {96687744-B1E0-4B98-AD61-ED385014E7AD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {96687744-B1E0-4B98-AD61-ED385014E7AD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {96687744-B1E0-4B98-AD61-ED385014E7AD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {96687744-B1E0-4B98-AD61-ED385014E7AD}.Release|Any CPU.Build.0 = Release|Any CPU + {0D2C045B-B55B-4738-B580-58F259690DF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0D2C045B-B55B-4738-B580-58F259690DF0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0D2C045B-B55B-4738-B580-58F259690DF0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0D2C045B-B55B-4738-B580-58F259690DF0}.Release|Any CPU.Build.0 = Release|Any CPU + {27325DEC-0BD0-4260-84B5-E0F3D6FCA519}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {27325DEC-0BD0-4260-84B5-E0F3D6FCA519}.Debug|Any CPU.Build.0 = Debug|Any CPU + {27325DEC-0BD0-4260-84B5-E0F3D6FCA519}.Release|Any CPU.ActiveCfg = Release|Any CPU + {27325DEC-0BD0-4260-84B5-E0F3D6FCA519}.Release|Any CPU.Build.0 = Release|Any CPU + {0F1838F0-4870-45B0-A85C-9197104C6F05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0F1838F0-4870-45B0-A85C-9197104C6F05}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0F1838F0-4870-45B0-A85C-9197104C6F05}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0F1838F0-4870-45B0-A85C-9197104C6F05}.Release|Any CPU.Build.0 = Release|Any CPU + {B9C2D1F0-CA82-4778-BAF3-594C2726A4F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B9C2D1F0-CA82-4778-BAF3-594C2726A4F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B9C2D1F0-CA82-4778-BAF3-594C2726A4F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B9C2D1F0-CA82-4778-BAF3-594C2726A4F1}.Release|Any CPU.Build.0 = Release|Any CPU + {A7C137C2-F867-4BEB-8079-E77A21A8AE55}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A7C137C2-F867-4BEB-8079-E77A21A8AE55}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A7C137C2-F867-4BEB-8079-E77A21A8AE55}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A7C137C2-F867-4BEB-8079-E77A21A8AE55}.Release|Any CPU.Build.0 = Release|Any CPU + {82432CCF-502A-423B-871B-B86ABFBAE47B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {82432CCF-502A-423B-871B-B86ABFBAE47B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {82432CCF-502A-423B-871B-B86ABFBAE47B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {82432CCF-502A-423B-871B-B86ABFBAE47B}.Release|Any CPU.Build.0 = Release|Any CPU + {6D01212B-3BBC-4C11-A5C7-C608ECE12186}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6D01212B-3BBC-4C11-A5C7-C608ECE12186}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6D01212B-3BBC-4C11-A5C7-C608ECE12186}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6D01212B-3BBC-4C11-A5C7-C608ECE12186}.Release|Any CPU.Build.0 = Release|Any CPU + {33DE78E8-D222-4F04-885A-47A5BDD23A4A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {33DE78E8-D222-4F04-885A-47A5BDD23A4A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {33DE78E8-D222-4F04-885A-47A5BDD23A4A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {33DE78E8-D222-4F04-885A-47A5BDD23A4A}.Release|Any CPU.Build.0 = Release|Any CPU + {EB3B589F-FEC4-452D-A95B-EA513983ABD1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EB3B589F-FEC4-452D-A95B-EA513983ABD1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EB3B589F-FEC4-452D-A95B-EA513983ABD1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EB3B589F-FEC4-452D-A95B-EA513983ABD1}.Release|Any CPU.Build.0 = Release|Any CPU + {4317A94C-E36C-48AC-A927-6E36BCA68C27}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {4317A94C-E36C-48AC-A927-6E36BCA68C27}.Debug|Any CPU.Build.0 = Debug|Any CPU + {4317A94C-E36C-48AC-A927-6E36BCA68C27}.Release|Any CPU.ActiveCfg = Release|Any CPU + {4317A94C-E36C-48AC-A927-6E36BCA68C27}.Release|Any CPU.Build.0 = Release|Any CPU + {83AAE3E1-FE94-4E01-A649-99A2B5938D29}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {83AAE3E1-FE94-4E01-A649-99A2B5938D29}.Debug|Any CPU.Build.0 = Debug|Any CPU + {83AAE3E1-FE94-4E01-A649-99A2B5938D29}.Release|Any CPU.ActiveCfg = Release|Any CPU + {83AAE3E1-FE94-4E01-A649-99A2B5938D29}.Release|Any CPU.Build.0 = Release|Any CPU + {58F8E14B-E6F5-4FCD-8BD8-41651F885518}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {58F8E14B-E6F5-4FCD-8BD8-41651F885518}.Debug|Any CPU.Build.0 = Debug|Any CPU + {58F8E14B-E6F5-4FCD-8BD8-41651F885518}.Release|Any CPU.ActiveCfg = Release|Any CPU + {58F8E14B-E6F5-4FCD-8BD8-41651F885518}.Release|Any CPU.Build.0 = Release|Any CPU + {093B790B-D506-4F10-9FD7-9084D9F1200A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {093B790B-D506-4F10-9FD7-9084D9F1200A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {093B790B-D506-4F10-9FD7-9084D9F1200A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {093B790B-D506-4F10-9FD7-9084D9F1200A}.Release|Any CPU.Build.0 = Release|Any CPU + {529D9655-181F-4EF6-897E-4449D08ACCC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {529D9655-181F-4EF6-897E-4449D08ACCC7}.Debug|Any CPU.Build.0 = Debug|Any CPU + {529D9655-181F-4EF6-897E-4449D08ACCC7}.Release|Any CPU.ActiveCfg = Release|Any CPU + {529D9655-181F-4EF6-897E-4449D08ACCC7}.Release|Any CPU.Build.0 = Release|Any CPU + {2E28DA2A-56E3-414D-B41F-22ADCCB516A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {2E28DA2A-56E3-414D-B41F-22ADCCB516A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {2E28DA2A-56E3-414D-B41F-22ADCCB516A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {2E28DA2A-56E3-414D-B41F-22ADCCB516A0}.Release|Any CPU.Build.0 = Release|Any CPU + {0187BA47-FE5B-4951-8F22-A65C9A031112}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {0187BA47-FE5B-4951-8F22-A65C9A031112}.Debug|Any CPU.Build.0 = Debug|Any CPU + {0187BA47-FE5B-4951-8F22-A65C9A031112}.Release|Any CPU.ActiveCfg = Release|Any CPU + {0187BA47-FE5B-4951-8F22-A65C9A031112}.Release|Any CPU.Build.0 = Release|Any CPU + {1E39608E-3A4D-4AE7-A980-B46B5D168B1A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {1E39608E-3A4D-4AE7-A980-B46B5D168B1A}.Debug|Any CPU.Build.0 = Debug|Any CPU + {1E39608E-3A4D-4AE7-A980-B46B5D168B1A}.Release|Any CPU.ActiveCfg = Release|Any CPU + {1E39608E-3A4D-4AE7-A980-B46B5D168B1A}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {96687744-B1E0-4B98-AD61-ED385014E7AD} = {3A44ACF0-10D4-4322-976E-364B8ED98602} + {0D2C045B-B55B-4738-B580-58F259690DF0} = {3A44ACF0-10D4-4322-976E-364B8ED98602} + {0F1838F0-4870-45B0-A85C-9197104C6F05} = {3A44ACF0-10D4-4322-976E-364B8ED98602} + {B9C2D1F0-CA82-4778-BAF3-594C2726A4F1} = {8FAB9D0C-AE8E-4183-A2C5-77464A300549} + {A7C137C2-F867-4BEB-8079-E77A21A8AE55} = {8FAB9D0C-AE8E-4183-A2C5-77464A300549} + {82432CCF-502A-423B-871B-B86ABFBAE47B} = {8FAB9D0C-AE8E-4183-A2C5-77464A300549} + {6D01212B-3BBC-4C11-A5C7-C608ECE12186} = {8FAB9D0C-AE8E-4183-A2C5-77464A300549} + {33DE78E8-D222-4F04-885A-47A5BDD23A4A} = {8FAB9D0C-AE8E-4183-A2C5-77464A300549} + {83AAE3E1-FE94-4E01-A649-99A2B5938D29} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} + {58F8E14B-E6F5-4FCD-8BD8-41651F885518} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} + {093B790B-D506-4F10-9FD7-9084D9F1200A} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} + {529D9655-181F-4EF6-897E-4449D08ACCC7} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} + {2E28DA2A-56E3-414D-B41F-22ADCCB516A0} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} + {0187BA47-FE5B-4951-8F22-A65C9A031112} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} + {1E39608E-3A4D-4AE7-A980-B46B5D168B1A} = {463FEF84-A047-45F2-AB9D-6E3AA36518B5} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {F146A5AC-8618-4967-A758-8FB3980BC90F} + EndGlobalSection +EndGlobal diff --git a/src/NServiceBus.Router/Interface.cs b/src/NServiceBus.Router/Interface.cs index 8e2c071..e2fd86b 100644 --- a/src/NServiceBus.Router/Interface.cs +++ b/src/NServiceBus.Router/Interface.cs @@ -1,11 +1,14 @@ using System; +using System.Reflection; using System.Threading.Tasks; using NServiceBus; using NServiceBus.Router; using NServiceBus.Configuration.AdvancedExtensibility; using NServiceBus.Logging; using NServiceBus.Raw; +using NServiceBus.Serialization; using NServiceBus.Transport; +using NServiceBus.Unicast.Messages; interface Interface { @@ -25,7 +28,6 @@ public Interface(string endpointName, string interfaceName, Action(endpointName, poisonQueue, ext => { - SetTransportSpecificFlags(ext.GetSettings(), poisonQueue); transportCustomization?.Invoke(ext); }, (context, _) => preroutingChain.Invoke(new RawContext(context, Name, rootContext)), @@ -38,12 +40,6 @@ public Interface(string endpointName, string interfaceName, Action - + - +