Merge branch 'hotfix-4.3.5'

Particular · Jul 21, 2014 · 46a5f13 · 46a5f13
2 parents fcf57f3 + d59c226
commit 46a5f13
Show file tree

Hide file tree

Showing 48 changed files with 421 additions and 142 deletions.
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
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/x86/git2-11f8336.dll b/buildsupport/GitFlowVersion/NativeBinaries/x86/git2-11f8336.dll
diff --git a/buildsupport/GitVersionTask/Build/GitVersionTask.targets b/buildsupport/GitVersionTask/Build/GitVersionTask.targets
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <PropertyGroup>
+    <SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)..\</SolutionDir>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GitVersionAppendRevision Condition="$(GitVersionAppendRevision) == '' Or $(GitVersionAppendRevision) == '*Undefined*'">false</GitVersionAppendRevision>
+  </PropertyGroup>
+
+  <UsingTask
+      TaskName="GitVersionTask.UpdateAssemblyInfo"
+      AssemblyFile="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
+  <UsingTask
+      TaskName="GitVersionTask.WriteVersionInfoToBuildLog"
+      AssemblyFile="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
+
+  <Target Name="UpdateAssemblyInfo"
+          BeforeTargets="CoreCompile">
+    <WriteVersionInfoToBuildLog
+      SolutionDirectory="$(SolutionDir)"
+        />
+    <UpdateAssemblyInfo
+      SolutionDirectory="$(SolutionDir)"
+      ProjectFile="$(ProjectPath)"
+      AppendRevision="$(GitVersionAppendRevision)"
+      AssemblyVersioningScheme="MajorMinor"
+      CompileFiles ="@(Compile)">
+      <Output
+        TaskParameter="AssemblyInfoTempFilePath"
+        PropertyName="AssemblyInfoTempFilePath" />
+    </UpdateAssemblyInfo>
+
+    <ItemGroup>
+      <Compile Include="$(AssemblyInfoTempFilePath)" />
+    </ItemGroup>
+  </Target>
+
+  <!--Support for ncrunch-->
+  <ItemGroup>
+    <None Include="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
+    <None Include="$(MSBuildThisFileDirectory)..\GitVersionTask.pdb" />
+    <None Include="$(MSBuildThisFileDirectory)..\GitVersionCore.dll" />
+    <None Include="$(MSBuildThisFileDirectory)..\GitVersionCore.pdb" />
+    <None Include="$(MSBuildThisFileDirectory)..\LibGit2Sharp.dll" />
+    <None Include="$(MSBuildThisFileDirectory)..\NativeBinaries\**\*" />
+  </ItemGroup>
+
+
+</Project>
+
+
diff --git a/buildsupport/GitVersionTask/GitVersionCore.dll b/buildsupport/GitVersionTask/GitVersionCore.dll
diff --git a/buildsupport/GitVersionTask/GitVersionTask.dll b/buildsupport/GitVersionTask/GitVersionTask.dll
diff --git a/buildsupport/GitVersionTask/LibGit2Sharp.dll b/buildsupport/GitVersionTask/LibGit2Sharp.dll
diff --git a/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-06d772d.dll b/buildsupport/GitVersionTask/NativeBinaries/amd64/git2-06d772d.dll
diff --git a/buildsupport/GitVersionTask/NativeBinaries/x86/git2-06d772d.dll b/buildsupport/GitVersionTask/NativeBinaries/x86/git2-06d772d.dll
diff --git a/buildsupport/NuGet.Core.dll b/buildsupport/NuGet.Core.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/Build/Timestamp.targets b/buildsupport/Timestamp/Build/Timestamp.targets
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/buildsupport/run-git.cmd b/buildsupport/run-git.cmd
diff --git a/ripple.config b/ripple.config
@@ -8,8 +8,8 @@
   <DefaultFloatConstraint>Current</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="Float" Stability="ReleasedOnly" />
+    <Feed Url="http://builds.particular.net/guestAuth/app/nuget/v1/FeedService.svc" Mode="Float" Stability="Anything" StabilityConvention="None" />
+    <Feed Url="http://nuget.org/api/v2" Mode="Float" Stability="ReleasedOnly" StabilityConvention="None" />
   </Feeds>
   <Nugets>
     <Dependency Name="Autofac" Version="3.1.5.0" Mode="Fixed" />

diff --git a/src/NServiceBus.AcceptanceTesting/NServiceBus.AcceptanceTesting.csproj b/src/NServiceBus.AcceptanceTesting/NServiceBus.AcceptanceTesting.csproj
@@ -80,5 +80,5 @@
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="$(SolutionDir)..\BuildSupport\RippleRestoreTask.targets" />
-  <Import Project="$(SolutionDir)..\BuildSupport\GitFlowVersion\build\GitFlowVersionTask.targets" />
+  <Import Project="$(SolutionDir)..\BuildSupport\GitVersionTask\build\GitVersionTask.targets" />
 </Project>
diff --git a/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj b/src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj
@@ -256,6 +256,7 @@
     <Compile Include="Serializers\XML\SomeEnum.cs" />
     <Compile Include="Serializers\XML\Using_Infer_Type_With_Non_Nested_Class.cs" />
     <Compile Include="Timeout\FakeMessageSender.cs" />
+    <Compile Include="Timeout\RavenTimeoutPersisterTests.cs" />
     <Compile Include="Timeout\When_fetching_timeouts_from_storage.cs" />
     <Compile Include="Timeout\When_pooling_timeouts.cs" />
     <Compile Include="Timeout\When_receiving_timeouts.cs" />