implement IPersistTimeoutsV2 interface

.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
 
@@ -71,6 +73,3 @@
 *.snk 	-text -diff
 *.cub 	-text -diff
 *.wixlib	-text -diff
-
-
-*.approved.* binary

.gitignore

@@ -2,22 +2,12 @@ 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
@@ -36,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.*

packaging/nuget/nservicebus.nhibernate.nuspec

@@ -17,7 +17,7 @@
     <dependencies>
       <dependency id="Iesi.Collections" version="[4.0.1.4000, 5.0.0)" />
       <dependency id="NHibernate" version="[4.0.1.4000, 5.0.0)" />
-      <dependency id="NServiceBus" version="[5.0.0, 6.0.0)" />
+      <dependency id="NServiceBus" version="[5.0.6, 6.0.0)" />
     </dependencies>
   </metadata>
   <files>

src/NServiceBus.NHibernate.AcceptanceTests-Oracle/NServiceBus.NHibernate.AcceptanceTests-Oracle.csproj

@@ -51,8 +51,8 @@
       <HintPath>..\packages\NServiceBus.AcceptanceTesting.5.0.0\lib\net45\NServiceBus.AcceptanceTesting.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NServiceBus.5.0.0\lib\net45\NServiceBus.Core.dll</HintPath>
+      <HintPath>..\packages\NServiceBus.5.0.6\lib\net45\NServiceBus.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>

src/NServiceBus.NHibernate.AcceptanceTests-Oracle/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net40" />
-  <package id="NServiceBus" version="5.0.0" targetFramework="net45" />
   <package id="NHibernate" version="4.0.1.4000" targetFramework="net40" />
+  <package id="NServiceBus" version="5.0.6" targetFramework="net45" />
   <package id="NServiceBus.AcceptanceTesting" version="5.0.0" targetFramework="net45" />
   <package id="NServiceBus.AcceptanceTests.Sources" version="5.0.0" targetFramework="net45" />
   <package id="NUnit" version="2.6.3" targetFramework="net45" />

src/NServiceBus.NHibernate.AcceptanceTests/App_Packages/NSB.AcceptanceTests.5.0.0/Exceptions/When_Uow_Begin_and_different_End_throws.cs

@@ -25,25 +25,6 @@ public void Should_receive_AggregateException_with_both_exceptions()
 
             Assert.AreEqual(typeof(BeginException), context.InnerExceptionOneType);
             Assert.AreEqual(typeof(EndException), context.InnerExceptionTwoType);
