Merge branch 'release-1.3.0'

Author: gbiellem

.gitattributes

@@ -22,6 +22,8 @@
 *.pptx	-text -diff
 *.xap	-text -diff
 *.ico	-text -diff
+*.ttf	-text -diff
+*.otf	-text -diff
 
 *.cs text diff=csharp
 *.config text diff=csharp
@@ -69,3 +71,6 @@
 *.snk 	-text -diff
 *.cub 	-text -diff
 *.wixlib	-text -diff
+
+
+*.approved.* binary

.gitignore

@@ -35,5 +35,3 @@ _NCrunch_NServiceBus/*
 logs
 run-git.cmd
 src/Chocolatey/Build/*
-App_Packages
-octopus/Build/*

src/ServiceControl.AcceptanceTests/App.config

@@ -20,11 +20,11 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NServiceBus.Core" publicKeyToken="9fc386479f8a226c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.6.0.0" newVersion="4.6.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.6.5.0" newVersion="4.6.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="NServiceBus" publicKeyToken="9fc386479f8a226c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.6.0.0" newVersion="4.6.0.0" />
+        <bindingRedirect oldVersion="0.0.0.0-4.6.5.0" newVersion="4.6.5.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Raven.Client.Lightweight" publicKeyToken="37f41c7f99471593" culture="neutral" />

src/ServiceControl.AcceptanceTests/Contexts/ConfigureExtensions.cs

@@ -3,9 +3,6 @@
     using System;
     using System.Collections.Generic;
     using NServiceBus;
-    using NServiceBus.Serializers.Binary;
-    using NServiceBus.Serializers.Json;
-    using NServiceBus.Serializers.XML;
     using TransportIntegration;
 
     public static class ConfigureExtensions
@@ -30,44 +27,6 @@ public static Configure DefineTransport(this Configure config, ITransportIntegra
             return config.UseTransport(transport.Type, () => transport.ConnectionString);
         }
 
-        public static Configure DefineSerializer(this Configure config, string serializer)
-        {
-            if (string.IsNullOrEmpty(serializer))
-            {
-                Configure.Serialization.Xml();
-                return config;
-            }
-
-            var type = Type.GetType(serializer);
-
-            if (type == typeof(XmlMessageSerializer))
-            {
-                Configure.Serialization.Xml();
-                return config;
-            }
-
-
-            if (type == typeof(JsonMessageSerializer))
-            {
-                Configure.Serialization.Json();
-                return config;
-            }
-
-            if (type == typeof(BsonMessageSerializer))
-            {
-                Configure.Serialization.Bson();
-                return config;
-            }
-
-            if (type == typeof(BinaryMessageSerializer))
-            {
-                Configure.Serialization.Binary();
-                return config;
-            }
-
-            throw new InvalidOperationException("Unknown serializer:" + serializer);
-        }
-
         public static Configure DefineBuilder(this Configure config, string builder)
         {
             if (string.IsNullOrEmpty(builder))

src/ServiceControl.AcceptanceTests/Contexts/DefaultServer.cs

@@ -31,6 +31,11 @@ public virtual void AddMoreConfig()
 
         }
 
+        public virtual void SetSerializer(Configure configure)
+        {
+            //NOOP Default is XML serializer
+        }
+
         public Configure GetConfiguration(RunDescriptor runDescriptor, EndpointConfiguration endpointConfiguration,
             IConfigurationSource configSource)
         {
@@ -47,10 +52,14 @@ public Configure GetConfiguration(RunDescriptor runDescriptor, EndpointConfigura
             AddMoreConfig();
 
             var config = Configure.With(types)
+                .DefiningEventsAs(t => typeof(IEvent).IsAssignableFrom(t) || IsExternalContract(t))
                 .DefineEndpointName(endpointConfiguration.EndpointName)
                 .CustomConfigurationSource(configSource)
-                .DefineBuilder(settings.GetOrNull("Builder"))
-                .DefineSerializer(settings.GetOrNull("Serializer"))
+                .DefineBuilder(settings.GetOrNull("Builder"));
+
+            SetSerializer(config);
+
+            config
                 .DefineTransport(transportToUse)
                 .InMemorySagaPersister();
 
@@ -71,6 +80,12 @@ public Configure GetConfiguration(RunDescriptor runDescriptor, EndpointConfigura
             return config.UnicastBus();
         }
 
+        static bool IsExternalContract(Type t)
+        {
+            return t.Namespace != null && t.Namespace.StartsWith("ServiceControl.Contracts");
+        }
+
+
         static void SetupLogging(EndpointConfiguration endpointConfiguration)
         {
             var logDir = ".\\logfiles\\";

src/ServiceControl.AcceptanceTests/Contexts/ExternalIntegrationsManagementEndpointSetup.cs

@@ -0,0 +1,42 @@
+namespace ServiceBus.Management.AcceptanceTests.Contexts
+{
+    using System.IO;
+    using NLog;
+    using NLog.Config;
+    using NLog.Targets;
+    using NServiceBus.AcceptanceTesting.Support;
+    using NServiceBus.Logging.Loggers.NLogAdapter;
+
+    public class ExternalIntegrationsManagementEndpointSetup : ManagementEndpointSetup
+    {
+        protected override LoggingConfiguration SetupLogging(EndpointConfiguration endpointConfiguration)
+        {
+            var logDir = ".\\logfiles\\";
+
+            Directory.CreateDirectory(logDir);
+
+            var logFile = Path.Combine(logDir, endpointConfiguration.EndpointName + ".txt");
+
+            if (File.Exists(logFile))
+            {
+                File.Delete(logFile);
+            }
+
+            var logLevel = "ERROR";
+
+            var nlogConfig = new LoggingConfiguration();
+
+            var fileTarget = new FileTarget
+            {
+                FileName = logFile,
+            };
+
+            nlogConfig.LoggingRules.Add(new LoggingRule("Raven.*", LogLevel.Warn, fileTarget) { Final = true });
+            nlogConfig.LoggingRules.Add(new LoggingRule("*", LogLevel.FromString(logLevel), fileTarget));
+            nlogConfig.LoggingRules.Add(new LoggingRule("ServiceControl.ExternalIntegrations.*", LogLevel.Debug, fileTarget));
+            nlogConfig.AddTarget("debugger", fileTarget);
+            NLogConfigurator.Configure(new object[] { fileTarget }, logLevel);
+            return nlogConfig;
+        }
+    }
+}

src/ServiceControl.AcceptanceTests/Contexts/ManagementEndpointSetup.cs

@@ -42,12 +42,12 @@ public Configure GetConfiguration(RunDescriptor runDescriptor, EndpointConfigura
                 }
             }
 
-            SetupLogging(endpointConfiguration);
+            LogManager.Configuration = SetupLogging(endpointConfiguration);
 
             return Configure.Instance;
         }
 
-        static void SetupLogging(EndpointConfiguration endpointConfiguration)
+        protected virtual LoggingConfiguration SetupLogging(EndpointConfiguration endpointConfiguration)
         {
             var logDir = ".\\logfiles\\";
 
@@ -73,7 +73,7 @@ static void SetupLogging(EndpointConfiguration endpointConfiguration)
             nlogConfig.LoggingRules.Add(new LoggingRule("*", LogLevel.FromString(logLevel), fileTarget));
             nlogConfig.AddTarget("debugger", fileTarget);
             NLogConfigurator.Configure(new object[] {fileTarget}, logLevel);
-            LogManager.Configuration = nlogConfig;
+            return nlogConfig;
         }
     }
 }

src/ServiceControl.AcceptanceTests/ExternalIntegrations/JSonServer.cs

@@ -0,0 +1,13 @@
+namespace ServiceBus.Management.AcceptanceTests.ExternalIntegrations
+{
+    using NServiceBus;
+    using ServiceBus.Management.AcceptanceTests.Contexts;
+
+    public class JSonServer : DefaultServer
+    {
+        public override void SetSerializer(Configure configure)
+        {
+            Configure.Serialization.Json();
+        }
+    }
+}