Skip to content

Commit 321d709

Browse files
JakeGinnivanJakeGinnivan
authored
Merge pull request #1164 from JakeGinnivan/commit-reset-count-fix-pull-1136
Commit reset count fix pull 1136
2 parents 43db5c7 + 5a08fd5 commit 321d709

File tree

16 files changed

+116
-151
lines changed

16 files changed

+116
-151
lines changed

‎src/GitVersionCore.Tests/GitVersionCore.Tests.csproj

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -54,40 +54,12 @@
5454
<HintPath>..\packages\LibGit2Sharp.0.23.0-pre20160922233542\lib\net40\LibGit2Sharp.dll</HintPath>
5555
<Private>True</Private>
5656
</Reference>
57-
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
58-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.dll</HintPath>
59-
<Private>True</Private>
60-
</Reference>
61-
<Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
62-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Mdb.dll</HintPath>
63-
<Private>True</Private>
64-
</Reference>
65-
<Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
66-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Pdb.dll</HintPath>
67-
<Private>True</Private>
68-
</Reference>
69-
<Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
70-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Rocks.dll</HintPath>
71-
<Private>True</Private>
72-
</Reference>
7357
<Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
7458
<HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
7559
<Private>True</Private>
7660
</Reference>
77-
<Reference Include="nunit.engine, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
78-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.dll</HintPath>
79-
<Private>True</Private>
80-
</Reference>
81-
<Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
82-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.api.dll</HintPath>
83-
<Private>True</Private>
84-
</Reference>
85-
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
86-
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
87-
<Private>True</Private>
88-
</Reference>
89-
<Reference Include="NUnit3.TestAdapter, Version=3.4.1.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
90-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\NUnit3.TestAdapter.dll</HintPath>
61+
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
62+
<HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
9163
<Private>True</Private>
9264
</Reference>
9365
<Reference Include="Shouldly, Version=2.7.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">

‎src/GitVersionCore.Tests/IntegrationTests/DevelopScenarios.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -178,7 +178,7 @@ public void InheritVersionFromReleaseBranch()
178178
fixture.AssertFullSemver("2.1.0-alpha.4");
179179
fixture.BranchTo("feature/MyFeature");
180180
fixture.MakeACommit();
181-
fixture.AssertFullSemver("2.1.0-MyFeature.1+3");
181+
fixture.AssertFullSemver("2.1.0-MyFeature.1+5");
182182
}
183183
}
184184
}

‎src/GitVersionCore.Tests/IntegrationTests/ReleaseBranchScenarios.cs

Lines changed: 57 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ public void WhenReleaseBranchIsMergedIntoDevelopHighestVersionIsTakenWithIt()
229229
Commands.Checkout(fixture.Repository, "develop");
230230
fixture.Repository.MergeNoFF("release-1.0.0", Generate.SignatureNow());
231231

232-
fixture.AssertFullSemver("2.1.0-alpha.6");
232+
fixture.AssertFullSemver("2.1.0-alpha.11");
233233
}
234234
}
235235

@@ -333,6 +333,7 @@ public void HotfixOffReleaseBranchShouldNotResetCount()
333333
fixture.AssertFullSemver(config, "2.0.0-beta.7");
334334
}
335335
}
336+
336337
[Test]
337338
public void MergeOnReleaseBranchShouldNotResetCount()
338339
{
@@ -366,6 +367,61 @@ public void MergeOnReleaseBranchShouldNotResetCount()
366367
}
367368

