Merge branch 'release-1.7'

.gitignore

@@ -26,6 +26,7 @@ _NCrunch_NServiceBus/*
 logs
 run-git.cmd
 src/Chocolatey/Build/*
+zip/*
 
 # Created by https://www.gitignore.io
 

src/Packaging/Packaging.csproj → src/ServicControlInstaller.Packaging/ServiceControlInstaller.Packaging.csproj

@@ -7,8 +7,8 @@
     <ProjectGuid>{15F811B7-314C-4E9E-B5E9-35596045BBC4}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Packaging.Transports</RootNamespace>
-    <AssemblyName>Packaging.Transports</AssemblyName>
+    <RootNamespace>ServiceControlInstaller.Packaging</RootNamespace>
+    <AssemblyName>ServiceControlInstaller.Packaging</AssemblyName>
     <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <NuGetPackageImportStamp>62e7a213</NuGetPackageImportStamp>
@@ -36,36 +36,66 @@
     <StartupObject />
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.ServiceBus, Version=2.2.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\WindowsAzure.ServiceBus.2.2.0.0\lib\net40-full\Microsoft.ServiceBus.dll</HintPath>
+    <Reference Include="Microsoft.Data.Edm, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Edm.5.6.4\lib\net40\Microsoft.Data.Edm.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.WindowsAzure.Storage, Version=3.1.0.1, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\packages\WindowsAzure.Storage.3.1.0.1\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
+    <Reference Include="Microsoft.Data.OData, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.OData.5.6.4\lib\net40\Microsoft.Data.OData.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus, Version=5.3.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NServiceBus.Azure.Transports.WindowsAzureServiceBus.5.3.8\lib\net40\NServiceBus.Azure.Transports.WindowsAzureServiceBus.dll</HintPath>
+    <Reference Include="Microsoft.Data.Services.Client, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Data.Services.Client.5.6.4\lib\net40\Microsoft.Data.Services.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NServiceBus.Azure.Transports.WindowsAzureStorageQueues, Version=5.3.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NServiceBus.Azure.Transports.WindowsAzureStorageQueues.5.3.8\lib\net40\NServiceBus.Azure.Transports.WindowsAzureStorageQueues.dll</HintPath>
+    <Reference Include="Microsoft.ServiceBus, Version=2.6.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAzure.ServiceBus.2.6.0\lib\net40-full\Microsoft.ServiceBus.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NServiceBus.Transports.RabbitMQ, Version=1.1.5.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NServiceBus.RabbitMQ.1.1.5\lib\net40\NServiceBus.Transports.RabbitMQ.dll</HintPath>
+    <Reference Include="Microsoft.WindowsAzure.Configuration, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.WindowsAzure.ConfigurationManager.2.0.3\lib\net40\Microsoft.WindowsAzure.Configuration.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="NServiceBus.Transports.SQLServer, Version=1.2.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NServiceBus.SqlServer.1.2.2\lib\net40\NServiceBus.Transports.SQLServer.dll</HintPath>
+    <Reference Include="Microsoft.WindowsAzure.Storage, Version=4.3.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\WindowsAzure.Storage.4.3.0\lib\net40\Microsoft.WindowsAzure.Storage.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="RabbitMQ.Client, Version=3.3.5.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
-      <HintPath>..\packages\RabbitMQ.Client.3.3.5\lib\net30\RabbitMQ.Client.dll</HintPath>
+    <Reference Include="Newtonsoft.Json, Version=4.5.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.5.0.8\lib\net45\Newtonsoft.Json.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NServiceBus.Azure.Transports.WindowsAzureServiceBus, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NServiceBus.Azure.Transports.WindowsAzureServiceBus.6.3.2\lib\net45\NServiceBus.Azure.Transports.WindowsAzureServiceBus.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NServiceBus.Azure.Transports.WindowsAzureStorageQueues, Version=6.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NServiceBus.Azure.Transports.WindowsAzureStorageQueues.6.2.1\lib\net45\NServiceBus.Azure.Transports.WindowsAzureStorageQueues.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NServiceBus.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NServiceBus.5.2.5\lib\net45\NServiceBus.Core.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NServiceBus.Transports.RabbitMQ, Version=3.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NServiceBus.RabbitMQ.3.0.0\lib\net45\NServiceBus.Transports.RabbitMQ.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="NServiceBus.Transports.SQLServer, Version=2.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NServiceBus.SqlServer.2.1.3\lib\net45\NServiceBus.Transports.SQLServer.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
+    <Reference Include="RabbitMQ.Client, Version=3.5.4.0, Culture=neutral, PublicKeyToken=89e7d7c5feba84ce, processorArchitecture=MSIL">
+      <HintPath>..\packages\RabbitMQ.Client.3.5.4\lib\net40\RabbitMQ.Client.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.Runtime.Serialization" />
+    <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Spatial, Version=5.6.4.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Spatial.5.6.4\lib\net40\System.Spatial.dll</HintPath>
+      <Private>True</Private>
+    </Reference>
     <Reference Include="System.Xml.Linq" />
     <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="Microsoft.CSharp" />
@@ -86,27 +116,34 @@
     </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'))" />
   </Target>
-  <ItemGroup>
-    <ZipFiles Include="$(OutputPath)*.zip" />
-  </ItemGroup>
   <UsingTask AssemblyFile="..\..\buildsupport\DeploymentZipTask.Dll" TaskName="DeploymentZipTask.AddToZip" />
+
   <Target Name="ZipTarget" AfterTargets="AfterBuild">
-    <!-- Ensure Fresh Zip File  -->
-    <Delete Files="@(ZipFiles)" />
+    <PropertyGroup>
+      <ZipTargetFolder>..\..\zip\</ZipTargetFolder>
+      <ZipToCreate>$(ZipTargetFolder)Particular.ServiceControl-$(GfvMajorMinorPatch).zip</ZipToCreate>
+    </PropertyGroup>
+    <!-- Ensure Folder Exists  -->
+    <MakeDir Directories="$(ZipTargetFolder)" />
+    <!-- Remove any existing files -->
+    <ItemGroup>
+      <OldZips Include="$(ZipTargetFolder)*.*" />
+    </ItemGroup>
+    <Delete Files="@(OldZips)" />
     <!-- SQL Server -->
-    <AddToZip IncludeMask="NServiceBus.Transports.SQLServer.*" ZipFolder="Transports\SQLServer" SourceFolder="$(OutputPath)" ZipFileName="$(OutputPath)\Particular.ServiceControl-$(GfvMajorMinorPatch).zip" />
+    <AddToZip IncludeMask="NServiceBus.Transports.SQLServer.*" ZipFolder="Transports\SQLServer" SourceFolder="$(OutputPath)" ZipFileName="$(ZipToCreate)" />
     <!-- AzureStorageQueue -->
-    <AddToZip IncludeMask="NServiceBus.Azure.Transports.WindowsAzureStorageQueues.*" ZipFolder="Transports\AzureStorageQueue" SourceFolder="$(OutputPath)" ZipFileName="$(OutputPath)\Particular.ServiceControl-$(GfvMajorMinorPatch).zip" />
-    <AddToZip IncludeMask="Microsoft.WindowsAzure.Storage.*" ZipFolder="Transports\AzureStorageQueue" SourceFolder="$(OutputPath)" ZipFileName="$(OutputPath)\Particular.ServiceControl-$(GfvMajorMinorPatch).zip" />
+    <AddToZip IncludeMask="NServiceBus.Azure.Transports.WindowsAzureStorageQueues.*" ZipFolder="Transports\AzureStorageQueue" SourceFolder="$(OutputPath)" ZipFileName="$(ZipToCreate)" />
+    <AddToZip IncludeMask="Microsoft.WindowsAzure.Storage.*" ZipFolder="Transports\AzureStorageQueue" SourceFolder="$(OutputPath)" ZipFileName="$(ZipToCreate)" />
     <!-- AzureServiceBus -->
-    <AddToZip IncludeMask="NServiceBus.Azure.Transports.WindowsAzureServiceBus.*" ZipFolder="Transports\AzureServiceBus" SourceFolder="$(OutputPath)" ZipFileName="$(OutputPath)\Particular.ServiceControl-$(GfvMajorMinorPatch).zip" />
-    <AddToZip IncludeMask="Microsoft.Data.Services.Client.*" ZipFolder="Transports\AzureServiceBus" SourceFolder="$(OutputPath)" ZipFileName="$(OutputPath)\Particular.ServiceControl-$(GfvMajorMinorPatch).zip" />
+    <AddToZip IncludeMask="NServiceBus.Azure.Transports.WindowsAzureServiceBus.*" ZipFolder="Transports\AzureServiceBus" SourceFolder="$(OutputPath)" ZipFileName="$(ZipToCreate)" />
+    <AddToZip IncludeMask="Microsoft.Data.Services.Client.*" ZipFolder="Transports\AzureServiceBus" SourceFolder="$(OutputPath)" ZipFileName="$(ZipToCreate)" />
     <!-- RabbitMQ -->
-    <AddToZip IncludeMask="NServiceBus.Transports.RabbitMQ.*" ZipFolder="Transports\RabbitMQ" SourceFolder="$(OutputPath)" ZipFileName="$(OutputPath)\Particular.ServiceControl-$(GfvMajorMinorPatch).zip" />
-    <AddToZip IncludeMask="RabbitMQ.Client.*" ZipFolder="Transports\RabbitMQ" SourceFolder="$(OutputPath)" ZipFileName="$(OutputPath)\Particular.ServiceControl-$(GfvMajorMinorPatch).zip" />
+    <AddToZip IncludeMask="NServiceBus.Transports.RabbitMQ.*" ZipFolder="Transports\RabbitMQ" SourceFolder="$(OutputPath)" ZipFileName="$(ZipToCreate)" />
+    <AddToZip IncludeMask="RabbitMQ.Client.*" ZipFolder="Transports\RabbitMQ" SourceFolder="$(OutputPath)" ZipFileName="$(ZipToCreate)" />
     <!-- MSMQ -->
-    <AddToZip IncludeMask="CreateABlankFolderWithNoFiles" ZipFolder="Transports\MSMQ" SourceFolder="$(OutputPath)" ZipFileName="$(OutputPath)\Particular.ServiceControl-$(GfvMajorMinorPatch).zip" />
+    <AddToZip IncludeMask="CreateABlankFolderWithNoFiles" ZipFolder="Transports\MSMQ" SourceFolder="$(OutputPath)" ZipFileName="$(ZipToCreate)" />
     <!-- ServiceControl  -->
-    <AddToZip IncludeMask="*.*" ExcludeMask="*.config" ZipFolder="ServiceControl" SourceFolder="..\ServiceControl\bin\$(Configuration)" ZipFileName="$(OutputPath)\Particular.ServiceControl-$(GfvMajorMinorPatch).zip" />
+    <AddToZip IncludeMask="*.*" ExcludeMask="*.config" ZipFolder="ServiceControl" SourceFolder="..\ServiceControl\bin\$(Configuration)" ZipFileName="$(ZipToCreate)" />
   </Target>
 </Project>

src/ServicControlInstaller.Packaging/packages.config

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="GitVersionTask" version="2.0.1" targetFramework="net45" developmentDependency="true" />
+  <package id="Microsoft.Data.Edm" version="5.6.4" targetFramework="net45" />
+  <package id="Microsoft.Data.OData" version="5.6.4" targetFramework="net45" />
+  <package id="Microsoft.Data.Services.Client" version="5.6.4" targetFramework="net45" />
+  <package id="Microsoft.WindowsAzure.ConfigurationManager" version="2.0.3" targetFramework="net45" />
+  <package id="Newtonsoft.Json" version="5.0.8" targetFramework="net45" />
+  <package id="NServiceBus" version="5.2.5" targetFramework="net45" />
+  <package id="NServiceBus.Azure.Transports.WindowsAzureServiceBus" version="6.3.2" targetFramework="net45" />
+  <package id="NServiceBus.Azure.Transports.WindowsAzureStorageQueues" version="6.2.1" targetFramework="net45" />
+  <package id="NServiceBus.RabbitMQ" version="3.0.0" targetFramework="net45" />
+  <package id="NServiceBus.SqlServer" version="2.1.3" targetFramework="net45" />
+  <package id="RabbitMQ.Client" version="3.5.4" targetFramework="net45" />
+  <package id="System.Spatial" version="5.6.4" targetFramework="net45" />
+  <package id="WindowsAzure.ServiceBus" version="2.6.0" targetFramework="net45" />
+  <package id="WindowsAzure.Storage" version="4.3.0" targetFramework="net45" />
+</packages>

src/Packaging/readme.txt → src/ServicControlInstaller.Packaging/readme.txt

@@ -1,2 +1,2 @@
 Creates a zip file containing ServiceControl and all Transports
-This is need for new ServiceControl Install
+This is need for new ServiceControlInstaller

src/ServiceControl.AcceptanceTesting/Customization/Conventions.cs

@@ -3,22 +3,15 @@ namespace NServiceBus.AcceptanceTesting.Customization
     using System;
     using Support;
 
-    public class Conventions
+    public static class Conventions
     {
         static Conventions()
         {
             EndpointNamingConvention = t => t.Name;
         }
 
         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));
-        }
-
         public static string DefaultConfigForEndpoints { get; set; }
     }
 }

src/ServiceControl.AcceptanceTesting/EndpointConfigurationBuilder.cs

@@ -37,13 +37,6 @@ public EndpointConfigurationBuilder CustomEndpointName(string customEndpointName
             return this;
         }
 
-        public EndpointConfigurationBuilder AllowExceptions()
-        {
-            configuration.AllowExceptions = true;
-
-            return this;
-        }
-
         public EndpointConfigurationBuilder AddMapping<T>(Type endpoint)
         {
             configuration.EndpointMappings.Add(typeof(T),endpoint);
@@ -58,20 +51,22 @@ EndpointConfiguration CreateScenario()
             return configuration;
         }
 
-        public EndpointConfigurationBuilder EndpointSetup<T>() where T : IEndpointSetupTemplate
+        public EndpointConfigurationBuilder EndpointSetup<T>() where T : IEndpointSetupTemplate, new()
         {
             return EndpointSetup<T>(c => { });
         }
 
-        public EndpointConfigurationBuilder EndpointSetup<T>(Action<Configure> configCustomization) where T: IEndpointSetupTemplate
+        public EndpointConfigurationBuilder EndpointSetup<T>(Action<BusConfiguration> configurationBuilderCustomization = null) where T : IEndpointSetupTemplate, new()
         {
-            configuration.GetConfiguration = (settings,routingTable) =>
+            if (configurationBuilderCustomization == null)
+            {
+                configurationBuilderCustomization = b => { };
+            }
+            configuration.GetConfiguration = (settings, routingTable) =>
                 {
-                    var config = ((IEndpointSetupTemplate)Activator.CreateInstance<T>()).GetConfiguration(settings, configuration, new ScenarioConfigSource(configuration, routingTable));
-
-                    configCustomization(config);
-
-                    return config;
+                    var endpointSetupTemplate = new T();
+                    var scenarioConfigSource = new ScenarioConfigSource(configuration, routingTable);
+                    return endpointSetupTemplate.GetConfiguration(settings, configuration, scenarioConfigSource, configurationBuilderCustomization);
                 };
 
             return this;
@@ -85,9 +80,9 @@ EndpointConfiguration IEndpointConfigurationFactory.Get()
 
         readonly EndpointConfiguration configuration = new EndpointConfiguration();
 
-        public EndpointConfigurationBuilder WithConfig<T>(Action<T> action)
+        public EndpointConfigurationBuilder WithConfig<T>(Action<T> action) where T : new()
         {
-            var config = Activator.CreateInstance<T>();
+            var config = new T();
 
             action(config);
 
@@ -109,5 +104,12 @@ public EndpointConfigurationBuilder IncludeType<T>()
 
             return this;
         }
+
+        public EndpointConfigurationBuilder SendOnly()
+        {
+            configuration.SendOnly = true;
+
+            return this;
+        }
     }
 }

src/ServiceControl.AcceptanceTesting/IScenarioVerification.cs

@@ -0,0 +1,10 @@
+namespace NServiceBus.AcceptanceTesting
+{
+    using System;
+
+    public interface IScenarioVerification
+    {
+        Type ContextType { get; set; }
+        void Verify(ScenarioContext context);
+    }
+}