Skip to content

Commit 81af045

Browse files
distantcamdistantcam
committed
Updated fody bits. Added detached head tests.
1 parent 992774c commit 81af045

File tree

15 files changed

+70
-36
lines changed

15 files changed

+70
-36
lines changed

‎AcceptanceTests/AcceptanceTests.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
1414
<TargetFrameworkProfile />
15+
<NuGetPackageImportStamp>96cab2e5</NuGetPackageImportStamp>
1516
</PropertyGroup>
1617
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1718
<DebugSymbols>true</DebugSymbols>
@@ -124,12 +125,12 @@ xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.18.1.0\lib\net40\NativeBin
124125
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
125126
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.18.1.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
126127
</PropertyGroup>
127-
<Import Project="..\packages\Fody.1.22.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.22.1\build\Fody.targets')" />
128+
<Import Project="..\packages\Fody.1.24.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.24.0\build\Fody.targets')" />
128129
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
129130
<PropertyGroup>
130131
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
131132
</PropertyGroup>
132-
<Error Condition="!Exists('..\packages\Fody.1.22.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.22.1\build\Fody.targets'))" />
133+
<Error Condition="!Exists('..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.24.0\build\Fody.targets'))" />
133134
</Target>
134135
<!-- To modify your build process, add your task inside one of the targets below and uncomment it.
135136
Other similar extension points exist, see Microsoft.Common.targets.

‎AcceptanceTests/GitFlow/DevelopScenarios.cs

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,5 +21,23 @@ public void WhenDevelopBranchedFromMaster_MinorIsIncreased()
2121
result.OutputVariables[VariableProvider.SemVer].ShouldBe("1.1.0.0-unstable");
2222
}
2323
}
24+
25+
[Fact]
26+
public void WhenDevelopBranchedFromMasterDetachedHead_MinorIsIncreased()
27+
{
28+
using (var fixture = new EmptyRepositoryFixture())
29+
{
30+
fixture.Repository.MakeATaggedCommit("1.0.0");
31+
fixture.Repository.CreateBranch("develop").Checkout();
32+
fixture.Repository.MakeACommit();
33+
var commit = fixture.Repository.Head.Tip;
34+
fixture.Repository.MakeACommit();
35+
fixture.Repository.Checkout(commit);
36+
37+
var result = fixture.ExecuteGitVersion();
38+
39+
result.OutputVariables[VariableProvider.SemVer].ShouldBe("1.1.0.1-unstable");
40+
}
41+
}
2442
}
2543
}

‎AcceptanceTests/GitHubFlow/MasterTests.cs

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
using GitVersion;
44
using global::AcceptanceTests;
55
using global::AcceptanceTests.Helpers;
6+
using LibGit2Sharp;
67
using Shouldly;
78
using Xunit;
89

@@ -26,6 +27,28 @@ public void GivenARepositoryWithCommitsButNoTags_VersionShouldBe_0_1()
2627
}
2728
}
2829

30+
[Fact]
31+
public void GivenARepositoryWithCommitsButNoTagsWithDetachedHead_VersionShouldBe_0_1()
32+
{
33+
using (var fixture = new EmptyRepositoryFixture())
34+
{
35+
// Given
36+
fixture.Repository.MakeACommit();
37+
fixture.Repository.MakeACommit();
38+
fixture.Repository.MakeACommit();
39+
40+
var commit = fixture.Repository.Head.Tip;
41+
fixture.Repository.MakeACommit();
42+
fixture.Repository.Checkout(commit);
43+
44+
// When
45+
var result = fixture.ExecuteGitVersion();
46+
47+
result.ExitCode.ShouldBe(0);
48+
result.OutputVariables[VariableProvider.FullSemVer].ShouldBe("0.1.0+2");
49+
}
50+
}
51+
2952
[Fact]
3053
public void GivenARepositoryWithNoTagsAndANextVersionTxtFile_VersionShouldMatchVersionTxtFile()
3154
{
@@ -96,4 +119,4 @@ public void GivenARepositoryWithTagAndOldNextVersionTxtFile_VersionShouldBeTagWi
96119
}
97120
}
98121
}
99-
}
122+
}

‎AcceptanceTests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<packages>
33
<package id="ApprovalTests" version="3.0.5" targetFramework="net40" />
44
<package id="ApprovalUtilities" version="3.0.5" targetFramework="net40" />
5-
<package id="Fody" version="1.22.1" targetFramework="net40" developmentDependency="true" />
5+
<package id="Fody" version="1.24.0" targetFramework="net40" developmentDependency="true" />
66
<package id="LibGit2Sharp" version="0.18.1.0" targetFramework="net40" />
77
<package id="Shouldly" version="2.1.1" targetFramework="net40" />
88
<package id="xunit" version="1.9.2" targetFramework="net35" />

‎GitVersionCore/FodyWeavers.xml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Weavers>
3-
<Caseless />
4-
<Fielder />
5-
<Publicize />
6-
<Visualize />
7-
<Virtuosity />
8-
<JetBrainsAnnotations />
3+
<Caseless/>
4+
<JetBrainsAnnotations/>
5+
<Visualize/>
96
</Weavers>

