Skip to content

Commit 46a5f13

Browse files
author
John Simons
committed
Merge branch 'hotfix-4.3.5'
2 parents fcf57f3 + d59c226 commit 46a5f13

File tree

48 files changed

+421
-142
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

48 files changed

+421
-142
lines changed

Diff for: ‎buildsupport/FubuCore.dll

5.5 KB
Binary file not shown.

Diff for: ‎buildsupport/FubuCore.pdb

-1.03 MB
Binary file not shown.

Diff for: ‎buildsupport/GitFlowVersion/Build/GitFlowVersionTask.targets

-40
This file was deleted.

Diff for: ‎buildsupport/GitFlowVersion/GitFlowVersion.exe

-35.5 KB
Binary file not shown.

Diff for: ‎buildsupport/GitFlowVersion/GitFlowVersion.pdb

-75.5 KB
Binary file not shown.

Diff for: ‎buildsupport/GitFlowVersion/GitFlowVersionTask.dll

-10.5 KB
Binary file not shown.

Diff for: ‎buildsupport/GitFlowVersion/GitFlowVersionTask.pdb

-17.5 KB
Binary file not shown.

Diff for: ‎buildsupport/GitFlowVersion/LibGit2Sharp.dll

-233 KB
Binary file not shown.

Diff for: ‎buildsupport/GitFlowVersion/NativeBinaries/amd64/git2-11f8336.dll

-796 KB
Binary file not shown.

Diff for: ‎buildsupport/GitFlowVersion/NativeBinaries/x86/git2-11f8336.dll

-601 KB
Binary file not shown.

Diff for: ‎buildsupport/GitVersionTask/Build/GitVersionTask.targets

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)..\</SolutionDir>
5+
</PropertyGroup>
6+
<PropertyGroup>
7+
<GitVersionAppendRevision Condition="$(GitVersionAppendRevision) == '' Or $(GitVersionAppendRevision) == '*Undefined*'">false</GitVersionAppendRevision>
8+
</PropertyGroup>
9+
10+
<UsingTask
11+
TaskName="GitVersionTask.UpdateAssemblyInfo"
12+
AssemblyFile="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
13+
<UsingTask
14+
TaskName="GitVersionTask.WriteVersionInfoToBuildLog"
15+
AssemblyFile="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
16+
17+
<Target Name="UpdateAssemblyInfo"
18+
BeforeTargets="CoreCompile">
19+
<WriteVersionInfoToBuildLog
20+
SolutionDirectory="$(SolutionDir)"
21+
/>
22+
<UpdateAssemblyInfo
23+
SolutionDirectory="$(SolutionDir)"
24+
ProjectFile="$(ProjectPath)"
25+
AppendRevision="$(GitVersionAppendRevision)"
26+
AssemblyVersioningScheme="MajorMinor"
27+
CompileFiles ="@(Compile)">
28+
<Output
29+
TaskParameter="AssemblyInfoTempFilePath"
30+
PropertyName="AssemblyInfoTempFilePath" />
31+
</UpdateAssemblyInfo>
32+
33+
<ItemGroup>
34+
<Compile Include="$(AssemblyInfoTempFilePath)" />
35+
</ItemGroup>
36+
</Target>
37+
38+
<!--Support for ncrunch-->
39+
<ItemGroup>
40+
<None Include="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
41+
<None Include="$(MSBuildThisFileDirectory)..\GitVersionTask.pdb" />
42+
<None Include="$(MSBuildThisFileDirectory)..\GitVersionCore.dll" />
43+
<None Include="$(MSBuildThisFileDirectory)..\GitVersionCore.pdb" />
44+
<None Include="$(MSBuildThisFileDirectory)..\LibGit2Sharp.dll" />
45+
<None Include="$(MSBuildThisFileDirectory)..\NativeBinaries\**\*" />
46+
</ItemGroup>
47+
48+
49+
</Project>
50+
51+

Diff for: ‎buildsupport/GitVersionTask/GitVersionCore.dll

69.5 KB
Binary file not shown.

Diff for: ‎buildsupport/GitVersionTask/GitVersionTask.dll

