Merge branch 'release-5.1.0'

Particular · Oct 31, 2014 · b755c38 · b755c38
2 parents 68f7d3f + 2d86765
commit b755c38
Show file tree

Hide file tree

Showing 352 changed files with 5,837 additions and 11,644 deletions.
diff --git a/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.Custom/Program.cs b/IntegrationTests/SendOnlyEndpoint/SendOnlyEndpoint.Custom/Program.cs
@@ -8,7 +8,6 @@ public class Program
         static void Main()
         {
             var configuration = new BusConfiguration();
-            configuration.UsePersistence<InMemoryPersistence>();
 
             using (var bus = Bus.CreateSendOnly(configuration))
             {

diff --git a/IntegrationTests/WcfIntegration/Server/app.config b/IntegrationTests/WcfIntegration/Server/app.config
@@ -23,7 +23,7 @@
         <!-- Uncomment the lines below to change to settings of the default serviceendpoint -->
         <!--<endpoint address=""
                   binding="basicHttpBinding"
-                  contract="NServiceBus.IWcfService`2[[Messages.CancelOrder, Messages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null],[Messages.ErrorCodes, Messages, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null]]">
+                  contract="NServiceBus.IWcfService`2[[Messages.CancelOrder, Messages, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null],[Messages.ErrorCodes, Messages, Version=0.0.0.0, Culture=neutral, PublicKeyToken=null]]">
         </endpoint>-->
         <endpoint address="mex" binding="mexHttpBinding" contract="IMetadataExchange" />
         <host>
@@ -34,4 +34,4 @@
       </service>
     </services>
   </system.serviceModel>
-</configuration>
+</configuration>
diff --git a/lib/Interop.MSMQ.dll b/lib/Interop.MSMQ.dll
diff --git a/lib/Topshelf/Topshelf.dll b/lib/Topshelf/Topshelf.dll
diff --git a/lib/Topshelf/Topshelf.pdb b/lib/Topshelf/Topshelf.pdb
diff --git a/packaging/NServiceBus.Interfaces.5.0.0.nupkg b/packaging/NServiceBus.Interfaces.5.0.0.nupkg
diff --git a/packaging/nuget/nservicebus.acceptancetests.nuspec b/packaging/nuget/nservicebus.acceptancetests.nuspec
@@ -18,6 +18,11 @@
       <dependency id="NServiceBus" version="$version$" />
 	  <dependency id="NServiceBus.AcceptanceTesting" version="$version$" />
 	  <dependency id="NUnit" version="[2.0.0, 3.0.0)" />
+	  <dependency id="Rx-Core" version="2.2.5" />
+	  <dependency id="Rx-Interfaces" version="2.2.5" />
+	  <dependency id="Rx-Linq" version="2.2.5" />
+	  <dependency id="Rx-Main" version="2.2.5" />
+	  <dependency id="Rx-PlatformServices" version="2.2.5" />
     </dependencies>
   </metadata>
   <files>

diff --git a/packaging/nuget/nservicebus.host.nuspec b/packaging/nuget/nservicebus.host.nuspec
diff --git a/packaging/nuget/nservicebus.host/EndpointConfig.cs b/packaging/nuget/nservicebus.host/EndpointConfig.cs
diff --git a/packaging/nuget/nservicebus.host/install.ps1 b/packaging/nuget/nservicebus.host/install.ps1
diff --git a/packaging/nuget/nservicebus.host32.nuspec b/packaging/nuget/nservicebus.host32.nuspec
diff --git a/packaging/nuget/nservicebus.hosting.profiles.nuspec b/packaging/nuget/nservicebus.hosting.profiles.nuspec
diff --git a/packaging/nuget/nservicebus.testing.nuspec b/packaging/nuget/nservicebus.testing.nuspec
diff --git a/packaging/nuget/tools/init.ps1 b/packaging/nuget/tools/init.ps1
@@ -7,10 +7,7 @@ if($toolsPath){
 
 		if(Test-Path $pathToNServiceBusPSCmdLets){
 			Import-Module $pathToNServiceBusPSCmdLets
-
-			Write-Host ""
 			Write-Host "Type 'get-help about_NServiceBus' to see all available NServiceBus commands."
-			Write-Host ""
 		}
 		else {
 			Write-Host "NServiceBus powershell module could not be found, no powershell commands will be available"	
@@ -34,12 +31,10 @@ try {
 
 	#Check for existing NServiceBus installations
 	if (Test-Path $nserviceBusKeyPath) {
-		"Existing NServiceBus v($packageVersion) user detected"
 		$isNewUser = $false
 	}
 
 	if (Test-Path $platformKeyPath){
-		"Existing Platform user detected"
 		$isNewUser = $false
 	}
 
@@ -60,9 +55,6 @@ try {
     if($dte){
 	    $dte.ExecuteCommand("View.URL", $url)
     }
-    else{
-	    "No dte detected, url: $url"
-    }
 } 
 Catch [Exception] { 
 	Write-Warning $error[0]

diff --git a/packaging/nuget/tools/install.ps1 b/packaging/nuget/tools/install.ps1
diff --git a/src/NServiceBus.AcceptanceTesting/Customization/Conventions.cs b/src/NServiceBus.AcceptanceTesting/Customization/Conventions.cs
@@ -13,10 +13,5 @@ static Conventions()
         public static Func<RunDescriptor> DefaultRunDescriptor = () => new RunDescriptor {Key = "Default"};
 
         public static Func<Type, string> EndpointNamingConvention { get; set; }
-
-        public static string DefaultNameFor<T>()
-        {
-            return EndpointNamingConvention(typeof(T));
-        }
     }
 }
diff --git a/src/NServiceBus.AcceptanceTesting/ScenarioContext.cs b/src/NServiceBus.AcceptanceTesting/ScenarioContext.cs
@@ -1,6 +1,8 @@
 namespace NServiceBus.AcceptanceTesting
 {
     using System;
+    using System.Collections.Generic;
+    using System.Linq;
     using System.Runtime.Remoting.Activation;
     using System.Runtime.Remoting.Contexts;
     using System.Runtime.Remoting.Messaging;
@@ -70,5 +72,31 @@ public void AddTrace(string trace)
         {
             Trace += DateTime.Now.ToString("HH:mm:ss.ffffff") + " - " + trace + Environment.NewLine;
         }
+
+        public void RecordEndpointLog(string endpointName,string level ,string message)
+        {
+            endpointLogs.Add(new EndpointLogItem
+            {
+                Endpoint = endpointName,
+                Level = level,
+                Message = message
+            });
+        }
+
+
+        public List<EndpointLogItem> GetAllLogs()
+        {
+            return endpointLogs.ToList();
+        }
+
+
+        List<EndpointLogItem> endpointLogs = new List<EndpointLogItem>();
+
+        public class EndpointLogItem
+        {
+            public string Endpoint { get; set; }
+            public string Message { get; set; }
+            public string Level { get; set; }
+        }
     }
 }