Subscriptions do not work with publishers using NServiceBus 7.3.x or earlier

src/NServiceBus.Transport.Bridge/Configuration/BridgeConfiguration.cs

@@ -95,15 +95,15 @@ internal FinalizedBridgeConfiguration FinalizeConfiguration(ILogger<BridgeConfig
                 sb.AppendLine();
                 foreach (var eventType in eventsWithNoRegisteredPublisher)
                 {
-                    sb.AppendLine($"- {eventType.EventTypeFullName}, publisher: {eventType.Publisher}");
+                    sb.AppendLine($"- {eventType.EventTypeAssemblyQualifiedName}, publisher: {eventType.Publisher}");
                 }
                 throw new InvalidOperationException(sb.ToString());
             }
 
             var eventsWithMultiplePublishers = transportConfigurations
                 .SelectMany(t => t.Endpoints)
                 .SelectMany(e => e.Subscriptions)
-                .GroupBy(e => e.EventTypeFullName)
+                .GroupBy(e => e.EventTypeAssemblyQualifiedName)
                 .Where(g => g.GroupBy(s => s.Publisher).Count() > 1);
 
             if (eventsWithMultiplePublishers.Any())

src/NServiceBus.Transport.Bridge/Configuration/BridgeEndpoint.cs

@@ -49,18 +49,38 @@ public void RegisterPublisher(Type eventType, string publisher)
             Guard.AgainstNull(nameof(eventType), eventType);
             Guard.AgainstNullAndEmpty(nameof(publisher), publisher);
 
-            RegisterPublisher(eventType.FullName, publisher);
+            var fullyQualifiedAssemblyTypeName = eventType.AssemblyQualifiedName;
+
+            const string NeutralSuffix = ", Culture=neutral, PublicKeyToken=null";
+
+            if (fullyQualifiedAssemblyTypeName.EndsWith(NeutralSuffix))
+            {
+                fullyQualifiedAssemblyTypeName = fullyQualifiedAssemblyTypeName.Substring(0, fullyQualifiedAssemblyTypeName.Length - NeutralSuffix.Length);
+            }
+
+            RegisterPublisher(fullyQualifiedAssemblyTypeName, publisher);
         }
 
         /// <summary>
-        /// Registers the publisher of the given event type using its fully-qualified type name
+        /// Registers the publisher of the given event type using its assembly fully-qualified name i.e `MyNamespace.EventName, AssemblyName, Version=1.0.0.0` (the culture and public keys are ignored by NServiceBus)
         /// </summary>
-        public void RegisterPublisher(string eventTypeFullName, string publisher)
+        public void RegisterPublisher(string eventTypeAssemblyQualifiedName, string publisher)
         {
-            Guard.AgainstNullAndEmpty(nameof(eventTypeFullName), eventTypeFullName);
+            Guard.AgainstNullAndEmpty(nameof(eventTypeAssemblyQualifiedName), eventTypeAssemblyQualifiedName);
             Guard.AgainstNullAndEmpty(nameof(publisher), publisher);
 
-            Subscriptions.Add(new Subscription(eventTypeFullName, publisher));
+            try
+            {
+                // Try retrieving type, this will validate the assembly qualified name. A value cannot
+                // be parsed it will throw. If it can be parsed it doesn't mean the type can be
+                // resolved thus the result is ignored.
+                _ = Type.GetType(eventTypeAssemblyQualifiedName, false);
+                Subscriptions.Add(new Subscription(eventTypeAssemblyQualifiedName, publisher));
+            }
+            catch
+            {
+                throw new ArgumentException("The event type assembly qualified name is invalid", eventTypeAssemblyQualifiedName);
+            }
         }
 
         internal string Name { get; private set; }
