Skip to content

Commit 8fce1c6

Browse files
JakeGinnivanJakeGinnivan
authored
Merge pull request #1033 from JakeGinnivan/fixRaceConditions
Upgraded to newer GitTools.Core which fixes normalisation issues
2 parents b525f21 + fe6f0b7 commit 8fce1c6

File tree

13 files changed

+27
-33
lines changed

13 files changed

+27
-33
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,8 +42,8 @@
4242
<HintPath>..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll</HintPath>
4343
<Private>True</Private>
4444
</Reference>
45-
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
46-
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
45+
<Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
46+
<HintPath>..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll</HintPath>
4747
<Private>True</Private>
4848
</Reference>
4949
<Reference Include="GitTools.Testing, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">

‎src/GitVersionCore.Tests/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="FluentDateTime" version="1.13.0" targetFramework="net45" />
44
<package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
5-
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net45" />
5+
<package id="GitTools.Core" version="1.2.0" targetFramework="net45" />
66
<package id="GitTools.Testing" version="1.1.1-beta0001" targetFramework="net45" />
77
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
88
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />

‎src/GitVersionCore/GitVersionCacheKeyFactory.cs‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace GitVersion
22
{
3-
using GitVersion.Helpers;
3+
using Helpers;
44
using System;
55
using System.Collections.Generic;
66
using System.IO;
@@ -12,7 +12,7 @@ class GitVersionCacheKeyFactory
1212
{
1313
public static GitVersionCacheKey Create(IFileSystem fileSystem, GitPreparer gitPreparer, Config overrideConfig)
1414
{
15-
var gitSystemHash = GetGitSystemHash(gitPreparer, fileSystem);
15+
var gitSystemHash = GetGitSystemHash(gitPreparer);
1616
var configFileHash = GetConfigFileHash(fileSystem, gitPreparer);
1717
var repositorySnapshotHash = GetRepositorySnapshotHash(gitPreparer);
1818
var overrideConfigHash = GetOverrideConfigHash(overrideConfig);
@@ -21,7 +21,7 @@ public static GitVersionCacheKey Create(IFileSystem fileSystem, GitPreparer gitP
2121
return new GitVersionCacheKey(compositeHash);
2222
}
2323

24-
private static string GetGitSystemHash(GitPreparer gitPreparer, IFileSystem fileSystem)
24+
static string GetGitSystemHash(GitPreparer gitPreparer)
2525
{
2626
var dotGitDirectory = gitPreparer.GetDotGitDirectory();
2727

@@ -32,7 +32,7 @@ private static string GetGitSystemHash(GitPreparer gitPreparer, IFileSystem file
3232
}
3333

3434
// based on https://msdn.microsoft.com/en-us/library/bb513869.aspx
35-
private static List<string> CalculateDirectoryContents(string root)
35+
static List<string> CalculateDirectoryContents(string root)
3636
{
3737
var result = new List<string>();
3838

@@ -79,7 +79,7 @@ private static List<string> CalculateDirectoryContents(string root)
7979
continue;
8080
}
8181

82-
string[] files = null;
82+
string[] files;
8383
try
8484
{
8585
files = Directory.GetFiles(currentDir);
@@ -95,7 +95,7 @@ private static List<string> CalculateDirectoryContents(string root)
9595
continue;
9696
}
9797

98-
foreach (string file in files)
98+
foreach (var file in files)
9999
{
100100
try
101101
{
@@ -106,14 +106,13 @@ private static List<string> CalculateDirectoryContents(string root)
106106
catch (IOException e)
107107
{
108108
Logger.WriteError(e.Message);
109-
continue;
110109
}
111110
}
112111

113112
// Push the subdirectories onto the stack for traversal.
114113
// This could also be done before handing the files.
115114
// push in reverse order
116-
for (int i = subDirs.Length - 1; i >= 0; i--)
115+
for (var i = subDirs.Length - 1; i >= 0; i--)
117116
{
118117
dirs.Push(subDirs[i]);
119118
}

‎src/GitVersionCore/GitVersionCore.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,8 +39,8 @@
3939
<NoWarn>1591</NoWarn>
4040
</PropertyGroup>
4141
<ItemGroup>
42-
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
43-
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll</HintPath>
42+
<Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
43+
<HintPath>..\packages\GitTools.Core.1.2.0\lib\net4\GitTools.Core.dll</HintPath>
4444
<Private>True</Private>
4545
</Reference>
4646
<Reference Include="JetBrains.Annotations, Version=8.1.11.55, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">

‎src/GitVersionCore/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="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
44
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
5-
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net40" />
5+
<package id="GitTools.Core" version="1.2.0" targetFramework="net40" />
66
<package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net4" developmentDependency="true" />
77
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net40" />
88
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net40" />

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@
3535
<DebugSymbols>true</DebugSymbols>
3636
</PropertyGroup>
3737
<ItemGroup>
38-
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
39-
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
38+
<Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
39+
<HintPath>..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll</HintPath>
4040
<Private>True</Private>
4141
</Reference>
4242
<Reference Include="GitTools.Testing, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">

‎src/GitVersionExe.Tests/packages.config‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<packages>
3-
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net45" />
3+
<package id="GitTools.Core" version="1.2.0" targetFramework="net45" />
44
<package id="GitTools.Testing" version="1.1.1-beta0001" targetFramework="net45" />
55
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
66
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />

‎src/GitVersionExe/GitVersionExe.csproj‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -41,8 +41,8 @@
4141
<NoWarn>1591</NoWarn>
4242
</PropertyGroup>
4343
<ItemGroup>
44-
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
45-
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll</HintPath>
44+
<Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
45+
<HintPath>..\packages\GitTools.Core.1.2.0\lib\net4\GitTools.Core.dll</HintPath>
4646
<Private>True</Private>
4747
</Reference>
4848
<Reference Include="JetBrains.Annotations, Version=8.1.11.55, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
@@ -147,21 +147,19 @@
147147
<TempFiles Include="$(TargetDir)ILMergeTemp\*.*" />
148148
<NativeBinaries Include="$(TargetDir)lib\**\*.*" />
149149
<WindowsBinaries Include="$(TargetDir)lib\**\*.dll" />
150-
<LibGit2SharpFiles Include="$(TargetDir)LibGit2Sharp.*" Exclude="$(TargetDir)LibGit2Sharp.xml" />
150+
<LibGit2SharpFiles Include="$(TargetDir)LibGit2Sharp.*" Exclude="$(TargetDir)LibGit2Sharp.xml" />
151151
</ItemGroup>
152-
153152
<!-- Repack without LibGit2Sharp for NugetCommandLineBuild -->
154153
<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 " />
155154
<!-- NugetCommandLineBuild -->
156155
<MakeDir Directories="$(BuildDir)NuGetCommandLineBuild" />
157156
<Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(BuildDir)NuGetCommandLineBuild\tools\lib\%(RecursiveDir)%(Filename)%(Extension)')" />
158-
<Copy SourceFiles="@(LibGit2SharpFiles)" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" />
157+
<Copy SourceFiles="@(LibGit2SharpFiles)" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" />
159158
<Copy SourceFiles="$(OutputPath)GitVersion.pdb" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" Condition="Exists('$(OutputPath)GitVersion.pdb')" />
160159
<Copy SourceFiles="$(OutputPath)GitVersion.exe.mdb" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" Condition="Exists('$(OutputPath)GitVersion.exe.mdb')" />
161160
<Copy SourceFiles="$(OutputPath)ILMergeTemp\GitVersion.exe" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" />
162161
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.CommandLine.nuspec" DestinationFolder="$(BuildDir)NuGetCommandLineBuild" />
163162
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(BuildDir)NuGetCommandLineBuild" MetadataAssembly="$(OutputPath)ILMergeTemp\GitVersion.exe" Version="$(GitVersion_NuGetVersion)" />
164-
165163
<!-- Repack with LibGit2Sharp for NugetCommandLineBuild -->
166164
<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 " />
167165
<!-- NugetExeBuild -->
@@ -174,7 +172,6 @@
174172
<Copy SourceFiles="$(ProjectDir)NugetAssets\chocolateyUninstall.ps1" DestinationFolder="$(BuildDir)NuGetExeBuild\tools" />
175173
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.Portable.nuspec" DestinationFolder="$(BuildDir)NuGetExeBuild" />
176174
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(BuildDir)NuGetExeBuild" MetadataAssembly="$(OutputPath)ILMergeTemp\GitVersion.exe" Version="$(GitVersion_NuGetVersion)" />
177-
178175
<!-- TfsBuildTask -->
179176
<Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(BuildDir)GitVersionTfsTaskBuild\GitVersionTask\lib\%(RecursiveDir)%(Filename)%(Extension)')" />
180177
<Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\extension-icon.png" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
@@ -190,7 +187,6 @@
190187
<ReplaceFileText InputFilename="$(BuildDir)GitVersionTfsTaskBuild\manifest.json" OutputFilename="$(BuildDir)GitVersionTfsTaskBuild\manifest.json" MatchExpression="\$version\$" ReplacementText="$(GitVersion_SemVer)" Condition="'$(GitVersion_SemVer)' != ''" />
191188
<Exec Command="powershell -ExecutionPolicy RemoteSigned -NoProfile &quot;$(SolutionDir)GitVersionTfsTask\Update-GitVersionTfsTaskVersion.ps1 $(BuildDir)GitVersionTfsTaskBuild\GitVersionTask\task.json $(GitVersion_MajorMinorPatch)&quot;" WorkingDirectory="$(BuildDir)" Condition="'$(GitVersion_MajorMinorPatch)' != ''" />
192189
<Exec Command="powershell -ExecutionPolicy RemoteSigned -NoProfile &quot;$(SolutionDir)GitVersionTfsTask\Create-Vsix.ps1 $(BuildDir)GitVersionTfsTaskBuild&quot;" Condition="'$(GitVersion_SemVer)' != ''" />
193-
194190
<!-- Gem -->
195191
<MakeDir Directories="$(BuildDir)GemBuild" />
196192
<!-- Gem can only treat files it knows about, so it throws an error for .so and .dylib files when building on Windows -->
@@ -214,7 +210,6 @@
214210
</PropertyGroup>
215211
<ReplaceFileText InputFilename="$(BuildDir)GemBuild\gitversion.gemspec" OutputFilename="$(BuildDir)GemBuild\gitversion.gemspec" MatchExpression="\$version\$" ReplacementText="$(GemVersion)" Condition="'$(GitVersion_SemVer)' != ''" />
216212
<Exec Command="gem build gitversion.gemspec" ContinueOnError="True" WorkingDirectory="$(BuildDir)GemBuild" Condition="'$(GitVersion_SemVer)' != ''" />
217-
218213
<!-- Cleanup -->
219214
<RemoveDir Directories="$(TargetDir)ILMergeTemp\" />
220215
</Target>

‎src/GitVersionExe/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="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
44
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
5-
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net40" />
5+
<package id="GitTools.Core" version="1.2.0" targetFramework="net40" />
66
<package id="ILRepack" version="2.0.10" targetFramework="net40" />
77
<package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net4" developmentDependency="true" />
88
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net40" />

‎src/GitVersionTask.Tests/GitVersionTask.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -56,8 +56,8 @@
5656
<HintPath>..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll</HintPath>
5757
<Private>True</Private>
5858
</Reference>
59-
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
60-
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
59+
<Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
60+
<HintPath>..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll</HintPath>
6161
<Private>True</Private>
6262
</Reference>
6363
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">

0 commit comments

Comments
 (0)