368369
[Test]
370+
public void CommitOnDevelop_AfterReleaseBranchMergeToDevelop_ShouldNotResetCount()
371+
{
372+
var config = new Config
373+
{
374+
VersioningMode = VersioningMode.ContinuousDeployment
375+
};
376+
377+
using (var fixture = new EmptyRepositoryFixture())
378+
{
379+
fixture.Repository.MakeACommit("initial");
380+
fixture.Repository.CreateBranch("develop");
381+
Commands.Checkout(fixture.Repository, "develop");
382+
383+
// Create release from develop
384+
fixture.Repository.CreateBranch("release-2.0.0");
385+
Commands.Checkout(fixture.Repository, "release-2.0.0");
386+
fixture.AssertFullSemver(config, "2.0.0-beta.0");
387+
388+
// Make some commits on release
389+
fixture.Repository.MakeACommit("release 1");
390+
fixture.Repository.MakeACommit("release 2");
391+
fixture.AssertFullSemver(config, "2.0.0-beta.2");
392+
393+
// First merge release to develop
394+
Commands.Checkout(fixture.Repository, "develop");
395+
fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
396+
397+
// Make some new commit on release
398+
Commands.Checkout(fixture.Repository, "release-2.0.0");
399+
fixture.Repository.MakeACommit("release 3 - after first merge");
400+
fixture.AssertFullSemver(config, "2.0.0-beta.3");
401+
402+
// Make new commit on develop
403+
Commands.Checkout(fixture.Repository, "develop");
404+
fixture.Repository.MakeACommit("develop after merge");
405+
406+
// Checkout to release (no new commits)
407+
Commands.Checkout(fixture.Repository, "release-2.0.0");
408+
fixture.AssertFullSemver(config, "2.0.0-beta.3");
409+
410+
// Make some new commit on release
411+
fixture.Repository.MakeACommit("release 4");
412+
fixture.Repository.MakeACommit("release 5");
413+
fixture.AssertFullSemver(config, "2.0.0-beta.5");
414+
415+
// Second merge release to develop
416+
Commands.Checkout(fixture.Repository, "develop");
417+
fixture.Repository.MergeNoFF("release-2.0.0", Generate.SignatureNow());
418+
419+
// Checkout to release (no new commits)
420+
Commands.Checkout(fixture.Repository, "release-2.0.0");
421+
fixture.AssertFullSemver(config, "2.0.0-beta.5");
422+
}
423+
}
424+
369425
public void ReleaseBranchShouldUseBranchNameVersionDespiteBumpInPreviousCommit()
370426
{
371427
using (var fixture = new EmptyRepositoryFixture())

‎src/GitVersionCore.Tests/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
<package id="LibGit2Sharp.NativeBinaries" version="1.0.160" targetFramework="net45" />
99
<package id="ModuleInit.Fody" version="1.5.9.0" targetFramework="net45" developmentDependency="true" />
1010
<package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
11-
<package id="NUnit" version="3.4.1" targetFramework="net45" />
12-
<package id="NUnit3TestAdapter" version="3.4.1" targetFramework="net45" />
11+
<package id="NUnit" version="3.6.0" targetFramework="net45" />
12+
<package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net45" />
1313
<package id="Shouldly" version="2.7.0" targetFramework="net45" />
1414
<package id="TestStack.ConventionTests" version="3.0.0" targetFramework="net45" />
1515
<package id="YamlDotNet" version="3.8.0" targetFramework="net45" />

‎src/GitVersionCore/GitRepoMetadataProvider.cs

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -133,26 +133,23 @@ public Commit FindMergeBase(Branch branch, Branch otherBranch)
133133
{
134134
Logger.WriteInfo(string.Format("Found merge base of {0}", findMergeBase.Sha));
135135
// We do not want to include merge base commits which got forward merged into the other branch
136-
bool mergeBaseWasForwardMerge;
136+
Commit mergeBaseAsForwardMerge;
137137
do
138138
{
139139
// Now make sure that the merge base is not a forward merge
140-
mergeBaseWasForwardMerge = otherBranch.Commits
140+
mergeBaseAsForwardMerge = otherBranch.Commits
141141
.SkipWhile(c => c != commitToFindCommonBase)
142142
.TakeWhile(c => c != findMergeBase)
143-
.Any(c => c.Parents.Contains(findMergeBase));
144-
if (mergeBaseWasForwardMerge)
143+
.LastOrDefault(c => c.Parents.Contains(findMergeBase));
144+
145+
if (mergeBaseAsForwardMerge != null)
145146
{
146-
var second = commitToFindCommonBase.Parents.First();
147-
var mergeBase = this.Repository.ObjectDatabase.FindMergeBase(commit, second);
148-
if (mergeBase == findMergeBase)
149-
{
150-
break;
151-
}
152-
findMergeBase = mergeBase;
147+
commitToFindCommonBase = mergeBaseAsForwardMerge.Parents.First();
148+
findMergeBase = this.Repository.ObjectDatabase.FindMergeBase(commit, commitToFindCommonBase);
149+
153150
Logger.WriteInfo(string.Format("Merge base was due to a forward merge, next merge base is {0}", findMergeBase));
154151
}
155-
} while (mergeBaseWasForwardMerge);
152+
} while (mergeBaseAsForwardMerge != null);
156153
}
157154

158155
// Store in cache.

‎src/GitVersionCore/GitVersionCore.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,8 +43,8 @@
4343
<HintPath>..\packages\GitTools.Core.1.2.1-beta0001\lib\net4\GitTools.Core.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
46-
<Reference Include="JetBrains.Annotations, Version=8.1.11.55, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
47-
<HintPath>..\packages\JetBrainsAnnotations.Fody.1.0.4.0\Lib\JetBrains.Annotations.dll</HintPath>
46+
<Reference Include="JetBrains.Annotations, Version=10.1.5.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
47+
<HintPath>..\packages\JetBrainsAnnotations.Fody.1.0.5.0\lib\JetBrains.Annotations.dll</HintPath>
4848
<Private>False</Private>
4949
</Reference>
5050
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">

