Remove invalid changes

src/Services/Basket/Basket.API/Startup.cs

@@ -284,9 +284,7 @@ namespace Microsoft.eShopOnContainers.Services.Basket.API
                     var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
                     var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
                     var serviceBusConnectionString = Configuration["EventBusConnection"];
-                    string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace;
-                    string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.');
-                    string topicName = fulNamespaceArray[0];
+                    string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath;
                     string subscriptionName = Configuration["SubscriptionClientName"];
 
                     return new EventBusServiceBus(serviceBusPersisterConnection, logger,

src/Services/Catalog/Catalog.API/Startup.cs

@@ -333,9 +333,7 @@ namespace Microsoft.eShopOnContainers.Services.Catalog.API
                     var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
                     var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
                     var serviceBusConnectionString = configuration["EventBusConnection"];
-                    string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace;
-                    string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.');
-                    string topicName = fulNamespaceArray[0];
+                    string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath;
                     string subscriptionName = configuration["SubscriptionClientName"];
 
                     return new EventBusServiceBus(serviceBusPersisterConnection, logger,

src/Services/Ordering/Ordering.API/Startup.cs

@@ -376,9 +376,7 @@ namespace Microsoft.eShopOnContainers.Services.Ordering.API
                     var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
                     var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
                     var serviceBusConnectionString = configuration["EventBusConnection"];
-                    string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace;
-                    string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.');
-                    string topicName = fulNamespaceArray[0];
+                    string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath;
                     string subscriptionName = configuration["SubscriptionClientName"];
 
                     return new EventBusServiceBus(serviceBusPersisterConnection, logger,

src/Services/Ordering/Ordering.BackgroundTasks/Extensions/CustomExtensionMethods.cs

@@ -65,9 +65,7 @@ namespace Ordering.BackgroundTasks.Extensions
                     var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
                     var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
                     var serviceBusConnectionString = configuration["EventBusConnection"];
-                    string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace;
-                    string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.');
-                    string topicName = fulNamespaceArray[0];
+                    string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath;
                     string subscriptionName = configuration["SubscriptionClientName"];
 
                     return new EventBusServiceBus(serviceBusPersisterConnection, logger, eventBusSubcriptionsManager, iLifetimeScope, topicName, subscriptionName);

src/Services/Ordering/Ordering.SignalrHub/Startup.cs

@@ -213,9 +213,7 @@ namespace Ordering.SignalrHub
                     var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
                     var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
                     var serviceBusConnectionString = Configuration["EventBusConnection"];
-                    string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace;
-                    string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.');
-                    string topicName = fulNamespaceArray[0];
+                    string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath;
                     string subscriptionName = Configuration["SubscriptionClientName"];
 
                     return new EventBusServiceBus(serviceBusPersisterConnection, logger,

src/Services/Payment/Payment.API/Startup.cs

@@ -130,9 +130,7 @@ namespace Payment.API
                     var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
                     var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
                     var serviceBusConnectionString = Configuration["EventBusConnection"];
-                    string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace;
-                    string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.');
-                    string topicName = fulNamespaceArray[0];
+                    string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath;
                     string subscriptionName = Configuration["SubscriptionClientName"];
 
                     return new EventBusServiceBus(serviceBusPersisterConnection, logger,

src/Services/Webhooks/Webhooks.API/Startup.cs

@@ -216,9 +216,7 @@ namespace Webhooks.API
                     var logger = sp.GetRequiredService<ILogger<EventBusServiceBus>>();
                     var eventBusSubcriptionsManager = sp.GetRequiredService<IEventBusSubscriptionsManager>();
                     var serviceBusConnectionString = configuration["EventBusConnection"];
-                    string fullyQualifiedNamespace = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).FullyQualifiedNamespace;
-                    string[] fulNamespaceArray = fullyQualifiedNamespace.Split('.');
-                    string topicName = fulNamespaceArray[0];
+                    string topicName = ServiceBusConnectionStringProperties.Parse(serviceBusConnectionString).EntityPath;
                     string subscriptionName = configuration["SubscriptionClientName"];
 
                     return new EventBusServiceBus(serviceBusPersisterConnection, logger,