-
-
-#if (!DEBUG)
-
-            StackTraceAssert.AreEqual(
-@"at NServiceBus.UnitOfWorkBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ChildContainerBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ProcessingStatisticsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.Pipeline.PipelineExecutor.Execute[T](BehaviorChain`1 pipelineAction, T context)
-at NServiceBus.Unicast.Transport.TransportReceiver.ProcessMessage(TransportMessage message)
-at NServiceBus.Unicast.Transport.TransportReceiver.TryProcess(TransportMessage message)
-at NServiceBus.Transports.Msmq.MsmqDequeueStrategy.Action()", context.StackTrace);
-
-            StackTraceAssert.AreEqual(
-@"at NServiceBus.AcceptanceTests.Exceptions.When_Uow_Begin_and_different_End_throws.Endpoint.UnitOfWorkThatThrowsInEnd.End(Exception ex)
-at NServiceBus.UnitOfWorkBehavior.AppendEndExceptionsAndRethrow(Exception initialException)", context.InnerExceptionTwoStackTrace);
-
-#endif
-
         }
 
         public class Context : ScenarioContext

src/NServiceBus.NHibernate.AcceptanceTests/App_Packages/NSB.AcceptanceTests.5.0.0/Exceptions/When_Uow_Begin_throws.cs

@@ -24,17 +24,6 @@ public void Should_receive_exception_thrown_from_begin()
                     .Run();
 
             Assert.AreEqual(typeof(BeginException), context.ExceptionType);
-#if (!DEBUG)
-            StackTraceAssert.AreEqual(
-@"at NServiceBus.AcceptanceTests.Exceptions.When_Uow_Begin_throws.Endpoint.UnitOfWorkThatThrowsInBegin.Begin()
-at NServiceBus.UnitOfWorkBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ChildContainerBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ProcessingStatisticsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.Pipeline.PipelineExecutor.Execute[T](BehaviorChain`1 pipelineAction, T context)
-at NServiceBus.Unicast.Transport.TransportReceiver.ProcessMessage(TransportMessage message)
-at NServiceBus.Unicast.Transport.TransportReceiver.TryProcess(TransportMessage message)
-at NServiceBus.Transports.Msmq.MsmqDequeueStrategy.Action()", context.StackTrace);
-#endif
         }
 
         public class Context : ScenarioContext

src/NServiceBus.NHibernate.AcceptanceTests/App_Packages/NSB.AcceptanceTests.5.0.0/Exceptions/When_Uow_End_throws.cs

@@ -24,17 +24,6 @@ public void Should_receive_exception_thrown_from_end()
                     .Run();
 
             Assert.AreEqual(typeof(EndException), context.ExceptionType);
-#if(!DEBUG)
-            StackTraceAssert.AreEqual(
-@"at NServiceBus.AcceptanceTests.Exceptions.When_Uow_End_throws.Endpoint.UnitOfWorkThatThrowsInEnd.End(Exception ex)
-at NServiceBus.UnitOfWorkBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ChildContainerBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ProcessingStatisticsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.Pipeline.PipelineExecutor.Execute[T](BehaviorChain`1 pipelineAction, T context)
-at NServiceBus.Unicast.Transport.TransportReceiver.ProcessMessage(TransportMessage message)
-at NServiceBus.Unicast.Transport.TransportReceiver.TryProcess(TransportMessage message)
-at NServiceBus.Transports.Msmq.MsmqDequeueStrategy.Action()", context.StackTrace);
-#endif
         }
 
         public class Context : ScenarioContext

src/NServiceBus.NHibernate.AcceptanceTests/App_Packages/NSB.AcceptanceTests.5.0.0/Exceptions/When_handler_and_Uow_End_throws.cs

@@ -24,36 +24,6 @@ public void Should_receive_AggregateException_with_both_exceptions()
                     .Run();
             Assert.AreEqual(typeof(HandlerException), context.InnerExceptionOneType);
             Assert.AreEqual(typeof(EndException), context.InnerExceptionTwoType);
-
-#if (!DEBUG)
-            StackTraceAssert.AreEqual(
-@"at NServiceBus.UnitOfWorkBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ChildContainerBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ProcessingStatisticsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.Pipeline.PipelineExecutor.Execute[T](BehaviorChain`1 pipelineAction, T context)
-at NServiceBus.Unicast.Transport.TransportReceiver.ProcessMessage(TransportMessage message)
-at NServiceBus.Unicast.Transport.TransportReceiver.TryProcess(TransportMessage message)
-at NServiceBus.Transports.Msmq.MsmqDequeueStrategy.Action()", context.StackTrace);
-
-            StackTraceAssert.AreEqual(
-@"at NServiceBus.AcceptanceTests.Exceptions.When_handler_and_Uow_End_throws.Endpoint.Handler.Handle(Message message)
-at NServiceBus.Unicast.MessageHandlerRegistry.Invoke(Object handler, Object message, Dictionary`2 dictionary)
-at NServiceBus.InvokeHandlersBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.SetCurrentMessageBeingHandledBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.LoadHandlersBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ApplyIncomingMessageMutatorsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ExecuteLogicalMessagesBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.DeserializeLogicalMessagesBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.CallbackInvocationBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ApplyIncomingTransportMessageMutatorsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.SubscriptionReceiverBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.UnitOfWorkBehavior.Invoke(IncomingContext context, Action next)", context.InnerExceptionOneStackTrace);
-
-            StackTraceAssert.AreEqual(
-@"at NServiceBus.AcceptanceTests.Exceptions.When_handler_and_Uow_End_throws.Endpoint.UnitOfWorkThatThrowsInEnd.End(Exception ex)
-at NServiceBus.UnitOfWorkBehavior.AppendEndExceptionsAndRethrow(Exception initialException)", context.InnerExceptionTwoStackTrace);
-
-#endif
         }
 
         public class Context : ScenarioContext

src/NServiceBus.NHibernate.AcceptanceTests/App_Packages/NSB.AcceptanceTests.5.0.0/Exceptions/When_handler_throws.cs

@@ -22,27 +22,6 @@ public void Should_receive_exception_from_handler()
                     .Done(c => c.ExceptionReceived)
                     .Run();
             Assert.AreEqual(typeof(HandlerException), context.ExceptionType);
-#if (!DEBUG)
-      StackTraceAssert.AreEqual(
-@"at NServiceBus.AcceptanceTests.Exceptions.When_handler_throws.Endpoint.Handler.Handle(Message message)
-at NServiceBus.Unicast.MessageHandlerRegistry.Invoke(Object handler, Object message, Dictionary`2 dictionary)
-at NServiceBus.InvokeHandlersBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.SetCurrentMessageBeingHandledBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.LoadHandlersBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ApplyIncomingMessageMutatorsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ExecuteLogicalMessagesBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.DeserializeLogicalMessagesBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.CallbackInvocationBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ApplyIncomingTransportMessageMutatorsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.SubscriptionReceiverBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.UnitOfWorkBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ChildContainerBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ProcessingStatisticsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.Pipeline.PipelineExecutor.Execute[T](BehaviorChain`1 pipelineAction, T context)
-at NServiceBus.Unicast.Transport.TransportReceiver.ProcessMessage(TransportMessage message)
-at NServiceBus.Unicast.Transport.TransportReceiver.TryProcess(TransportMessage message)
-at NServiceBus.Transports.Msmq.MsmqDequeueStrategy.Action()", context.StackTrace);
-#endif
         }
 
         public class Context : ScenarioContext

src/NServiceBus.NHibernate.AcceptanceTests/App_Packages/NSB.AcceptanceTests.5.0.0/Exceptions/When_handler_throws_AggregateException.cs

@@ -25,32 +25,6 @@ public void Should_receive_exact_AggregateException_exception_from_handler()
             Assert.AreEqual(typeof(Exception), context.InnerExceptionType);
             Assert.AreEqual("My Exception", context.ExceptionMessage);
             Assert.AreEqual("My Inner Exception", context.InnerExceptionMessage);
-
-#if (!DEBUG)
-            StackTraceAssert.AreEqual(
-                @"at NServiceBus.AcceptanceTests.Exceptions.When_handler_throws_AggregateException.Endpoint.Handler.Handle(Message message)
-at NServiceBus.Unicast.MessageHandlerRegistry.Invoke(Object handler, Object message, Dictionary`2 dictionary)
-at NServiceBus.InvokeHandlersBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.SetCurrentMessageBeingHandledBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.LoadHandlersBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ApplyIncomingMessageMutatorsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ExecuteLogicalMessagesBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.DeserializeLogicalMessagesBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.CallbackInvocationBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ApplyIncomingTransportMessageMutatorsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.SubscriptionReceiverBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.UnitOfWorkBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ChildContainerBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.ProcessingStatisticsBehavior.Invoke(IncomingContext context, Action next)
-at NServiceBus.Pipeline.PipelineExecutor.Execute[T](BehaviorChain`1 pipelineAction, T context)
-at NServiceBus.Unicast.Transport.TransportReceiver.ProcessMessage(TransportMessage message)
-at NServiceBus.Unicast.Transport.TransportReceiver.TryProcess(TransportMessage message)
-at NServiceBus.Transports.Msmq.MsmqDequeueStrategy.Action()", context.StackTrace);
-
-            StackTraceAssert.AreEqual(
-                @"at NServiceBus.AcceptanceTests.Exceptions.When_handler_throws_AggregateException.Endpoint.Handler.MethodThatThrows()
-at NServiceBus.AcceptanceTests.Exceptions.When_handler_throws_AggregateException.Endpoint.Handler.Handle(Message message)", context.InnerStackTrace);
-#endif
         }
 
         public class Context : ScenarioContext

src/NServiceBus.NHibernate.AcceptanceTests/NServiceBus.NHibernate.AcceptanceTests.csproj

@@ -56,8 +56,8 @@
       <HintPath>..\packages\NServiceBus.AcceptanceTesting.5.0.0\lib\net45\NServiceBus.AcceptanceTesting.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NServiceBus.5.0.0\lib\net45\NServiceBus.Core.dll</HintPath>
+      <HintPath>..\packages\NServiceBus.5.0.6\lib\net45\NServiceBus.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework">
       <HintPath>..\packages\NUnit.2.6.3\lib\nunit.framework.dll</HintPath>

src/NServiceBus.NHibernate.AcceptanceTests/packages.config

@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net40" />
-  <package id="NServiceBus" version="5.0.0" targetFramework="net45" />
   <package id="NHibernate" version="4.0.1.4000" targetFramework="net40" />
+  <package id="NServiceBus" version="5.0.6" targetFramework="net45" />
   <package id="NServiceBus.AcceptanceTesting" version="5.0.0" targetFramework="net45" />
   <package id="NServiceBus.AcceptanceTests.Sources" version="5.0.0" targetFramework="net45" />
   <package id="NUnit" version="2.6.3" targetFramework="net45" />

src/NServiceBus.NHibernate.PerformanceTests/NServiceBus.NHibernate.PerformanceTests.csproj

@@ -48,8 +48,8 @@
       <HintPath>..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NServiceBus.5.0.0\lib\net45\NServiceBus.Core.dll</HintPath>
+      <HintPath>..\packages\NServiceBus.5.0.6\lib\net45\NServiceBus.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.configuration" />

src/NServiceBus.NHibernate.PerformanceTests/packages.config

@@ -2,5 +2,5 @@
 <packages>
   <package id="Iesi.Collections" version="4.0.1.4000" targetFramework="net40" />
   <package id="NHibernate" version="4.0.1.4000" targetFramework="net40" />
-  <package id="NServiceBus" version="5.0.0" targetFramework="net45" />
+  <package id="NServiceBus" version="5.0.6" targetFramework="net45" />
 </packages>

src/NServiceBus.NHibernate.Tests/NServiceBus.NHibernate.Tests.csproj

@@ -50,8 +50,8 @@
       <HintPath>..\packages\NHibernate.4.0.1.4000\lib\net40\NHibernate.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\packages\NServiceBus.5.0.0\lib\net45\NServiceBus.Core.dll</HintPath>
+      <HintPath>..\packages\NServiceBus.5.0.6\lib\net45\NServiceBus.Core.dll</HintPath>
+      <Private>True</Private>
     </Reference>
     <Reference Include="nunit.framework, Version=2.6.3.13283, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>