Merge pull request #151 from Particular/release-3.3.0

bording · bording · commit 269353d0a7b5 · 2016-05-24T13:18:43.000-04:00
Release 3.3.0
diff --git a/.gitattributes b/.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
diff --git a/.gitignore b/.gitignore
@@ -2,29 +2,21 @@ 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
 *.orig
+*.zip
 Samples/DataBus/storage
 packages
 PrecompiledWeb
+tempstorage
 core-only
 Release
 Artifacts
@@ -36,3 +28,64 @@ _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.*
+
+# JetBrains Rider
+.idea/
+*.sln.iml
diff --git a/GitVersion.yml b/GitVersion.yml
@@ -0,0 +1,5 @@
+assembly-versioning-scheme: Major
+
+branches:
+  develop:
+    tag: alpha
diff --git a/GitVersionConfig.yaml b/GitVersionConfig.yaml
diff --git a/LICENSE.md b/LICENSE.md
@@ -5,6 +5,6 @@ Your license to the NServiceBus source and/or binaries is governed by the Recipr
 
 http://www.opensource.org/licenses/rpl1.5.txt
 
-If you do not wish to release the source of software you build using NServiceBus, you may use NServiceBus source and/or binaries under the NServiceBus Basic End User License Agreement as described here:
+If you do not wish to release the source of software you build using NServiceBus, you may use NServiceBus source and/or binaries under the License Agreement described here:
 
-http://www.nservicebus.com/EULA.aspx
+http://particular.net/LicenseAgreement
diff --git a/packaging/nuget/NServiceBus.RabbitMQ.nuspec b/packaging/nuget/NServiceBus.RabbitMQ.nuspec
@@ -16,7 +16,7 @@
     <tags>nservicebus servicebus msmq cqrs publish subscribe</tags>
     <dependencies>
       <dependency id="NServiceBus" version="[5.0.0, 6.0.0)" />
-      <dependency id="RabbitMQ.Client" version="[3.6.0, 3.7.0)" />
+      <dependency id="RabbitMQ.Client" version="[3.6.2, 3.7.0)" />
     </dependencies>
   </metadata>
   <files>
diff --git a/src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj b/src/NServiceBus.RabbitMQ.AcceptanceTests/NServiceBus.RabbitMQ.AcceptanceTests.csproj
@@ -44,8 +44,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.6.1\lib\net45\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client, Version=3.6.2.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <HintPath>..\packages\RabbitMQ.Client.3.6.2\lib\net45\RabbitMQ.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -230,6 +230,8 @@
     <Compile Include="When_scaling_out_senders_that_uses_callbacks.cs" />
     <Compile Include="When_scaling_out_subscribers.cs" />
   </ItemGroup>
-  <ItemGroup />
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/NServiceBus.RabbitMQ.AcceptanceTests/packages.config b/src/NServiceBus.RabbitMQ.AcceptanceTests/packages.config
@@ -4,7 +4,7 @@
   <package id="NServiceBus.AcceptanceTesting" version="5.2.0" targetFramework="net45" />
   <package id="NServiceBus.AcceptanceTests.Sources" version="5.2.0" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
-  <package id="RabbitMQ.Client" version="3.6.1" targetFramework="net45" />
+  <package id="RabbitMQ.Client" version="3.6.2" targetFramework="net45" />
   <package id="Rx-Core" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Interfaces" version="2.2.5" targetFramework="net45" />
   <package id="Rx-Linq" version="2.2.5" targetFramework="net45" />
diff --git a/src/NServiceBus.RabbitMQ.Tests/NServiceBus.RabbitMQ.Tests.csproj b/src/NServiceBus.RabbitMQ.Tests/NServiceBus.RabbitMQ.Tests.csproj
@@ -36,7 +36,7 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
     <UseVSHostingProcess>false</UseVSHostingProcess>
-    <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
+    <TreatWarningsAsErrors>false</TreatWarningsAsErrors>
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup>
@@ -67,8 +67,8 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NUnit.2.6.4\lib\nunit.framework.dll</HintPath>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.6.1\lib\net45\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client, Version=3.6.2.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <HintPath>..\packages\RabbitMQ.Client.3.6.2\lib\net45\RabbitMQ.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -109,5 +109,8 @@
     <None Include="NServiceBus.snk" />
     <None Include="packages.config" />
   </ItemGroup>
+  <ItemGroup>
+    <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
diff --git a/src/NServiceBus.RabbitMQ.Tests/packages.config b/src/NServiceBus.RabbitMQ.Tests/packages.config
@@ -4,5 +4,5 @@
   <package id="NLog" version="3.2.0.0" targetFramework="net45" />
   <package id="NServiceBus" version="5.2.0" targetFramework="net45" />
   <package id="NUnit" version="2.6.4" targetFramework="net45" />
