Bump to latest Raw 3.2.4 to include all the required transport hackery

SzymonPobiega · May 11, 2021 · 83df99b · 83df99b
1 parent 2a59f34
commit 83df99b
Show file tree

Hide file tree

Showing 10 changed files with 171 additions and 208 deletions.
diff --git a/...viceBus.Router.AcceptanceTests/SingleRouter/When_publishing_from_asb_endpoint_oriented.cs b/...viceBus.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<NServiceBus.Conventions>(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/...ests/SingleRouter/When_publishing_from_asb_endpoint_oriented_while_router_is_restarted.cs b/...ests/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
@@ -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
@@ -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<ValidateAndHashIfNeeded>();
-
-                        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
@@ -7,7 +7,7 @@
     <LangVersion>latest</LangVersion>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="1.0.0-*" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="All" />
     <PackageReference Include="NServiceBus" Version="[7.4.0, 8.0.0)" />
   </ItemGroup>
 

diff --git a/src/NServiceBus.Router.Migrator/NServiceBus.Router.Migrator.csproj b/src/NServiceBus.Router.Migrator/NServiceBus.Router.Migrator.csproj
@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="1.0.0-*" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="All" />
     <PackageReference Include="NServiceBus" Version="[7.4.0, 8.0.0)" />
-    <PackageReference Include="NServiceBus.Raw" Version="[3.2.1, 4.0.0)" />
+    <PackageReference Include="NServiceBus.Raw" Version="[3.2.4, 4.0.0)" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NServiceBus.Router.SqlServer/NServiceBus.Router.SqlServer.csproj b/src/NServiceBus.Router.SqlServer/NServiceBus.Router.SqlServer.csproj
@@ -8,9 +8,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="MinVer" Version="1.0.0-*" PrivateAssets="All" />
+    <PackageReference Include="MinVer" Version="2.5.0" PrivateAssets="All" />
     <PackageReference Include="NServiceBus" Version="[7.4.0, 8.0.0)" />
-    <PackageReference Include="NServiceBus.Raw" Version="[3.2.1, 4.0.0)" />
+    <PackageReference Include="NServiceBus.Raw" Version="[3.2.4, 4.0.0)" />
     <PackageReference Include="System.Data.SqlClient" Version="4.4.3" />
     <PackageReference Include="NServiceBus.SqlServer" Version="[4.0.0, 5.9.0)" />
   </ItemGroup>