Merge branch 'release-2.0.0' into develop

Author: Tim Bussmann

.gitignore

@@ -12,9 +12,11 @@ results
 CommonAssemblyInfo.cs
 lib/sqlite/System.Data.SQLite.dll
 *.orig
+*.zip
 Samples/DataBus/storage
 packages
 PrecompiledWeb
+tempstorage
 core-only
 Release
 Artifacts
@@ -82,4 +84,8 @@ _ReSharper*/
 src/scaffolding.config
 
 # Approval tests temp file
-*.received.*
+*.received.*
+
+# JetBrains Rider
+.idea/
+*.sln.iml

GitVersionConfig.yaml GitVersion.ymlGitVersionConfig.yaml renamed to GitVersion.yml

@@ -3,3 +3,5 @@ next-version: 2.0
 branches:
   develop:
     tag: alpha
+  releases?[/-]:
+    tag: rc

packaging/nuget/nservicebus.gateway.nuspec

@@ -14,10 +14,10 @@
     <copyright>$copyright$</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies>
-      <dependency id="NServiceBus" version="[6.0.0-beta, 7.0.0)" />
+      <dependency id="NServiceBus" version="[6.0.0, 7.0.0)" />
     </dependencies>
   </metadata>
   <files>
     <file src="..\..\src\NServiceBus.Gateway\bin\Release\NServiceBus.Gateway.???" target="lib\net452" />
   </files>
-</package>
+</package>

src/NServiceBus.Gateway.AcceptanceTests/ConfigureEndpointMsmqTransport.cs

@@ -5,17 +5,8 @@
 using System.Threading.Tasks;
 using NServiceBus;
 using NServiceBus.AcceptanceTesting.Support;
-using NServiceBus.AcceptanceTests.ScenarioDescriptors;
 using NServiceBus.Configuration.AdvanceExtensibility;
-using NServiceBus.Transports;
-
-public class ConfigureScenariosForMsmqTransport : IConfigureSupportedScenariosForTestExecution
-{
-    public IEnumerable<Type> UnsupportedScenarioDescriptorTypes { get; } = new[]
-    {
-        typeof(AllTransportsWithCentralizedPubSubSupport)
-    };
-}
+using NServiceBus.Transport;
 
 public class ConfigureEndpointMsmqTransport : IConfigureEndpointTestExecution
 {

src/NServiceBus.Gateway.AcceptanceTests/ConfigureScenariosForMsmqTransport.cs

@@ -0,0 +1,12 @@
+using System;
+using System.Collections.Generic;
+using NServiceBus.AcceptanceTesting.Support;
+using NServiceBus.AcceptanceTests.ScenarioDescriptors;
+
+public class ConfigureScenariosForMsmqTransport : IConfigureSupportedScenariosForTestExecution
+{
+    public IEnumerable<Type> UnsupportedScenarioDescriptorTypes { get; } = new[]
+    {
+        typeof(AllTransportsWithCentralizedPubSubSupport)
+    };
+}

src/NServiceBus.Gateway.AcceptanceTests/EndpointTemplates/ConfigureExtensions.cs

@@ -2,8 +2,8 @@
 {
     using System;
     using System.Threading.Tasks;
-    using NServiceBus.AcceptanceTesting.Support;
-    using NServiceBus.AcceptanceTests.ScenarioDescriptors;
+    using AcceptanceTesting.Support;
+    using ScenarioDescriptors;
     using ObjectBuilder;
 
     public static class ConfigureExtensions

src/NServiceBus.Gateway.AcceptanceTests/EndpointTemplates/DefaultPublisher.cs

@@ -2,8 +2,8 @@ namespace NServiceBus.AcceptanceTests.EndpointTemplates
 {
     using System;
     using System.Threading.Tasks;
-    using NServiceBus.AcceptanceTesting.Support;
-    using NServiceBus.Config.ConfigurationSource;
+    using AcceptanceTesting.Support;
+    using Config.ConfigurationSource;
 
     public class DefaultPublisher : IEndpointSetupTemplate
     {

src/NServiceBus.Gateway.AcceptanceTests/EndpointTemplates/DefaultServer.cs

@@ -4,12 +4,12 @@
     using System.Collections.Generic;
     using System.Linq;
     using System.Threading.Tasks;
-    using NServiceBus.AcceptanceTesting.Customization;
-    using NServiceBus.AcceptanceTesting.Support;
-    using NServiceBus.Config.ConfigurationSource;
-    using NServiceBus.Configuration.AdvanceExtensibility;
-    using NServiceBus.Features;
-    using NServiceBus.Serialization;
+    using AcceptanceTesting.Customization;
+    using AcceptanceTesting.Support;
+    using Config.ConfigurationSource;
+    using Configuration.AdvanceExtensibility;
+    using Features;
+    using Serialization;
 
     public class DefaultServer : IEndpointSetupTemplate
     {
@@ -46,8 +46,9 @@ public async Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescr
             builder.EnableInstallers();
 
             builder.DisableFeature<TimeoutManager>();
-            builder.DisableFeature<SecondLevelRetries>();
-            builder.DisableFeature<FirstLevelRetries>();
+            builder.Recoverability()
+                .Delayed(delayed => delayed.NumberOfRetries(0))
+                .Immediate(immediate => immediate.NumberOfRetries(0));
 
             await builder.DefineTransport(settings, endpointConfiguration.EndpointName).ConfigureAwait(false);
 

src/NServiceBus.Gateway.AcceptanceTests/EndpointTemplates/EndpointCustomizationConfigurationExtensions.cs

@@ -5,7 +5,7 @@
     using System.Linq;
     using System.Reflection;
     using AcceptanceTesting.Support;
-    using NServiceBus.Hosting.Helpers;
+    using Hosting.Helpers;
 
     public static class EndpointCustomizationConfigurationExtensions
     {

src/NServiceBus.Gateway.AcceptanceTests/EndpointTemplates/ServerWithNoDefaultPersistenceDefinitions.cs

@@ -3,10 +3,10 @@
     using System;
     using System.Collections.Generic;
     using System.Threading.Tasks;
-    using NServiceBus.AcceptanceTesting.Customization;
-    using NServiceBus.AcceptanceTesting.Support;
-    using NServiceBus.Config.ConfigurationSource;
-    using NServiceBus.Features;
+    using AcceptanceTesting.Customization;
+    using AcceptanceTesting.Support;
+    using Config.ConfigurationSource;
+    using Features;
 
     public class ServerWithNoDefaultPersistenceDefinitions : IEndpointSetupTemplate
     {
@@ -34,8 +34,9 @@ public async Task<EndpointConfiguration> GetConfiguration(RunDescriptor runDescr
             builder.EnableInstallers();
 
             builder.DisableFeature<TimeoutManager>();
-            builder.DisableFeature<SecondLevelRetries>();
-            builder.DisableFeature<FirstLevelRetries>();
+            builder.Recoverability()
+                .Delayed(delayed => delayed.NumberOfRetries(0))
+                .Immediate(immediate => immediate.NumberOfRetries(0));
 
             await builder.DefineTransport(settings, endpointConfiguration.EndpointName).ConfigureAwait(false);