‎src/GitVersionCore/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
<package id="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
44
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
55
<package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net40" />
6-
<package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net4" developmentDependency="true" />
6+
<package id="JetBrainsAnnotations.Fody" version="1.0.5.0" targetFramework="net40" developmentDependency="true" />
77
<package id="LibGit2Sharp" version="0.23.0-pre20160922233542" targetFramework="net40" />
88
<package id="LibGit2Sharp.NativeBinaries" version="1.0.160" targetFramework="net40" />
99
<package id="PepitaPackage" version="1.21.4" targetFramework="net4" developmentDependency="true" />

‎src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -47,40 +47,12 @@
4747
<HintPath>..\packages\LibGit2Sharp.0.23.0-pre20160922233542\lib\net40\LibGit2Sharp.dll</HintPath>
4848
<Private>True</Private>
4949
</Reference>
50-
<Reference Include="Mono.Cecil, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
51-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.dll</HintPath>
52-
<Private>True</Private>
53-
</Reference>
54-
<Reference Include="Mono.Cecil.Mdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
55-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Mdb.dll</HintPath>
56-
<Private>True</Private>
57-
</Reference>
58-
<Reference Include="Mono.Cecil.Pdb, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
59-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Pdb.dll</HintPath>
60-
<Private>True</Private>
61-
</Reference>
62-
<Reference Include="Mono.Cecil.Rocks, Version=0.9.6.0, Culture=neutral, PublicKeyToken=0738eb9f132ed756, processorArchitecture=MSIL">
63-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\Mono.Cecil.Rocks.dll</HintPath>
64-
<Private>True</Private>
65-
</Reference>
6650
<Reference Include="NSubstitute, Version=1.10.0.0, Culture=neutral, PublicKeyToken=92dd2e9066daa5ca, processorArchitecture=MSIL">
6751
<HintPath>..\packages\NSubstitute.1.10.0.0\lib\net45\NSubstitute.dll</HintPath>
6852
<Private>True</Private>
6953
</Reference>
70-
<Reference Include="nunit.engine, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
71-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.dll</HintPath>
72-
<Private>True</Private>
73-
</Reference>
74-
<Reference Include="nunit.engine.api, Version=3.0.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
75-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\nunit.engine.api.dll</HintPath>
76-
<Private>True</Private>
77-
</Reference>
78-
<Reference Include="nunit.framework, Version=3.4.1.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
79-
<HintPath>..\packages\NUnit.3.4.1\lib\net45\nunit.framework.dll</HintPath>
80-
<Private>True</Private>
81-
</Reference>
82-
<Reference Include="NUnit3.TestAdapter, Version=3.4.1.0, Culture=neutral, PublicKeyToken=4cb40d35494691ac, processorArchitecture=MSIL">
83-
<HintPath>..\packages\NUnit3TestAdapter.3.4.1\lib\NUnit3.TestAdapter.dll</HintPath>
54+
<Reference Include="nunit.framework, Version=3.6.0.0, Culture=neutral, PublicKeyToken=2638cd05610744eb, processorArchitecture=MSIL">
55+
<HintPath>..\packages\NUnit.3.6.0\lib\net45\nunit.framework.dll</HintPath>
8456
<Private>True</Private>
8557
</Reference>
8658
<Reference Include="Shouldly, Version=2.7.0.0, Culture=neutral, PublicKeyToken=6042cbcb05cbc941, processorArchitecture=MSIL">

‎src/GitVersionExe.Tests/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<package id="LibGit2Sharp" version="0.23.0-pre20160922233542" targetFramework="net45" />
66
<package id="LibGit2Sharp.NativeBinaries" version="1.0.160" targetFramework="net45" />
77
<package id="NSubstitute" version="1.10.0.0" targetFramework="net45" />
8-
<package id="NUnit" version="3.4.1" targetFramework="net45" />
9-
<package id="NUnit3TestAdapter" version="3.4.1" targetFramework="net45" />
8+
<package id="NUnit" version="3.6.0" targetFramework="net45" />
9+
<package id="NUnit3TestAdapter" version="3.7.0" targetFramework="net45" />
1010
<package id="Shouldly" version="2.7.0" targetFramework="net45" />
1111
</packages>

