Merge branch 'release-5.0.0'

.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

IntegrationTests/GenericHost/GenericHost.sln

@@ -1,10 +1,10 @@
 
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2013
+VisualStudioVersion = 12.0.30723.0
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logging", "Logging\Logging.csproj", "{15E0163A-315E-4473-9BF3-DD9EA128EBD7}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoggingFromAppConfig", "LoggingFromAppConfig\LoggingFromAppConfig.csproj", "{2DA2522F-3567-4A2D-90A8-1A1AC98E6051}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LoggingWithConfigurableThreshold", "LoggingWithConfigurableThreshold\LoggingWithConfigurableThreshold.csproj", "{3BF3849F-A0F5-4B9A-BB8F-12D4219F7787}"
 EndProject
 Global
@@ -17,10 +17,6 @@ Global
 		{15E0163A-315E-4473-9BF3-DD9EA128EBD7}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{15E0163A-315E-4473-9BF3-DD9EA128EBD7}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{15E0163A-315E-4473-9BF3-DD9EA128EBD7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{2DA2522F-3567-4A2D-90A8-1A1AC98E6051}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{2DA2522F-3567-4A2D-90A8-1A1AC98E6051}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{2DA2522F-3567-4A2D-90A8-1A1AC98E6051}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{2DA2522F-3567-4A2D-90A8-1A1AC98E6051}.Release|Any CPU.Build.0 = Release|Any CPU
 		{3BF3849F-A0F5-4B9A-BB8F-12D4219F7787}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{3BF3849F-A0F5-4B9A-BB8F-12D4219F7787}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{3BF3849F-A0F5-4B9A-BB8F-12D4219F7787}.Release|Any CPU.ActiveCfg = Release|Any CPU

IntegrationTests/GenericHost/Logging/App.config

@@ -1,15 +1,11 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core" />
+    <section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core"/>
     <section name="AuditConfig" type="NServiceBus.Config.AuditConfig, NServiceBus.Core"/>
   </configSections>
 
-  <!--Audit Configuration has been moved from UnicastBusConfig to AuditConfig. 
-  <AuditConfig QueueName="The address to which messages received will be forwarded."
-    OverrideTimeToBeReceived="The time to be received set on forwarded messages, specified as a timespan see http://msdn.microsoft.com/en-us/library/vstudio/se73z7b9.aspx"  /> -->
-  <AuditConfig QueueName="audit" />
+  <AuditConfig QueueName="audit"/>
 
-  <MessageForwardingInCaseOfFaultConfig ErrorQueue="error" />
-
+  <MessageForwardingInCaseOfFaultConfig ErrorQueue="error"/>
 </configuration>

IntegrationTests/GenericHost/Logging/Endpoint.cs

@@ -7,11 +7,16 @@ namespace Logging
         configuration of the endpoint so we specify "Logging.MyProductionProfile" on the command line.
      */
 
-    public class Endpoint : IConfigureThisEndpoint, AsA_Client {}
+    public class Endpoint : IConfigureThisEndpoint, AsA_Client {
+        public void Customize(BusConfiguration configuration)
+        {
+            configuration.UsePersistence<InMemoryPersistence>();
+        }
+    }
 
     public class MyProductionProfile : Production {}
 
-    public class MyProductionLogging : IConfigureLoggingForProfile<MyProductionProfile>
+    public class MyProductionLogging : NServiceBus.Hosting.Profiles.IConfigureLoggingForProfile<MyProductionProfile>
     {
         public void Configure(IConfigureThisEndpoint specifier)
         {

IntegrationTests/GenericHost/Logging/Logging.csproj

@@ -10,8 +10,9 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Logging</RootNamespace>
     <AssemblyName>Logging</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -29,16 +30,9 @@
     <DefineConstants>TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="log4net, Version=1.2.10.0, Culture=neutral, PublicKeyToken=1b44e1d426115821, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\binaries\log4net.dll</HintPath>
-    </Reference>
-    <Reference Include="NServiceBus, Version=2.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
-      <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\binaries\NServiceBus.dll</HintPath>
-    </Reference>
     <Reference Include="NServiceBus.Core, Version=2.0.0.0, Culture=neutral, PublicKeyToken=9fc386479f8a226c, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\binaries\NServiceBus.Core.dll</HintPath>
@@ -48,15 +42,14 @@
       <HintPath>..\..\..\binaries\NServiceBus.Host.exe</HintPath>
     </Reference>
     <Reference Include="System" />
-    <Reference Include="System.Core"/>
-    <Reference Include="System.Xml.Linq"/>
-    <Reference Include="System.Data.DataSetExtensions"/>
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
     <Reference Include="System.Data" />
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Endpoint.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="App.config" />
@@ -66,6 +59,6 @@
     <StartAction>Program</StartAction>
     <StartProgram>$(ProjectDir)$(OutputPath)NServiceBus.Host.exe</StartProgram>
     <StartArguments>Logging.MyProductionProfile</StartArguments>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
-  <Import Project="$(SolutionDir)..\..\BuildSupport\RippleRestoreTask.targets" />
 </Project>

IntegrationTests/GenericHost/LoggingWithConfigurableThreshold/App.config

@@ -1,19 +1,14 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
-    <section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core" />
-    <section name="Logging" type="NServiceBus.Config.Logging, NServiceBus.Core" />
+    <section name="MessageForwardingInCaseOfFaultConfig" type="NServiceBus.Config.MessageForwardingInCaseOfFaultConfig, NServiceBus.Core"/>
+    <section name="Logging" type="NServiceBus.Config.Logging, NServiceBus.Core"/>
     <section name="AuditConfig" type="NServiceBus.Config.AuditConfig, NServiceBus.Core"/>
   </configSections>
 
   <MessageForwardingInCaseOfFaultConfig ErrorQueue="error"/>
 
-  <!--Audit Configuration has been moved from UnicastBusConfig to AuditConfig. 
-  <AuditConfig QueueName="The address to which messages received will be forwarded."
-    OverrideTimeToBeReceived="The time to be received set on forwarded messages, specified as a timespan see http://msdn.microsoft.com/en-us/library/vstudio/se73z7b9.aspx"  /> -->
-  <AuditConfig QueueName="audit" />
-
-
-  <Logging Threshold="WARN" />
+  <AuditConfig QueueName="audit"/>
 
+  <Logging Threshold="WARN"/>
 </configuration>