Skip to content

Commit

Permalink
Merge branch 'hotfix-4.3.5'
Browse files Browse the repository at this point in the history
  • Loading branch information
John Simons committed Jul 21, 2014
2 parents fcf57f3 + d59c226 commit 46a5f13
Show file tree
Hide file tree
Showing 48 changed files with 421 additions and 142 deletions.
Binary file modified buildsupport/FubuCore.dll
Binary file not shown.
Binary file removed buildsupport/FubuCore.pdb
Binary file not shown.
40 changes: 0 additions & 40 deletions buildsupport/GitFlowVersion/Build/GitFlowVersionTask.targets

This file was deleted.

Binary file removed buildsupport/GitFlowVersion/GitFlowVersion.exe
Binary file not shown.
Binary file removed buildsupport/GitFlowVersion/GitFlowVersion.pdb
Binary file not shown.
Binary file removed buildsupport/GitFlowVersion/GitFlowVersionTask.dll
Binary file not shown.
Binary file removed buildsupport/GitFlowVersion/GitFlowVersionTask.pdb
Binary file not shown.
Binary file removed buildsupport/GitFlowVersion/LibGit2Sharp.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
51 changes: 51 additions & 0 deletions buildsupport/GitVersionTask/Build/GitVersionTask.targets
Original file line number Diff line number Diff line change
@@ -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>


Binary file added buildsupport/GitVersionTask/GitVersionCore.dll
Binary file not shown.
Binary file added buildsupport/GitVersionTask/GitVersionTask.dll
Binary file not shown.
Binary file added buildsupport/GitVersionTask/LibGit2Sharp.dll
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file modified buildsupport/NuGet.Core.dll
Binary file not shown.
Binary file modified buildsupport/RippleRestoreTask.dll
Binary file not shown.
Binary file removed buildsupport/RippleRestoreTask.pdb
Binary file not shown.
2 changes: 1 addition & 1 deletion buildsupport/RippleRestoreTask.targets
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
35 changes: 0 additions & 35 deletions buildsupport/Timestamp/Build/Timestamp.targets

This file was deleted.

Binary file removed buildsupport/Timestamp/Timestamp.dll
Binary file not shown.
Binary file removed buildsupport/Timestamp/Timestamp.pdb
Binary file not shown.
Binary file modified buildsupport/ripple.exe
Binary file not shown.
Binary file removed buildsupport/ripple.pdb
Binary file not shown.
1 change: 0 additions & 1 deletion buildsupport/run-git.cmd

This file was deleted.

4 changes: 2 additions & 2 deletions ripple.config
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
1 change: 1 addition & 0 deletions src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand Down
Loading

0 comments on commit 46a5f13

Please sign in to comment.