-  <package id="RabbitMQ.Client" version="3.6.1" targetFramework="net45" />
+  <package id="RabbitMQ.Client" version="3.6.2" targetFramework="net45" />
 </packages>
diff --git a/src/NServiceBus.RabbitMQ.sln b/src/NServiceBus.RabbitMQ.sln
@@ -1,7 +1,7 @@
 ﻿
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 2013
-VisualStudioVersion = 12.0.21005.1
+# Visual Studio 14
+VisualStudioVersion = 14.0.25123.0
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NServiceBus.RabbitMQ", "NServiceBus.RabbitMQ\NServiceBus.RabbitMQ.csproj", "{BA731749-22C7-4025-8A4D-465AE8E02E61}"
 EndProject
diff --git a/src/NServiceBus.RabbitMQ/Connection/RabbitMqConnectionFactory.cs b/src/NServiceBus.RabbitMQ/Connection/RabbitMqConnectionFactory.cs
@@ -44,10 +44,9 @@ public RabbitMqConnectionFactory(ConnectionConfiguration connectionConfiguration
             };
         }
 
-        public virtual IConnection CreateConnection(string purpose)
+        public virtual IConnection CreateConnection(string connectionName)
         {
-            connectionFactory.ClientProperties["purpose"] = purpose;
-            return connectionFactory.CreateConnection();
+            return connectionFactory.CreateConnection(connectionName);
         }
 
         readonly ConnectionFactory connectionFactory;
diff --git a/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj b/src/NServiceBus.RabbitMQ/NServiceBus.RabbitMQ.csproj
@@ -48,21 +48,21 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Janitor, Version=1.1.6.0, Culture=neutral, PublicKeyToken=d34c7d3bba3746e6, processorArchitecture=MSIL">
-      <HintPath>..\packages\Janitor.Fody.1.1.6.0\Lib\dotnet\Janitor.dll</HintPath>
+    <Reference Include="Janitor, Version=1.2.1.0, Culture=neutral, PublicKeyToken=d34c7d3bba3746e6, processorArchitecture=MSIL">
+      <HintPath>..\packages\Janitor.Fody.1.2.1.0\lib\dotnet\Janitor.dll</HintPath>
       <Private>False</Private>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NServiceBus.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\packages\NServiceBus.5.2.0\lib\net45\NServiceBus.Core.dll</HintPath>
     </Reference>
-    <Reference Include="Obsolete, Version=4.0.4.0, Culture=neutral, PublicKeyToken=1ca091877d12ca03, processorArchitecture=MSIL">
-      <HintPath>..\packages\Obsolete.Fody.4.0.4\Lib\dotnet\Obsolete.dll</HintPath>
+    <Reference Include="Obsolete, Version=4.1.0.0, Culture=neutral, PublicKeyToken=1ca091877d12ca03, processorArchitecture=MSIL">
+      <HintPath>..\packages\Obsolete.Fody.4.1.0\lib\dotnet\Obsolete.dll</HintPath>
       <Private>False</Private>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.6.1.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.6.1\lib\net45\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="RabbitMQ.Client, Version=3.6.2.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <HintPath>..\packages\RabbitMQ.Client.3.6.2\lib\net45\RabbitMQ.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
@@ -120,11 +120,11 @@
     <PropertyGroup>
       <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets'))" />
-    <Error Condition="!Exists('..\packages\NuGetPackager.0.5.5\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.5.5\build\NuGetPackager.targets'))" />
     <Error Condition="!Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.29.4\build\dotnet\Fody.targets'))" />
+    <Error Condition="!Exists('..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets'))" />
+    <Error Condition="!Exists('..\packages\NuGetPackager.0.6.0\build\NuGetPackager.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\NuGetPackager.0.6.0\build\NuGetPackager.targets'))" />
   </Target>
-  <Import Project="..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.2.0.1\Build\GitVersionTask.targets')" />
-  <Import Project="..\packages\NuGetPackager.0.5.5\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.5.5\build\NuGetPackager.targets')" />
   <Import Project="..\packages\Fody.1.29.4\build\dotnet\Fody.targets" Condition="Exists('..\packages\Fody.1.29.4\build\dotnet\Fody.targets')" />
+  <Import Project="..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets" Condition="Exists('..\packages\GitVersionTask.3.5.4\build\dotnet\GitVersionTask.targets')" />
+  <Import Project="..\packages\NuGetPackager.0.6.0\build\NuGetPackager.targets" Condition="Exists('..\packages\NuGetPackager.0.6.0\build\NuGetPackager.targets')" />
 </Project>