‎GitVersionCore/GitHubFlow/BuildNumberCalculator.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ int NumberOfCommitsOnBranchSinceCommit(GitVersionContext context, Commit commit)
4444
{
4545
var qf = new CommitFilter
4646
{
47-
Since = context.CurrentBranch,
47+
Since = context.CurrentCommit,
4848
Until = commit,
4949
SortBy = CommitSortStrategies.Topological | CommitSortStrategies.Time
5050
};

‎GitVersionCore/GitVersionCore.csproj

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<AssemblyName>GitVersionCore</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<NuGetPackageImportStamp>e4626a5c</NuGetPackageImportStamp>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -126,13 +127,12 @@
126127
<None Include="packages.config" />
127128
</ItemGroup>
128129
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
129-
<Import Project="..\packages\Fody.1.22.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.22.1\build\Fody.targets')" />
130130
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
131131
<PropertyGroup>
132132
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
133133
</PropertyGroup>
134-
<Error Condition="!Exists('..\packages\Fody.1.22.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.22.1\build\Fody.targets'))" />
135134
<Error Condition="!Exists('..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets'))" />
135+
<Error Condition="!Exists('..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.24.0\build\Fody.targets'))" />
136136
</Target>
137137
<PropertyGroup>
138138
<PostBuildEvent>
@@ -158,4 +158,5 @@ xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.18.1.0\lib\net40\NativeBin
158158
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(SolutionDir)NuGetRefBuild" MetadataAssembly="$(OutputPath)GitVersionCore.dll" />
159159
</Target>
160160
<Import Project="..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets" Condition="Exists('..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets')" />
161+
<Import Project="..\packages\Fody.1.24.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.24.0\build\Fody.targets')" />
161162
</Project>

‎GitVersionCore/packages.config

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
33
<package id="Caseless.Fody" version="1.3.3.0" targetFramework="net40" developmentDependency="true" />
4-
<package id="Fielder.Fody" version="1.0.7.0" targetFramework="net40" developmentDependency="true" />
5-
<package id="Fody" version="1.22.1" targetFramework="net40" developmentDependency="true" />
4+
<package id="Fody" version="1.24.0" targetFramework="net40" developmentDependency="true" />
65
<package id="JetBrainsAnnotations.Fody" version="1.0.2" targetFramework="net40" developmentDependency="true" />
76
<package id="LibGit2Sharp" version="0.18.1.0" targetFramework="net40" />
87
<package id="PepitaPackage" version="1.20.0.0" targetFramework="net40" developmentDependency="true" />
9-
<package id="Publicize.Fody" version="1.3.6.0" targetFramework="net40" developmentDependency="true" />
10-
<package id="Virtuosity.Fody" version="1.19.6.0" targetFramework="net40" developmentDependency="true" />
11-
<package id="Visualize.Fody" version="0.3.0.0" targetFramework="net40" developmentDependency="true" />
8+
<package id="Visualize.Fody" version="0.4.0.0" targetFramework="net40" developmentDependency="true" />
129
</packages>

‎GitVersionExe/FodyWeavers.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Weavers>
33
<Caseless />
4-
<Publicize />
5-
<Fielder />
6-
<Virtuosity />
74
<JetBrainsAnnotations />
85
<Costura />
6+
<Visualize />
97
</Weavers>

‎GitVersionExe/GitVersionExe.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
<AssemblyName>GitVersion</AssemblyName>
1212
<TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
1313
<FileAlignment>512</FileAlignment>
14+
<NuGetPackageImportStamp>f25e2da3</NuGetPackageImportStamp>
1415
</PropertyGroup>
1516
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
1617
<DebugSymbols>true</DebugSymbols>
@@ -46,8 +47,7 @@
4647
<Reference Include="System.Xml" />
4748
<Reference Include="System.Xml.Linq" />
4849
<Reference Include="Visualize">
49-
<HintPath>..\packages\Visualize.Fody.0.3.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll</HintPath>
50-
<Private>False</Private>
50+
<HintPath>..\packages\Visualize.Fody.0.4.0.0\Lib\portable-net4+sl4+wp7+win8+MonoAndroid16+MonoTouch40\Visualize.dll</HintPath>
5151
</Reference>
5252
</ItemGroup>
5353
<ItemGroup>
@@ -116,13 +116,12 @@
116116
<Copy SourceFiles="$(ProjectDir)GemAssets\gitversion" DestinationFolder="$(SolutionDir)GemBuild\bin" />
117117
<Copy SourceFiles="$(ProjectDir)GemAssets\gitversion.gemspec" DestinationFolder="$(SolutionDir)GemBuild" />
118118
</Target>
119-
<Import Project="..\packages\Fody.1.22.1\build\Fody.targets" Condition="Exists('..\packages\Fody.1.22.1\build\Fody.targets')" />
120119
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
121120
<PropertyGroup>
122121
<ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
123122
</PropertyGroup>
124-
<Error Condition="!Exists('..\packages\Fody.1.22.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.22.1\build\Fody.targets'))" />
125123
<Error Condition="!Exists('..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\PepitaPackage.1.20.0.0\build\PepitaPackage.targets'))" />
124+
<Error Condition="!Exists('..\packages\Fody.1.24.0\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Fody.1.24.0\build\Fody.targets'))" />
126125
</Target>
127126
<UsingTask TaskName="CosturaCleanup" AssemblyFile="$(MSBuildToolsPath)\Microsoft.Build.Tasks.v4.0.dll" TaskFactory="CodeTaskFactory">
128127
<ParameterGroup>
@@ -169,4 +168,5 @@ xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.18.1.0\lib\net40\NativeBin
169168
if not exist "$(TargetDir)NativeBinaries\amd64" md "$(TargetDir)NativeBinaries\amd64"
170169
xcopy /s /y /d "$(SolutionDir)packages\LibGit2Sharp.0.18.1.0\lib\net40\NativeBinaries\amd64\*.*" "$(TargetDir)NativeBinaries\amd64"</PostBuildEvent>
171170
</PropertyGroup>
171+
<Import Project="..\packages\Fody.1.24.0\build\Fody.targets" Condition="Exists('..\packages\Fody.1.24.0\build\Fody.targets')" />
172172
</Project>

0 commit comments

Comments
 (0)