Merge pull request #2963 from Particular/hotfix-5.0.6

prevent timeout message loss when not using DTC

.gitattributes

@@ -55,9 +55,11 @@
 *.fs text
 *.fsx text
 *.hs text
-
+*.targets text
 *.psm1 text
 *.ps1 text
+*.md text
+*.DotSettings text
 *.txt text eol=crlf
 *.bat text eol=crlf
 

.gitignore

@@ -1,22 +1,13 @@
 nugets
+deploy
 build32
 binaries
-obj
-bin
 *.vshost.*
 .nu
-_ReSharper.*
 _UpgradeReport.*
-*.csproj.user
-*.resharper.user
-*.resharper
-*.suo
 *.cache
 *~
 *.swp
-*.user
-TestResults
-TestResult.xml
 results
 CommonAssemblyInfo.cs
 lib/sqlite/System.Data.SQLite.dll
@@ -35,3 +26,60 @@ _NCrunch_NServiceBus/*
 logs
 run-git.cmd
 src/Chocolatey/Build/*
+
+installer/[F|f]iles
+installer/[C|c]ustom[A|a]ctions
+installer/ServiceControl-cache
+
+# Created by https://www.gitignore.io
+
+### VisualStudio ###
+## Ignore Visual Studio temporary files, build results, and
+## files generated by popular Visual Studio add-ons.
+
+# User-specific files
+*.suo
+*.user
+*.userosscache
+*.sln.docstates
+.vs/
+
+# mac temp file ignore
+.DS_Store
+
+# Build results
+[Dd]ebug/
+[Dd]ebugPublic/
+[Rr]elease/
+[Rr]eleases/
+x64/
+x86/
+build/
+bld/
+[Bb]in/
+[Oo]bj/
+
+# Roslyn cache directories
+*.ide/
+
+# MSTest test Results
+[Tt]est[Rr]esult*/
+[Bb]uild[Ll]og.*
+
+#NUNIT
+*.VisualState.xml
+TestResult.xml
+
+# NCrunch
+_NCrunch_*
+.*crunch*.local.xml
+
+# ReSharper is a .NET coding add-in
+_ReSharper*/
+*.[Rr]e[Ss]harper
+*.DotSettings.user
+
+src/scaffolding.config
+
+# Approval tests temp file
+*.received.*

src/NServiceBus.AcceptanceTests/DataBus/When_sending_with_custom_IDataBus.cs

@@ -21,7 +21,8 @@ public void Should_receive_the_message_the_correctly()
                             Payload = new DataBusProperty<byte[]>(PayloadToSend) 
                         })))
                     .WithEndpoint<Receiver>()
-                    .Done(context => context.ReceivedPayload != null)
+                    .AllowExceptions(e => e.Message.Contains("A queue with the same path name already exists"))
+                    .Done(ctx => ctx.ReceivedPayload != null)
                     .Repeat(r => r.For<AllSerializers>())
                     .Should(c => Assert.AreEqual(PayloadToSend, c.ReceivedPayload, "The large payload should be marshalled correctly using the databus"))
                     .Run();