‎src/GitVersionExe/GitVersionExe.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@
4545
<HintPath>..\packages\GitTools.Core.1.2.1-beta0001\lib\net4\GitTools.Core.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
48-
<Reference Include="JetBrains.Annotations, Version=8.1.11.55, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
49-
<HintPath>..\packages\JetBrainsAnnotations.Fody.1.0.4.0\Lib\JetBrains.Annotations.dll</HintPath>
48+
<Reference Include="JetBrains.Annotations, Version=10.1.5.0, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
49+
<HintPath>..\packages\JetBrainsAnnotations.Fody.1.0.5.0\Lib\JetBrains.Annotations.dll</HintPath>
5050
<Private>False</Private>
5151
</Reference>
5252
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
@@ -150,7 +150,7 @@
150150
<LibGit2SharpFiles Include="$(TargetDir)LibGit2Sharp.*" Exclude="$(TargetDir)LibGit2Sharp.xml" />
151151
</ItemGroup>
152152
<!-- Repack without LibGit2Sharp for NugetCommandLineBuild -->
153-
<Exec Command="$(Runtime) &quot;$(SolutionDir)packages\ILRepack.2.0.10\tools\ILRepack.exe&quot; /allowDup /keyfile:&quot;$(SolutionDir)key.snk&quot; /out:&quot;$(TargetDir)ILMergeTemp\$(TargetFileName)&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)GitVersionCore.dll&quot; &quot;$(TargetDir)GitTools.Core.dll&quot; &quot;$(TargetDir)YamlDotNet.dll&quot; /target:exe /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /ndebug /internalize " />
153+
<Exec Command="$(Runtime) &quot;$(SolutionDir)packages\ILRepack.2.0.12\tools\ILRepack.exe&quot; /allowDup /keyfile:&quot;$(SolutionDir)key.snk&quot; /out:&quot;$(TargetDir)ILMergeTemp\$(TargetFileName)&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)GitVersionCore.dll&quot; &quot;$(TargetDir)GitTools.Core.dll&quot; &quot;$(TargetDir)YamlDotNet.dll&quot; /target:exe /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /ndebug /internalize " />
154154
<!-- NugetCommandLineBuild -->
155155
<MakeDir Directories="$(BuildDir)NuGetCommandLineBuild" />
156156
<Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(BuildDir)NuGetCommandLineBuild\tools\lib\%(RecursiveDir)%(Filename)%(Extension)')" />
@@ -161,7 +161,7 @@
161161
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.CommandLine.nuspec" DestinationFolder="$(BuildDir)NuGetCommandLineBuild" />
162162
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(BuildDir)NuGetCommandLineBuild" MetadataAssembly="$(OutputPath)ILMergeTemp\GitVersion.exe" Version="$(GitVersion_NuGetVersion)" />
163163
<!-- Repack with LibGit2Sharp for NugetCommandLineBuild -->
164-
<Exec Command="$(Runtime) &quot;$(SolutionDir)packages\ILRepack.2.0.10\tools\ILRepack.exe&quot; /allowDup /keyfile:&quot;$(SolutionDir)key.snk&quot; /out:&quot;$(TargetDir)ILMergeTemp\$(TargetFileName)&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)GitVersionCore.dll&quot; &quot;$(TargetDir)GitTools.Core.dll&quot; &quot;$(TargetDir)LibGit2Sharp.dll&quot; &quot;$(TargetDir)YamlDotNet.dll&quot; /target:exe /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /ndebug /internalize " />
164+
<Exec Command="$(Runtime) &quot;$(SolutionDir)packages\ILRepack.2.0.12\tools\ILRepack.exe&quot; /allowDup /keyfile:&quot;$(SolutionDir)key.snk&quot; /out:&quot;$(TargetDir)ILMergeTemp\$(TargetFileName)&quot; &quot;$(TargetPath)&quot; &quot;$(TargetDir)GitVersionCore.dll&quot; &quot;$(TargetDir)GitTools.Core.dll&quot; &quot;$(TargetDir)LibGit2Sharp.dll&quot; &quot;$(TargetDir)YamlDotNet.dll&quot; /target:exe /targetplatform:&quot;v4,$(FrameworkPathOverride)&quot; /ndebug /internalize " />
165165
<!-- NugetExeBuild -->
166166
<MakeDir Directories="$(BuildDir)NuGetExeBuild" />
167167
<Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(BuildDir)NuGetExeBuild\tools\lib\%(RecursiveDir)%(Filename)%(Extension)')" />

‎src/GitVersionExe/packages.config

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
<package id="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
44
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
55
<package id="GitTools.Core" version="1.2.1-beta0001" targetFramework="net40" />
6-
<package id="ILRepack" version="2.0.10" targetFramework="net40" />
7-
<package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net4" developmentDependency="true" />
6+
<package id="ILRepack" version="2.0.12" targetFramework="net40" />
7+
<package id="JetBrainsAnnotations.Fody" version="1.0.5.0" targetFramework="net40" developmentDependency="true" />
88
<package id="LibGit2Sharp" version="0.23.0-pre20160922233542" targetFramework="net40" />
99
<package id="LibGit2Sharp.NativeBinaries" version="1.0.160" targetFramework="net40" />
1010
<package id="PepitaPackage" version="1.21.4" targetFramework="net4" developmentDependency="true" />

0 commit comments

Comments
 (0)