Merge pull request #720 from Particular/upgrade-to-core-8

Upgrade to core V8

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/ConfigurationHelpers.cs

@@ -0,0 +1,10 @@
+using NServiceBus;
+using NServiceBus.AcceptanceTests.EndpointTemplates;
+
+static class ConfigurationHelpers
+{
+    public static RabbitMQTransport ConfigureRabbitMQTransport(this EndpointConfiguration configuration)
+    {
+        return (RabbitMQTransport)configuration.ConfigureTransport();
+    }
+}

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/ConfigureEndpointRabbitMQTransport.cs

@@ -1,17 +1,18 @@
 using System;
+using System.Collections.Generic;
 using System.Data.Common;
 using System.Linq;
 using System.Threading.Tasks;
 using NServiceBus;
 using NServiceBus.AcceptanceTesting.Support;
-using NServiceBus.Configuration.AdvancedExtensibility;
 using NServiceBus.Transport;
 using RabbitMQ.Client;
 
 class ConfigureEndpointRabbitMQTransport : IConfigureEndpointTestExecution
 {
     DbConnectionStringBuilder connectionStringBuilder;
-    QueueBindings queueBindings;
+    TestRabbitMQTransport transport;
+
 
     public Task Configure(string endpointName, EndpointConfiguration configuration, RunSettings settings, PublisherMetadata publisherMetadata)
     {
@@ -22,13 +23,11 @@ public Task Configure(string endpointName, EndpointConfiguration configuration,
             throw new Exception("The 'RabbitMQTransport_ConnectionString' environment variable is not set.");
         }
 
+        //For cleanup
         connectionStringBuilder = new DbConnectionStringBuilder { ConnectionString = connectionString };
 
-        var transport = configuration.UseTransport<RabbitMQTransport>();
-        transport.ConnectionString(connectionStringBuilder.ConnectionString);
-        transport.UseConventionalRoutingTopology();
-
-        queueBindings = configuration.GetSettings().Get<QueueBindings>();
+        transport = new TestRabbitMQTransport(Topology.Conventional, connectionString);
+        configuration.UseTransport(transport);
 
         return Task.CompletedTask;
     }
@@ -42,7 +41,7 @@ public Task Cleanup()
 
     void PurgeQueues()
     {
-        if (connectionStringBuilder == null)
+        if (connectionStringBuilder == null || transport == null)
         {
             return;
         }
@@ -77,7 +76,7 @@ void PurgeQueues()
             throw new Exception("The connection string doesn't contain a value for 'host'.");
         }
 
-        var queues = queueBindings.ReceivingAddresses.Concat(queueBindings.SendingAddresses);
+        var queues = transport.QueuesToCleanup.Distinct().ToArray();
 
         using (var connection = connectionFactory.CreateConnection("Test Queue Purger"))
         using (var channel = connection.CreateModel())
@@ -95,4 +94,20 @@ void PurgeQueues()
             }
         }
     }
+
+    class TestRabbitMQTransport : RabbitMQTransport
+    {
+        public TestRabbitMQTransport(Topology topology, string connectionString)
+            : base(topology, connectionString)
+        {
+        }
+
+        public override Task<TransportInfrastructure> Initialize(HostSettings hostSettings, ReceiveSettings[] receivers, string[] sendingAddresses)
+        {
+            QueuesToCleanup.AddRange(receivers.Select(x => x.ReceiveAddress).Concat(sendingAddresses).Distinct());
+            return base.Initialize(hostSettings, receivers, sendingAddresses);
+        }
+
+        public List<string> QueuesToCleanup { get; } = new List<string>();
+    }
 }

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/DelayedDelivery/When_deferring_a_message_longer_than_allowed_maximum.cs

@@ -28,7 +28,7 @@ public void Should_throw()
                 .Run());
 
             Assert.That(exception, Is.Not.Null);
-            Assert.IsTrue(exception.Message.StartsWith("Message cannot be sent with"));
+            StringAssert.StartsWith("Message cannot be delayed by", exception.Message);
         }
 
         public class Endpoint : EndpointConfigurationBuilder

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/NServiceBus.Transport.RabbitMQ.AcceptanceTests.csproj

@@ -11,7 +11,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.3" />
-    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="8.0.0-alpha.644" />
+    <PackageReference Include="NServiceBus.AcceptanceTests.Sources" Version="8.0.0-alpha.842" />
     <PackageReference Include="NUnit" Version="3.13.1" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.17.0" />
     <PackageReference Include="RabbitMQ.Client" Version="6.2.1" />

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/TestSuiteConstraints.cs