19.5 KB
Binary file not shown.

Diff for: ‎buildsupport/GitVersionTask/LibGit2Sharp.dll

295 KB
Binary file not shown.

Diff for: ‎buildsupport/GitVersionTask/NativeBinaries/amd64/git2-06d772d.dll

887 KB
Binary file not shown.

Diff for: ‎buildsupport/GitVersionTask/NativeBinaries/x86/git2-06d772d.dll

684 KB
Binary file not shown.

Diff for: ‎buildsupport/NuGet.Core.dll

19.5 KB
Binary file not shown.

Diff for: ‎buildsupport/RippleRestoreTask.dll

-512 Bytes
Binary file not shown.

Diff for: ‎buildsupport/RippleRestoreTask.pdb

-27.5 KB
Binary file not shown.

Diff for: ‎buildsupport/RippleRestoreTask.targets

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33
<PropertyGroup>
44
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
5-
<BuildDependsOn>
5+
<BuildDependsOn Condition="'$(NCrunch)' != '1'">
66
RippleRestoreTarget;
77
$(BuildDependsOn);
88
</BuildDependsOn>

Diff for: ‎buildsupport/Timestamp/Build/Timestamp.targets

-35
This file was deleted.

Diff for: ‎buildsupport/Timestamp/Timestamp.dll

-7 KB
Binary file not shown.

Diff for: ‎buildsupport/Timestamp/Timestamp.pdb

-13.5 KB
Binary file not shown.

Diff for: ‎buildsupport/ripple.exe

5.5 KB
Binary file not shown.

Diff for: ‎buildsupport/ripple.pdb

-896 KB
Binary file not shown.

Diff for: ‎buildsupport/run-git.cmd

-1
This file was deleted.

Diff for: ‎ripple.config

+2-2
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<DefaultFloatConstraint>Current</DefaultFloatConstraint>
99
<DefaultFixedConstraint>Current,NextMajor</DefaultFixedConstraint>
1010
<Feeds>
11-
<Feed Url="http://builds.particular.net/guestAuth/app/nuget/v1/FeedService.svc" Mode="Float" Stability="Anything" />
12-
<Feed Url="http://nuget.org/api/v2" Mode="Float" Stability="ReleasedOnly" />
11+
<Feed Url="http://builds.particular.net/guestAuth/app/nuget/v1/FeedService.svc" Mode="Float" Stability="Anything" StabilityConvention="None" />
12+
<Feed Url="http://nuget.org/api/v2" Mode="Float" Stability="ReleasedOnly" StabilityConvention="None" />
1313
</Feeds>
1414
<Nugets>
1515
<Dependency Name="Autofac" Version="3.1.5.0" Mode="Fixed" />

Diff for: ‎src/NServiceBus.AcceptanceTesting/NServiceBus.AcceptanceTesting.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -80,5 +80,5 @@
8080
</ItemGroup>
8181
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
8282
<Import Project="$(SolutionDir)..\BuildSupport\RippleRestoreTask.targets" />
83-
<Import Project="$(SolutionDir)..\BuildSupport\GitFlowVersion\build\GitFlowVersionTask.targets" />
83+
<Import Project="$(SolutionDir)..\BuildSupport\GitVersionTask\build\GitVersionTask.targets" />
8484
</Project>

Diff for: ‎src/NServiceBus.Core.Tests/NServiceBus.Core.Tests.csproj

+1
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@
256256
<Compile Include="Serializers\XML\SomeEnum.cs" />
257257
<Compile Include="Serializers\XML\Using_Infer_Type_With_Non_Nested_Class.cs" />
258258
<Compile Include="Timeout\FakeMessageSender.cs" />
259+
<Compile Include="Timeout\RavenTimeoutPersisterTests.cs" />
259260
<Compile Include="Timeout\When_fetching_timeouts_from_storage.cs" />
260261
<Compile Include="Timeout\When_pooling_timeouts.cs" />
261262
<Compile Include="Timeout\When_receiving_timeouts.cs" />

0 commit comments

Comments
 (0)