Merge branch 'release-4.4.0'

Conflicts: src/NServiceBus/NServiceBusVersion.cs
Particular · Feb 9, 2014 · c84cd2a · c84cd2a
2 parents fcf57f3 + 089cbd4
commit c84cd2a
Show file tree

Hide file tree

Showing 306 changed files with 3,545 additions and 1,851 deletions.
diff --git a/.gitignore b/.gitignore
@@ -34,4 +34,6 @@ csx
 *.ncrunchsolution
 _NCrunch_NServiceBus/*
 logs
-run-git.cmd
+run-git.cmd
+
+*.jtconfig
diff --git a/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.Custom/App.config b/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.Custom/App.config
diff --git a/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.Custom/Program.cs b/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.Custom/Program.cs
@@ -8,7 +8,7 @@ public class Program
         static void Main()
         {
             var bus = Configure.With()
-                .UnityBuilder()
+                .DefaultBuilder()
                 .UseTransport<Msmq>()
                 .UnicastBus()
                 .SendOnly();
@@ -21,5 +21,6 @@ static void Main()
             Console.ReadKey();
         }
     }
+
     public class TestMessage : IMessage{}
 }
diff --git a/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.Custom/SendOnlyEndpoint.Custom.csproj b/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.Custom/SendOnlyEndpoint.Custom.csproj
@@ -35,44 +35,19 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net">
-      <HintPath>..\..\..\binaries\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.ServiceLocation">
-      <HintPath>..\packages\CommonServiceLocator.1.0\lib\NET35\Microsoft.Practices.ServiceLocation.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity">
-      <HintPath>..\packages\Unity.2.1.505.0\lib\NET35\Microsoft.Practices.Unity.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Configuration">
-      <HintPath>..\packages\Unity.2.1.505.0\lib\NET35\Microsoft.Practices.Unity.Configuration.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception">
-      <HintPath>..\packages\Unity.Interception.2.1.505.0\lib\NET35\Microsoft.Practices.Unity.Interception.dll</HintPath>
-    </Reference>
-    <Reference Include="Microsoft.Practices.Unity.Interception.Configuration">
-      <HintPath>..\packages\Unity.Interception.2.1.505.0\lib\NET35\Microsoft.Practices.Unity.Interception.Configuration.dll</HintPath>
-    </Reference>
     <Reference Include="NServiceBus">
       <HintPath>..\..\..\binaries\NServiceBus.dll</HintPath>
     </Reference>
     <Reference Include="NServiceBus.Core">
       <HintPath>..\..\..\binaries\NServiceBus.Core.dll</HintPath>
     </Reference>
-    <Reference Include="NServiceBus.ObjectBuilder.Unity">
-      <HintPath>..\..\..\binaries\containers\unity\NServiceBus.ObjectBuilder.Unity.dll</HintPath>
-    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-    <None Include="packages.config" />
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)..\..\BuildSupport\RippleRestoreTask.targets" />
 </Project>
diff --git a/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.NServiceBusHost/EndpointConfig.cs b/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.NServiceBusHost/EndpointConfig.cs
@@ -1,9 +1,13 @@
-namespace SendOnlyEndpoint.NServiceBusHost
+using NServiceBus.Hosting.Roles;
+using NServiceBus.Unicast.Config;
+
+namespace SendOnlyEndpoint.NServiceBusHost
 {
-    using System.Threading;
+
+    using System;
     using NServiceBus;
 
-    public class EndpointConfig : IConfigureThisEndpoint, IWantCustomInitialization
+    public class EndpointConfig : IConfigureThisEndpoint, IWantCustomInitialization, SendOnly
     {
         /// <summary>
         /// Perform initialization logic.
@@ -16,8 +20,25 @@ public void Init()
                 .UnicastBus()
                 .SendOnly();
 
-            var messageSender = new Thread(MessageSender.SendMessage);
-            messageSender.Start(bus);
+            Console.Out.WriteLine("Press any key to send a message.");
+            Console.ReadKey();
+            bus.Send("SendOnlyDestination@someserver", new TestMessage());
+            Console.WriteLine("Message sent to remote endpoint, you can verify this by looking at the outgoing queues in you msmq MMC-snapin");  
+        }
+    }
+
+    public class TestMessage : IMessage { }
+
+    public interface SendOnly : IRole
+    {
+
+    }
+
+    public class RoleSendOnly : IConfigureRole<SendOnly>
+    {
+        public ConfigUnicastBus ConfigureRole(IConfigureThisEndpoint specifier)
+        {
+            return null;
         }
     }
 }
diff --git a/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.NServiceBusHost/MessageSender.cs b/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.NServiceBusHost/MessageSender.cs
diff --git a/...SendOnlyEndpoint/SendOnlyEndpoint.NServiceBusHost/SendOnlyEndpoint.NServiceBusHost.csproj b/...SendOnlyEndpoint/SendOnlyEndpoint.NServiceBusHost/SendOnlyEndpoint.NServiceBusHost.csproj
@@ -50,7 +50,6 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="EndpointConfig.cs" />
-    <Compile Include="MessageSender.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

diff --git a/IntegrationTests/TimeoutManager/MyServer/Starter.cs b/IntegrationTests/TimeoutManager/MyServer/Starter.cs
@@ -1,4 +1,5 @@
 using MyServer.Scheduling;
+using NServiceBus.Hosting;
 
 namespace MyServer
 {
@@ -13,6 +14,8 @@ class Starter : IWantToRunWhenBusStartsAndStops
     {
         public IBus Bus { get; set; }
 
+        public HostInformation HostInformation { get; set; }
+
         public void Start()
         {
             Console.WriteLine("Press 'S' to start the saga");

diff --git a/buildsupport/FubuCore.dll b/buildsupport/FubuCore.dll
diff --git a/buildsupport/FubuCore.pdb b/buildsupport/FubuCore.pdb
diff --git a/buildsupport/GitFlowVersion/Build/GitFlowVersionTask.targets b/buildsupport/GitFlowVersion/Build/GitFlowVersionTask.targets
@@ -11,7 +11,8 @@
     <Target Name="UpdateAssemblyInfo"
             BeforeTargets="CoreCompile">
         <GitFlowVersionTask.UpdateAssemblyInfo 
-          SolutionDirectory="$(SolutionDir)" 
+          SolutionDirectory="$(SolutionDir)"
+          AssemblyName="$(AssemblyName)" 
           ProjectFile="$(ProjectPath)" 
           SignAssembly="$(SignAssembly)"
           CompileFiles ="@(Compile)">
@@ -32,6 +33,10 @@
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
     <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.pdb" />
+    <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersion.exe" />
+    <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersion.pdb" />
+    <None Include="$(MSBuildThisFileDirectory)..\LibGit2Sharp.dll" />
+    <None Include="$(MSBuildThisFileDirectory)..\NativeBinaries\**\*" />
   </ItemGroup>
 
 

diff --git a/buildsupport/GitFlowVersion/GitFlowVersion.exe b/buildsupport/GitFlowVersion/GitFlowVersion.exe
diff --git a/buildsupport/GitFlowVersion/GitFlowVersion.pdb b/buildsupport/GitFlowVersion/GitFlowVersion.pdb
diff --git a/buildsupport/GitFlowVersion/GitFlowVersionTask.dll b/buildsupport/GitFlowVersion/GitFlowVersionTask.dll
diff --git a/buildsupport/GitFlowVersion/GitFlowVersionTask.pdb b/buildsupport/GitFlowVersion/GitFlowVersionTask.pdb
diff --git a/buildsupport/ripple.exe b/buildsupport/ripple.exe
diff --git a/buildsupport/ripple.pdb b/buildsupport/ripple.pdb
diff --git a/lib/ConventionBasedHandlers.dll b/lib/ConventionBasedHandlers.dll
diff --git a/packaging/nuget/nservicebus.acceptancetesting.nuspec b/packaging/nuget/nservicebus.acceptancetesting.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>Acceptance tests for nservicebus core functionality</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/.../nuget/nservicebus.acceptancetests.nuspec → ...servicebus.acceptancetests.sources.nuspec b/.../nuget/nservicebus.acceptancetests.nuspec → ...servicebus.acceptancetests.sources.nuspec
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <package xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
-    <id>NServiceBus.AcceptanceTests</id>
-    <title>NServiceBus Acceptance Tests</title>
+    <id>NServiceBus.AcceptanceTests.Sources</id>
+    <title>Source only package containing the NServiceBus acceptance test suite</title>
     <version>4.0.0-alpha0</version>
     <authors>NServiceBus Ltd</authors>
     <owners>Udi Dahan, Andreas Ohlund, John Simons</owners>
@@ -12,11 +12,11 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>Acceptance tests for nservicebus core functionality</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>
   <files>
-    <file src="..\..\src\NServiceBus.AcceptanceTests\**\*.cs" target="content\net40\AcceptanceTests" />
+    <file src="..\..\src\NServiceBus.AcceptanceTests\**\*.cs" target="content\" />
   </files>
-</package>
+</package>
diff --git a/packaging/nuget/nservicebus.autofac.nuspec b/packaging/nuget/nservicebus.autofac.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>The Autofac Container for the nservicebus</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/packaging/nuget/nservicebus.castlewindsor.nuspec b/packaging/nuget/nservicebus.castlewindsor.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>The CastleWindsor Container for the nservicebus</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/packaging/nuget/nservicebus.distributor.msmq.nuspec b/packaging/nuget/nservicebus.distributor.msmq.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>Distributor for MSMQ for the nservicebus</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/packaging/nuget/nservicebus.host.nuspec b/packaging/nuget/nservicebus.host.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>The hosting template for the nservicebus, The most popular open-source service bus for .net</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/packaging/nuget/nservicebus.host32.nuspec b/packaging/nuget/nservicebus.host32.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>The hosting template for the nservicebus, The most popular open-source service bus for .net</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/packaging/nuget/nservicebus.interfaces.nuspec b/packaging/nuget/nservicebus.interfaces.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>The Interfaces for NServiceBus Implementation</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/packaging/nuget/nservicebus.ninject.nuspec b/packaging/nuget/nservicebus.ninject.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>The Ninject Container for the nservicebus</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/packaging/nuget/nservicebus.nuspec b/packaging/nuget/nservicebus.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>The most popular open-source service bus for .net</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <frameworkAssemblies>
       <frameworkAssembly assemblyName="System" targetFramework="net40" />

diff --git a/packaging/nuget/nservicebus.spring.nuspec b/packaging/nuget/nservicebus.spring.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>The Spring Container for the nservicebus</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/packaging/nuget/nservicebus.structuremap.nuspec b/packaging/nuget/nservicebus.structuremap.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>The StructureMap Container for the nservicebus</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/packaging/nuget/nservicebus.testing.nuspec b/packaging/nuget/nservicebus.testing.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>The testing for the nservicebus, The most popular open-source service bus for .net</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/packaging/nuget/nservicebus.tools.nuspec b/packaging/nuget/nservicebus.tools.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>Return to source queue and licensing tools for uses with NServiceBus</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/packaging/nuget/nservicebus.unity.nuspec b/packaging/nuget/nservicebus.unity.nuspec
@@ -12,7 +12,7 @@
     <requireLicenseAcceptance>true</requireLicenseAcceptance>
     <description>The Unity Container for the nservicebus</description>
     <releaseNotes></releaseNotes>
-    <copyright>Copyright 2010-2013 NServiceBus. All rights reserved</copyright>
+    <copyright>Copyright 2010-2014 NServiceBus. All rights reserved</copyright>
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies/>
   </metadata>

diff --git a/ripple.cmd b/ripple.cmd
@@ -0,0 +1 @@
+buildsupport\ripple.exe %*
diff --git a/ripple.config b/ripple.config
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ripple xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+<ripple xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
   <Name>NServiceBus</Name>
   <NugetSpecFolder>packaging/nuget</NugetSpecFolder>
   <SourceFolder>src</SourceFolder>
@@ -8,8 +8,8 @@
   <DefaultFloatConstraint>Current</DefaultFloatConstraint>
   <DefaultFixedConstraint>Current,NextMajor</DefaultFixedConstraint>
   <Feeds>
-    <Feed Url="http://builds.particular.net/guestAuth/app/nuget/v1/FeedService.svc" Mode="Float" Stability="Anything" />
-    <Feed Url="http://nuget.org/api/v2" Mode="Float" Stability="ReleasedOnly" />
+    <Feed Url="http://builds.particular.net/guestAuth/app/nuget/v1/FeedService.svc" Mode="Float" Stability="Anything" StabilityConvention="GitFlow" />
+    <Feed Url="http://nuget.org/api/v2" Mode="Float" Stability="ReleasedOnly" StabilityConvention="None" />
   </Feeds>
   <Nugets>
     <Dependency Name="Autofac" Version="3.1.5.0" Mode="Fixed" />
@@ -19,7 +19,7 @@
     <Dependency Name="CommonServiceLocator" Version="1.0.0.0" Mode="Fixed" />
     <Dependency Name="Costura.Fody" Version="0.5.3.0" Mode="Fixed" />
     <Dependency Name="Fody" Version="1.16.2.0" Mode="Fixed" />
-    <Dependency Name="Janitor.Fody" Version="0.4.0.0" Mode="Fixed" />
+    <Dependency Name="Janitor.Fody" Version="0.5.0" Mode="Fixed" />
     <Dependency Name="log4net" Version="1.2.10.0" Mode="Fixed" />
     <Dependency Name="Newtonsoft.Json" Version="5.0.6.0" Mode="Fixed" />
     <Dependency Name="Ninject" Version="3.0.1.10" Mode="Fixed" />
@@ -45,7 +45,7 @@
   </References>
   <Nuspecs>
     <Nuspec File="nservicebus.acceptancetesting.nuspec" Project="nservicebus.acceptancetesting" />
-    <Nuspec File="nservicebus.acceptancetests.nuspec" Project="nservicebus.acceptancetests" />
+    <Nuspec File="nservicebus.acceptancetests.sources.nuspec" Project="nservicebus.acceptancetests" />
     <Nuspec File="nservicebus.autofac.nuspec" Project="ObjectBuilder.autofac" />
     <Nuspec File="nservicebus.castlewindsor.nuspec" Project="ObjectBuilder.castlewindsor" />
     <Nuspec File="nservicebus.host.nuspec" Project="NServiceBus.Hosting.Windows" />

diff --git a/src/ConventionBasedHandlers/ConventionBasedHandler.cs b/src/ConventionBasedHandlers/ConventionBasedHandler.cs
@@ -0,0 +1,14 @@
+namespace ConventionBasedHandlers
+{
+    using System;
+    using ConventionBasedMessages;
+    using NServiceBus;
+
+    public class ConventionBasedHandler : IHandleMessages<MyMessage>
+    {
+        public void Handle(MyMessage message)
+        {
+            throw new NotImplementedException();
+        }
+    }
+}