@@ -71,13 +91,13 @@ public void RegisterPublisher(string eventTypeFullName, string publisher)
 
         internal class Subscription
         {
-            public Subscription(string eventTypeFullName, string publisher)
+            public Subscription(string eventTypeAssemblyQualifiedName, string publisher)
             {
-                EventTypeFullName = eventTypeFullName;
+                EventTypeAssemblyQualifiedName = eventTypeAssemblyQualifiedName;
                 Publisher = publisher;
             }
 
-            public string EventTypeFullName { get; private set; }
+            public string EventTypeAssemblyQualifiedName { get; private set; }
 
             public string Publisher { get; private set; }
         }

src/NServiceBus.Transport.Bridge/SubscriptionManager.cs

@@ -38,7 +38,7 @@ class SubscriptionManager
         var eventTypes = new List<MessageMetadata>();
         foreach (var subscription in subscriptions)
         {
-            var eventType = TypeGenerator.GetType(subscription.EventTypeFullName);
+            var eventType = TypeGenerator.GetType(subscription.EventTypeAssemblyQualifiedName);
 
             eventTypes.Add(new MessageMetadata(eventType));
         }
@@ -63,7 +63,7 @@ await endpointProxy.SubscriptionManager.SubscribeAll(eventTypes.ToArray(), new C
         var localAddress = endpointProxy.TransportAddress;
         var subscriptionMessage = ControlMessageFactory.Create(MessageIntent.Subscribe);
 
-        subscriptionMessage.Headers[Headers.SubscriptionMessageType] = subscription.EventTypeFullName + ",Version=1.0.0";
+        subscriptionMessage.Headers[Headers.SubscriptionMessageType] = subscription.EventTypeAssemblyQualifiedName;
         subscriptionMessage.Headers[Headers.ReplyToAddress] = localAddress;
         subscriptionMessage.Headers[Headers.SubscriberTransportAddress] = localAddress;
 
@@ -81,7 +81,7 @@ await endpointProxy.SubscriptionManager.SubscribeAll(eventTypes.ToArray(), new C
         }
         catch (QueueNotFoundException ex)
         {
-            var message = $"Failed to subscribe to {subscription.EventTypeFullName} at publisher queue {subscription.Publisher}, reason {ex.Message}";
+            var message = $"Failed to subscribe to {subscription.EventTypeAssemblyQualifiedName} at publisher queue {subscription.Publisher}, reason {ex.Message}";
             throw new QueueNotFoundException(subscription.Publisher, message, ex);
         }
     }

src/UnitTests/ApprovalFiles/APIApprovals.PublicApi.approved.txt

@@ -11,7 +11,7 @@ namespace NServiceBus
     {
         public BridgeEndpoint(string name) { }
         public BridgeEndpoint(string name, string queueAddress) { }
-        public void RegisterPublisher(string eventTypeFullName, string publisher) { }
+        public void RegisterPublisher(string eventTypeAssemblyQualifiedName, string publisher) { }
         public void RegisterPublisher(System.Type eventType, string publisher) { }
         public void RegisterPublisher<T>(string publisher) { }
     }

src/UnitTests/BridgeEndpointConfigurationTests.cs

@@ -12,10 +12,10 @@ public void Should_allow_subscribing_by_type()
         endpoint.RegisterPublisher<MyEvent>("Billing");
         endpoint.RegisterPublisher(typeof(MyOtherEvent), "Shipping");
 
-        var billingSubscription = endpoint.Subscriptions.SingleOrDefault(t => t.EventTypeFullName == typeof(MyEvent).FullName);
+        var billingSubscription = endpoint.Subscriptions.SingleOrDefault(t => t.EventTypeAssemblyQualifiedName == typeof(MyEvent).AssemblyQualifiedName);
         Assert.AreEqual("Billing", billingSubscription.Publisher);
 
-        var shippingSubscription = endpoint.Subscriptions.SingleOrDefault(t => t.EventTypeFullName == typeof(MyOtherEvent).FullName);
+        var shippingSubscription = endpoint.Subscriptions.SingleOrDefault(t => t.EventTypeAssemblyQualifiedName == typeof(MyOtherEvent).AssemblyQualifiedName);
         Assert.AreEqual("Shipping", shippingSubscription.Publisher);
 
     }