diff --git a/src/NServiceBus.RabbitMQ/PersistentConnection.cs b/src/NServiceBus.RabbitMQ/PersistentConnection.cs
@@ -14,13 +14,13 @@ namespace NServiceBus.Transports.RabbitMQ
     /// A connection that attempts to reconnect if the inner connection is closed.
     /// </summary>
     [SkipWeaving]
-    class PersistentConnection: IConnection
+    class PersistentConnection : IConnection
     {
-        public PersistentConnection(RabbitMqConnectionFactory connectionFactory, TimeSpan retryDelay,string purpose)
+        public PersistentConnection(RabbitMqConnectionFactory connectionFactory, TimeSpan retryDelay, string connectionName)
         {
             this.connectionFactory = connectionFactory;
             this.retryDelay = retryDelay;
-            this.purpose = purpose;
+            this.connectionName = connectionName;
 
             TryToConnect(null);
         }
@@ -34,7 +34,7 @@ public IModel CreateModel()
             return connection.CreateModel();
         }
 
-       
+
         public void Close()
         {
             connection.ConnectionShutdown -= OnConnectionShutdown;
@@ -58,7 +58,7 @@ void TryToConnect(object timer)
         {
             if (timer != null)
             {
-                ((Timer) timer).Dispose();
+                ((Timer)timer).Dispose();
             }
 
             Logger.Debug("Trying to connect");
@@ -70,7 +70,7 @@ void TryToConnect(object timer)
             var success = false;
             try
             {
-                connection = connectionFactory.CreateConnection(purpose);
+                connection = connectionFactory.CreateConnection(connectionName);
                 success = true;
             }
             catch (System.Net.Sockets.SocketException socketException)
@@ -118,7 +118,7 @@ void OnConnectionShutdown(object sender, ShutdownEventArgs reason)
             {
                 return;
             }
-        
+
             Logger.InfoFormat("Disconnected from RabbitMQ Broker, reason: {0} , going to reconnect", reason);
 
             TryToConnect(null);
@@ -144,6 +144,11 @@ public void Abort(ushort reasonCode, string reasonText, int timeout)
             connection.Abort(reasonCode, reasonText, timeout);
         }
 
+        public string ClientProvidedName
+        {
+            get { return connection.ClientProvidedName; }
+        }
+
         public AmqpTcpEndpoint Endpoint
         {
             get { return connection.Endpoint; }
@@ -246,7 +251,7 @@ public void HandleConnectionBlocked(string reason)
         {
             connection.HandleConnectionBlocked(reason);
         }
-        
+
         public void HandleConnectionUnblocked()
         {
             connection.HandleConnectionUnblocked();
@@ -287,9 +292,9 @@ public void Dispose()
         IConnection connection;
         readonly RabbitMqConnectionFactory connectionFactory;
         readonly TimeSpan retryDelay;
-        readonly string purpose;
+        readonly string connectionName;
 
-        static readonly ILog Logger = LogManager.GetLogger(typeof (RabbitMqConnectionManager));
+        static readonly ILog Logger = LogManager.GetLogger(typeof(RabbitMqConnectionManager));
         public int LocalPort { get { return connection.LocalPort; } }
         public int RemotePort { get { return connection.RemotePort; } }
     }
diff --git a/src/NServiceBus.RabbitMQ/packages.config b/src/NServiceBus.RabbitMQ/packages.config
@@ -1,10 +1,10 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
   <package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
-  <package id="GitVersionTask" version="2.0.1" targetFramework="net45" developmentDependency="true" />
-  <package id="Janitor.Fody" version="1.1.6.0" targetFramework="net45" developmentDependency="true" />
+  <package id="GitVersionTask" version="3.5.4" targetFramework="net45" developmentDependency="true" />
+  <package id="Janitor.Fody" version="1.2.1.0" targetFramework="net45" developmentDependency="true" />
   <package id="NServiceBus" version="5.2.0" targetFramework="net45" />
-  <package id="NuGetPackager" version="0.5.5" targetFramework="net45" developmentDependency="true" />
-  <package id="Obsolete.Fody" version="4.0.4" targetFramework="net45" developmentDependency="true" />
-  <package id="RabbitMQ.Client" version="3.6.1" targetFramework="net45" />
+  <package id="NuGetPackager" version="0.6.0" targetFramework="net45" developmentDependency="true" />
+  <package id="Obsolete.Fody" version="4.1.0" targetFramework="net45" developmentDependency="true" />
+  <package id="RabbitMQ.Client" version="3.6.2" targetFramework="net45" />
 </packages>
diff --git a/src/nuget.config b/src/nuget.config