@@ -13,6 +13,7 @@ public partial class TestSuiteConstraints
         public bool SupportsDelayedDelivery => true;
 
         public bool SupportsOutbox => true;
+        public bool SupportsPurgeOnStartup => true;
 
         public IConfigureEndpointTestExecution CreateTransportConfiguration() => new ConfigureEndpointRabbitMQTransport();
 

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/When_publishing_message_implementing_interface_in_direct_topology.cs

@@ -36,8 +36,10 @@ public class Publisher : EndpointConfigurationBuilder
         {
             public Publisher()
             {
-                EndpointSetup<DefaultServer>(c => c.UseTransport<RabbitMQTransport>()
-                    .UseDirectRoutingTopology());
+                EndpointSetup<DefaultServer>(c =>
+                {
+                    c.ConfigureRabbitMQTransport().RoutingTopology = new DirectRoutingTopology(true);
+                });
             }
         }
 
@@ -47,7 +49,7 @@ public Receiver()
             {
                 EndpointSetup<DefaultServer>(builder =>
                 {
-                    builder.UseTransport<RabbitMQTransport>().UseDirectRoutingTopology();
+                    builder.ConfigureRabbitMQTransport().RoutingTopology = new DirectRoutingTopology(true);
                     builder.DisableFeature<AutoSubscribe>();
                 }, metadata => metadata.RegisterPublisherFor<IMyRequest>(typeof(Publisher)));
             }

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/When_receiving_a_message.cs

@@ -24,7 +24,7 @@ public class Receiver : EndpointConfigurationBuilder
         {
             public Receiver()
             {
-                EndpointSetup<DefaultServer>(c => c.UseTransport<RabbitMQTransport>());
+                EndpointSetup<DefaultServer>();
             }
 
             class MyEventHandler : IHandleMessages<Message>

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/When_receiving_a_reply_that_contains_a_legacy_callback_header.cs

@@ -48,7 +48,7 @@ public OriginatingEndpoint()
             {
                 EndpointSetup<DefaultServer>(config =>
                 {
-                    config.ConfigureTransport().Routing().RouteToEndpoint(typeof(Request), typeof(ReceivingEndpoint));
+                    config.ConfigureRouting().RouteToEndpoint(typeof(Request), typeof(ReceivingEndpoint));
                     config.AuditProcessedMessagesTo<AuditSpyEndpoint>();
                 });
             }

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/When_requesting_non_persistent_delivery.cs

@@ -32,7 +32,7 @@ public class Receiver : EndpointConfigurationBuilder
         {
             public Receiver()
             {
-                EndpointSetup<DefaultServer>(c => c.UseTransport<RabbitMQTransport>());
+                EndpointSetup<DefaultServer>();
             }
 
             class MyEventHandler : IHandleMessages<Message>

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/When_scaling_out_senders_that_uses_callbacks.cs

@@ -71,7 +71,7 @@ public class ScaledOutClient : EndpointConfigurationBuilder
             public ScaledOutClient()
             {
                 EndpointSetup<DefaultServer>(config =>
-                    config.ConfigureTransport().Routing().RouteToEndpoint(typeof(MyRequest), typeof(ServerThatRespondsToCallbacks)));
+                    config.ConfigureRouting().RouteToEndpoint(typeof(MyRequest), typeof(ServerThatRespondsToCallbacks)));
             }
 
             class MyResponseHandler : IHandleMessages<MyResponse>

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/When_the_broker_connection_is_lost.cs

@@ -4,7 +4,6 @@
     using System.Collections.Generic;
     using System.Threading.Tasks;
     using AcceptanceTesting;
-    using DeliveryConstraints;
     using Extensibility;
     using Features;
     using Microsoft.Extensions.DependencyInjection;
@@ -51,7 +50,7 @@ protected override void Setup(FeatureConfigurationContext context)
 
                 class ConnectionKiller : FeatureStartupTask
                 {
-                    public ConnectionKiller(IDispatchMessages sender, ReadOnlySettings settings, MyContext context)
+                    public ConnectionKiller(IMessageDispatcher sender, ReadOnlySettings settings, MyContext context)
                     {
                         this.context = context;
                         this.sender = sender;
@@ -72,8 +71,13 @@ async Task BreakConnectionBySendingInvalidMessage()
                         try
                         {
                             var outgoingMessage = new OutgoingMessage("Foo", new Dictionary<string, string>(), new byte[0]);
-                            var operation = new TransportOperation(outgoingMessage, new UnicastAddressTag(settings.EndpointName()), deliveryConstraints: new List<DeliveryConstraint> { new DiscardIfNotReceivedBefore(TimeSpan.FromMilliseconds(-1)) });
-                            await sender.Dispatch(new TransportOperations(operation), new TransportTransaction(), new ContextBag());
+                            var props = new DispatchProperties
+                            {
+                                DiscardIfNotReceivedBefore =
+                                    new DiscardIfNotReceivedBefore(TimeSpan.FromMilliseconds(-1))
+                            };
+                            var operation = new TransportOperation(outgoingMessage, new UnicastAddressTag(settings.EndpointName()), props);
+                            await sender.Dispatch(new TransportOperations(operation), new TransportTransaction());
                         }
                         catch (Exception)
                         {
@@ -82,7 +86,7 @@ async Task BreakConnectionBySendingInvalidMessage()
                     }
 
                     readonly MyContext context;
-                    readonly IDispatchMessages sender;
+                    readonly IMessageDispatcher sender;
                     readonly ReadOnlySettings settings;
                 }
             }

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/When_the_message_contains_a_legacy_callback_header.cs

@@ -47,7 +47,7 @@ class OriginatingEndpoint : EndpointConfigurationBuilder
             public OriginatingEndpoint()
             {
                 EndpointSetup<DefaultServer>(config =>
-                    config.ConfigureTransport().Routing().RouteToEndpoint(typeof(Request), typeof(ReceivingEndpoint)));
+                    config.ConfigureRouting().RouteToEndpoint(typeof(Request), typeof(ReceivingEndpoint)));
             }
 
             class ReplyHandler : IHandleMessages<Reply>

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/When_using_a_custom_message_id_strategy.cs

