Merge branch 'release-1.2.0'

Particular · Mar 21, 2014 · bd400ac · bd400ac
2 parents 24d287b + c4c0711
commit bd400ac
Show file tree

Hide file tree

Showing 103 changed files with 168 additions and 6,497 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,8 +1,9 @@
-build
+nugets
 build32
 binaries
 obj
 bin
+*.vshost.*
 .nu
 _ReSharper.*
 _UpgradeReport.*
@@ -14,7 +15,6 @@ _UpgradeReport.*
 *~
 *.swp
 *.user
-logs
 TestResults
 TestResult.xml
 results
@@ -30,6 +30,9 @@ Artifacts
 LogFiles
 csx
 *.ncrunchproject
-run-git.cmd
 *.ncrunchsolution
 _NCrunch_NServiceBus/*
+logs
+run-git.cmd
+src/Chocolatey/Build/*
+App_Packages
diff --git a/buildsupport/FubuCore.dll b/buildsupport/FubuCore.dll
diff --git a/buildsupport/FubuCore.pdb b/buildsupport/FubuCore.pdb
diff --git a/buildsupport/GitFlowVersion/Build/GitFlowVersionTask.targets b/buildsupport/GitFlowVersion/Build/GitFlowVersionTask.targets
@@ -7,31 +7,39 @@
   <UsingTask
       TaskName="GitFlowVersionTask.UpdateAssemblyInfo"
       AssemblyFile="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
+  <UsingTask
+      TaskName="GitFlowVersionTask.WriteVersionInfoToBuildLog"
+      AssemblyFile="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
 
     <Target Name="UpdateAssemblyInfo"
             BeforeTargets="CoreCompile">
-        <GitFlowVersionTask.UpdateAssemblyInfo 
-          SolutionDirectory="$(SolutionDir)" 
+      <WriteVersionInfoToBuildLog
+        SolutionDirectory="$(SolutionDir)"
+        />
+        <UpdateAssemblyInfo 
+          SolutionDirectory="$(SolutionDir)"
+          AssemblyName="$(AssemblyName)" 
           ProjectFile="$(ProjectPath)" 
           SignAssembly="$(SignAssembly)"
           CompileFiles ="@(Compile)">
           <Output 
             TaskParameter="AssemblyInfoTempFilePath" 
             PropertyName="AssemblyInfoTempFilePath" />
-        </GitFlowVersionTask.UpdateAssemblyInfo>
-        <Message Text="$(AssemblyInfoTempFilePath)" />
+        </UpdateAssemblyInfo>
 
-        <Message Text="BeforeInjection @(Compile)" />
         <ItemGroup>
             <Compile Include="$(AssemblyInfoTempFilePath)" />
         </ItemGroup>
-        <Message Text="AfterInjection @(Compile)" />
     </Target>
 
   <!--Support for ncrunch-->
   <ItemGroup>
     <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.dll" />
     <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersionTask.pdb" />
+    <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersion.exe" />
+    <None Include="$(MSBuildThisFileDirectory)..\GitFlowVersion.pdb" />
+    <None Include="$(MSBuildThisFileDirectory)..\LibGit2Sharp.dll" />
+    <None Include="$(MSBuildThisFileDirectory)..\NativeBinaries\**\*" />
   </ItemGroup>
 
 

diff --git a/buildsupport/GitFlowVersion/GitFlowVersion.exe b/buildsupport/GitFlowVersion/GitFlowVersion.exe
diff --git a/buildsupport/GitFlowVersion/GitFlowVersion.pdb b/buildsupport/GitFlowVersion/GitFlowVersion.pdb
diff --git a/buildsupport/GitFlowVersion/GitFlowVersionTask.dll b/buildsupport/GitFlowVersion/GitFlowVersionTask.dll
diff --git a/buildsupport/GitFlowVersion/GitFlowVersionTask.pdb b/buildsupport/GitFlowVersion/GitFlowVersionTask.pdb
diff --git a/buildsupport/GitFlowVersion/LibGit2Sharp.dll b/buildsupport/GitFlowVersion/LibGit2Sharp.dll
diff --git a/buildsupport/GitFlowVersion/NativeBinaries/amd64/git2-11f8336.dll b/buildsupport/GitFlowVersion/NativeBinaries/amd64/git2-11f8336.dll
diff --git a/buildsupport/GitFlowVersion/NativeBinaries/amd64/git2-65e9dc6.dll b/buildsupport/GitFlowVersion/NativeBinaries/amd64/git2-65e9dc6.dll
diff --git a/buildsupport/GitFlowVersion/NativeBinaries/x86/git2-11f8336.dll b/buildsupport/GitFlowVersion/NativeBinaries/x86/git2-11f8336.dll
diff --git a/buildsupport/GitFlowVersion/NativeBinaries/x86/git2-65e9dc6.dll b/buildsupport/GitFlowVersion/NativeBinaries/x86/git2-65e9dc6.dll
diff --git a/buildsupport/MSBuild.Community.Tasks.dll b/buildsupport/MSBuild.Community.Tasks.dll
diff --git a/buildsupport/NuGet.Core.dll b/buildsupport/NuGet.Core.dll
diff --git a/buildsupport/PepitaPackage.dll b/buildsupport/PepitaPackage.dll
diff --git a/buildsupport/RippleRestoreTask.dll b/buildsupport/RippleRestoreTask.dll
diff --git a/buildsupport/RippleRestoreTask.pdb b/buildsupport/RippleRestoreTask.pdb
diff --git a/buildsupport/RippleRestoreTask.targets b/buildsupport/RippleRestoreTask.targets
@@ -2,7 +2,7 @@
 <Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
   <PropertyGroup>
     <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
-    <BuildDependsOn>
+    <BuildDependsOn Condition="'$(NCrunch)' != '1'">
       RippleRestoreTarget;
       $(BuildDependsOn);
     </BuildDependsOn>

diff --git a/buildsupport/Timestamp/Timestamp.dll b/buildsupport/Timestamp/Timestamp.dll
diff --git a/buildsupport/Timestamp/Timestamp.pdb b/buildsupport/Timestamp/Timestamp.pdb
diff --git a/buildsupport/ripple.exe b/buildsupport/ripple.exe
diff --git a/buildsupport/ripple.pdb b/buildsupport/ripple.pdb
diff --git a/ripple.cmd b/ripple.cmd
@@ -0,0 +1 @@
+buildsupport\ripple.exe %*
diff --git a/ripple.config b/ripple.config
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<ripple xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+<ripple xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
   <Name>NServiceBus.SqlServer</Name>
   <NugetSpecFolder>packaging/nuget</NugetSpecFolder>
   <SourceFolder>src</SourceFolder>
@@ -8,56 +8,19 @@
   <DefaultFloatConstraint>CurrentMajor,NextMajor</DefaultFloatConstraint>
   <DefaultFixedConstraint>Current,NextMajor</DefaultFixedConstraint>
   <Feeds>
-    <Feed Url="http://builds.particular.net/guestAuth/app/nuget/v1/FeedService.svc" Mode="Float" Stability="Anything" />
-    <Feed Url="http://nuget.org/api/v2" Mode="Fixed" Stability="ReleasedOnly" />
+    <Feed Url="http://builds.particular.net/guestAuth/app/nuget/v1/FeedService.svc" Mode="Float" Stability="Anything" StabilityConvention="GitFlow" />
+    <Feed Url="http://nuget.org/api/v2" Mode="Fixed" Stability="ReleasedOnly" StabilityConvention="None" />
   </Feeds>
   <Nugets>
-    <Dependency Name="Autofac" Version="3.0.0.0" Mode="Fixed" />
-    <Dependency Name="Castle.Core" Version="3.2.0.0" Mode="Fixed" />
-    <Dependency Name="Castle.Windsor" Version="3.2.0.0" Mode="Fixed" />
-    <Dependency Name="Common.Logging" Version="1.2.0.0" Mode="Fixed" />
-    <Dependency Name="CommonServiceLocator" Version="1.0" Mode="Fixed" />
     <Dependency Name="Fody" Version="1.17.4.0" Mode="Fixed" />
-    <Dependency Name="Iesi.Collections" Version="3.3.3.4000" Mode="Fixed" />
     <Dependency Name="Janitor.Fody" Version="0.4.0.0" Mode="Fixed" />
     <Dependency Name="jQuery" Version="1.6.4.0" Mode="Fixed" />
     <Dependency Name="log4net" Version="1.2.10.0" Mode="Fixed" />
-    <Dependency Name="Microsoft.AspNet.Mvc" Version="4.0.20710.0" Mode="Fixed" />
-    <Dependency Name="Microsoft.AspNet.Razor" Version="2.0.20715.0" Mode="Fixed" />
-    <Dependency Name="Microsoft.AspNet.SignalR" Version="1.0.0.0" Mode="Fixed" />
-    <Dependency Name="Microsoft.AspNet.SignalR.Core" Version="1.0.0.0" Mode="Fixed" />
-    <Dependency Name="Microsoft.AspNet.SignalR.JS" Version="1.0.0.0" Mode="Fixed" />
-    <Dependency Name="Microsoft.AspNet.SignalR.Owin" Version="1.0.0.0" Mode="Fixed" />
-    <Dependency Name="Microsoft.AspNet.SignalR.SystemWeb" Version="1.0.0.0" Mode="Fixed" />
-    <Dependency Name="Microsoft.AspNet.WebPages" Version="2.0.20710.0" Mode="Fixed" />
-    <Dependency Name="Microsoft.Owin.Host.SystemWeb" Version="1.0.0.0" Mode="Fixed" />
-    <Dependency Name="Microsoft.Web.Infrastructure" Version="1.0.0.0" Mode="Fixed" />
-    <Dependency Name="Newtonsoft.Json" Version="4.5.11.0" Mode="Fixed" />
-    <Dependency Name="NHibernate" Version="3.3.3.4000" Mode="Fixed" />
-    <Dependency Name="Ninject" Version="3.0.1.10" Mode="Fixed" />
-    <Dependency Name="Ninject.Extensions.ContextPreservation" Version="3.0.0.8" Mode="Fixed" />
-    <Dependency Name="Ninject.Extensions.NamedScope" Version="3.0.0.5" Mode="Fixed" />
     <Dependency Name="NServiceBus" Version="4.2.0" Mode="Float" />
     <Dependency Name="NServiceBus.AcceptanceTesting" Version="4.2.0" Mode="Float" />
-    <Dependency Name="NServiceBus.Autofac" Version="4.2.0" Mode="Float" />
-    <Dependency Name="NServiceBus.CastleWindsor" Version="4.2.0" Mode="Float" />
-    <Dependency Name="NServiceBus.Host" Version="4.2.0" Mode="Float" />
+    <Dependency Name="NServiceBus.AcceptanceTests.Sources" Version="4.2.0" Mode="Float" />
     <Dependency Name="NServiceBus.Interfaces" Version="4.2.0" Mode="Float" />
-    <Dependency Name="NServiceBus.NHibernate" Version="4.2.0" Mode="Float" />
-    <Dependency Name="NServiceBus.Ninject" Version="4.2.0" Mode="Float" />
-    <Dependency Name="NServiceBus.Spring" Version="4.2.0" Mode="Float" />
-    <Dependency Name="NServiceBus.StructureMap" Version="4.2.0" Mode="Float" />
-    <Dependency Name="NServiceBus.Unity" Version="4.2.0" Mode="Float" />
     <Dependency Name="NUnit" Version="2.6.2" Mode="Fixed" />
-    <Dependency Name="Owin" Version="1.0.0.0" Mode="Fixed" />
-    <Dependency Name="RavenDB.Client" Version="2.0.2375.0" Mode="Fixed" />
-    <Dependency Name="RavenDB.Database" Version="2.0.2380.0" Mode="Fixed" />
-    <Dependency Name="RavenDB.Embedded" Version="2.0.2380.0" Mode="Fixed" />
-    <Dependency Name="Spring.Core" Version="1.3.2.0" Mode="Fixed" />
-    <Dependency Name="structuremap" Version="2.6.4.1" Mode="Fixed" />
-    <Dependency Name="System.Spatial" Version="5.2.0" Mode="Fixed" />
-    <Dependency Name="Unity" Version="2.1.505.2" Mode="Fixed" />
-    <Dependency Name="Unity.Interception" Version="2.1.505.2" Mode="Fixed" />
   </Nugets>
   <Groups />
   <References>

diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/Audit/When_a_message_is_audited.cs b/src/NServiceBus.SqlServer.AcceptanceTests/Audit/When_a_message_is_audited.cs
diff --git a/src/NServiceBus.SqlServer.AcceptanceTests/Audit/When_using_auditing_as_a_feature.cs b/src/NServiceBus.SqlServer.AcceptanceTests/Audit/When_using_auditing_as_a_feature.cs