@@ -36,8 +36,7 @@ public Receiver()
                 EndpointSetup<DefaultServer>(c =>
                 {
                     c.EnableFeature<StarterFeature>();
-                    c.UseTransport<RabbitMQTransport>()
-                        .CustomMessageIdStrategy(m => customMessageId);
+                    c.ConfigureRabbitMQTransport().MessageIdStrategy = m => customMessageId;
                 });
             }
 
@@ -51,7 +50,7 @@ protected override void Setup(FeatureConfigurationContext context)
 
                 class Starter : FeatureStartupTask
                 {
-                    public Starter(IDispatchMessages dispatchMessages, ReadOnlySettings settings)
+                    public Starter(IMessageDispatcher dispatchMessages, ReadOnlySettings settings)
                     {
                         this.dispatchMessages = dispatchMessages;
                         this.settings = settings;
@@ -71,12 +70,12 @@ protected override Task OnStart(IMessageSession session)
                             Encoding.UTF8.GetBytes(messageBody));
 
                         var transportOperation = new TransportOperation(message, new UnicastAddressTag(settings.EndpointName()));
-                        return dispatchMessages.Dispatch(new TransportOperations(transportOperation), new TransportTransaction(), new ContextBag());
+                        return dispatchMessages.Dispatch(new TransportOperations(transportOperation), new TransportTransaction());
                     }
 
                     protected override Task OnStop(IMessageSession session) => Task.CompletedTask;
 
-                    readonly IDispatchMessages dispatchMessages;
+                    readonly IMessageDispatcher dispatchMessages;
                     readonly ReadOnlySettings settings;
                 }
             }

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/When_using_a_custom_message_id_strategy_that_returns_an_invalid_message_id.cs

@@ -25,8 +25,7 @@ public Receiver()
             {
                 EndpointSetup<DefaultServer>(c =>
                 {
-                    c.UseTransport<RabbitMQTransport>()
-                        .CustomMessageIdStrategy(m => "");
+                    c.ConfigureRabbitMQTransport().MessageIdStrategy = m => "";
                 });
             }
 

src/NServiceBus.Transport.RabbitMQ.AcceptanceTests/When_using_direct_routing.cs

@@ -23,8 +23,10 @@ public class Receiver : EndpointConfigurationBuilder
         {
             public Receiver()
             {
-                EndpointSetup<DefaultServer>(c => c.UseTransport<RabbitMQTransport>()
-                    .UseDirectRoutingTopology());
+                EndpointSetup<DefaultServer>(c =>
+                {
+                    c.ConfigureRabbitMQTransport().RoutingTopology = new DirectRoutingTopology(true);
+                });
             }
 
             class MyEventHandler : IHandleMessages<MyRequest>