Skip to content

Upgraded to newer GitTools.Core which fixes normalisation issues #1033

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Sep 3, 2016
Merged

Upgraded to newer GitTools.Core which fixes normalisation issues #1033

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,8 +42,8 @@
<HintPath>..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
<Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GitTools.Testing, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="FluentDateTime" version="1.13.0" targetFramework="net45" />
<package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net45" />
<package id="GitTools.Core" version="1.2.0" targetFramework="net45" />
<package id="GitTools.Testing" version="1.1.1-beta0001" targetFramework="net45" />
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />
Expand Down
15 changes: 7 additions & 8 deletions src/GitVersionCore/GitVersionCacheKeyFactory.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace GitVersion
{
using GitVersion.Helpers;
using Helpers;
using System;
using System.Collections.Generic;
using System.IO;
Expand All @@ -12,7 +12,7 @@ class GitVersionCacheKeyFactory
{
public static GitVersionCacheKey Create(IFileSystem fileSystem, GitPreparer gitPreparer, Config overrideConfig)
{
var gitSystemHash = GetGitSystemHash(gitPreparer, fileSystem);
var gitSystemHash = GetGitSystemHash(gitPreparer);
var configFileHash = GetConfigFileHash(fileSystem, gitPreparer);
var repositorySnapshotHash = GetRepositorySnapshotHash(gitPreparer);
var overrideConfigHash = GetOverrideConfigHash(overrideConfig);
Expand All @@ -21,7 +21,7 @@ public static GitVersionCacheKey Create(IFileSystem fileSystem, GitPreparer gitP
return new GitVersionCacheKey(compositeHash);
}

private static string GetGitSystemHash(GitPreparer gitPreparer, IFileSystem fileSystem)
static string GetGitSystemHash(GitPreparer gitPreparer)
{
var dotGitDirectory = gitPreparer.GetDotGitDirectory();

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

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

Expand Down Expand Up @@ -79,7 +79,7 @@ private static List<string> CalculateDirectoryContents(string root)
continue;
}

string[] files = null;
string[] files;
try
{
files = Directory.GetFiles(currentDir);
Expand All @@ -95,7 +95,7 @@ private static List<string> CalculateDirectoryContents(string root)
continue;
}

foreach (string file in files)
foreach (var file in files)
{
try
{
Expand All @@ -106,14 +106,13 @@ private static List<string> CalculateDirectoryContents(string root)
catch (IOException e)
{
Logger.WriteError(e.Message);
continue;
}
}

// Push the subdirectories onto the stack for traversal.
// This could also be done before handing the files.
// push in reverse order
for (int i = subDirs.Length - 1; i >= 0; i--)
for (var i = subDirs.Length - 1; i >= 0; i--)
{
dirs.Push(subDirs[i]);
}
Expand Down
4 changes: 2 additions & 2 deletions src/GitVersionCore/GitVersionCore.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<NoWarn>1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll</HintPath>
<Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.2.0\lib\net4\GitTools.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="JetBrains.Annotations, Version=8.1.11.55, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionCore/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net40" />
<package id="GitTools.Core" version="1.2.0" targetFramework="net40" />
<package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net4" developmentDependency="true" />
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net40" />
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net40" />
Expand Down
4 changes: 2 additions & 2 deletions src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,8 @@
<DebugSymbols>true</DebugSymbols>
</PropertyGroup>
<ItemGroup>
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
<Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GitTools.Testing, Version=1.1.1.0, Culture=neutral, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionExe.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net45" />
<package id="GitTools.Core" version="1.2.0" targetFramework="net45" />
<package id="GitTools.Testing" version="1.1.1-beta0001" targetFramework="net45" />
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />
Expand Down
13 changes: 4 additions & 9 deletions src/GitVersionExe/GitVersionExe.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,8 @@
<NoWarn>1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll</HintPath>
<Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.2.0\lib\net4\GitTools.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="JetBrains.Annotations, Version=8.1.11.55, Culture=neutral, PublicKeyToken=1010a0d8d6380325, processorArchitecture=MSIL">
Expand Down Expand Up @@ -147,21 +147,19 @@
<TempFiles Include="$(TargetDir)ILMergeTemp\*.*" />
<NativeBinaries Include="$(TargetDir)lib\**\*.*" />
<WindowsBinaries Include="$(TargetDir)lib\**\*.dll" />
<LibGit2SharpFiles Include="$(TargetDir)LibGit2Sharp.*" Exclude="$(TargetDir)LibGit2Sharp.xml" />
<LibGit2SharpFiles Include="$(TargetDir)LibGit2Sharp.*" Exclude="$(TargetDir)LibGit2Sharp.xml" />
</ItemGroup>

<!-- Repack without LibGit2Sharp for NugetCommandLineBuild -->
<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 " />
<!-- NugetCommandLineBuild -->
<MakeDir Directories="$(BuildDir)NuGetCommandLineBuild" />
<Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(BuildDir)NuGetCommandLineBuild\tools\lib\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="@(LibGit2SharpFiles)" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" />
<Copy SourceFiles="@(LibGit2SharpFiles)" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" />
<Copy SourceFiles="$(OutputPath)GitVersion.pdb" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" Condition="Exists('$(OutputPath)GitVersion.pdb')" />
<Copy SourceFiles="$(OutputPath)GitVersion.exe.mdb" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" Condition="Exists('$(OutputPath)GitVersion.exe.mdb')" />
<Copy SourceFiles="$(OutputPath)ILMergeTemp\GitVersion.exe" DestinationFolder="$(BuildDir)NuGetCommandLineBuild\tools" />
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.CommandLine.nuspec" DestinationFolder="$(BuildDir)NuGetCommandLineBuild" />
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(BuildDir)NuGetCommandLineBuild" MetadataAssembly="$(OutputPath)ILMergeTemp\GitVersion.exe" Version="$(GitVersion_NuGetVersion)" />

<!-- Repack with LibGit2Sharp for NugetCommandLineBuild -->
<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 " />
<!-- NugetExeBuild -->
Expand All @@ -174,7 +172,6 @@
<Copy SourceFiles="$(ProjectDir)NugetAssets\chocolateyUninstall.ps1" DestinationFolder="$(BuildDir)NuGetExeBuild\tools" />
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersion.Portable.nuspec" DestinationFolder="$(BuildDir)NuGetExeBuild" />
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(BuildDir)NuGetExeBuild" MetadataAssembly="$(OutputPath)ILMergeTemp\GitVersion.exe" Version="$(GitVersion_NuGetVersion)" />

<!-- TfsBuildTask -->
<Copy SourceFiles="@(NativeBinaries)" DestinationFiles="@(NativeBinaries->'$(BuildDir)GitVersionTfsTaskBuild\GitVersionTask\lib\%(RecursiveDir)%(Filename)%(Extension)')" />
<Copy SourceFiles="$(SolutionDir)GitVersionTfsTask\extension-icon.png" DestinationFolder="$(BuildDir)GitVersionTfsTaskBuild" />
Expand All @@ -190,7 +187,6 @@
<ReplaceFileText InputFilename="$(BuildDir)GitVersionTfsTaskBuild\manifest.json" OutputFilename="$(BuildDir)GitVersionTfsTaskBuild\manifest.json" MatchExpression="\$version\$" ReplacementText="$(GitVersion_SemVer)" Condition="'$(GitVersion_SemVer)' != ''" />
<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)' != ''" />
<Exec Command="powershell -ExecutionPolicy RemoteSigned -NoProfile &quot;$(SolutionDir)GitVersionTfsTask\Create-Vsix.ps1 $(BuildDir)GitVersionTfsTaskBuild&quot;" Condition="'$(GitVersion_SemVer)' != ''" />

<!-- Gem -->
<MakeDir Directories="$(BuildDir)GemBuild" />
<!-- Gem can only treat files it knows about, so it throws an error for .so and .dylib files when building on Windows -->
Expand All @@ -214,7 +210,6 @@
</PropertyGroup>
<ReplaceFileText InputFilename="$(BuildDir)GemBuild\gitversion.gemspec" OutputFilename="$(BuildDir)GemBuild\gitversion.gemspec" MatchExpression="\$version\$" ReplacementText="$(GemVersion)" Condition="'$(GitVersion_SemVer)' != ''" />
<Exec Command="gem build gitversion.gemspec" ContinueOnError="True" WorkingDirectory="$(BuildDir)GemBuild" Condition="'$(GitVersion_SemVer)' != ''" />

<!-- Cleanup -->
<RemoveDir Directories="$(TargetDir)ILMergeTemp\" />
</Target>
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionExe/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net40" />
<package id="GitTools.Core" version="1.2.0" targetFramework="net40" />
<package id="ILRepack" version="2.0.10" targetFramework="net40" />
<package id="JetBrainsAnnotations.Fody" version="1.0.4.0" targetFramework="net4" developmentDependency="true" />
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net40" />
Expand Down
4 changes: 2 additions & 2 deletions src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,8 +56,8 @@
<HintPath>..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll</HintPath>
<Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionTask.Tests/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<package id="ApprovalUtilities" version="3.0.11" targetFramework="net45" />
<package id="FluentDateTime" version="1.13.0" targetFramework="net45" />
<package id="Fody" version="1.29.4" targetFramework="net45" developmentDependency="true" />
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net45" />
<package id="GitTools.Core" version="1.2.0" targetFramework="net45" />
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net45" />
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net45" />
<package id="Microsoft.CodeAnalysis.Analyzers" version="1.1.0" targetFramework="net45" />
Expand Down
4 changes: 2 additions & 2 deletions src/GitVersionTask/GitVersionTask.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,8 +39,8 @@
<NoWarn>1591</NoWarn>
</PropertyGroup>
<ItemGroup>
<Reference Include="GitTools.Core, Version=1.1.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll</HintPath>
<Reference Include="GitTools.Core, Version=1.2.0.0, Culture=neutral, processorArchitecture=MSIL">
<HintPath>..\packages\GitTools.Core.1.2.0\lib\net4\GitTools.Core.dll</HintPath>
<Private>True</Private>
</Reference>
<Reference Include="LibGit2Sharp, Version=0.23.0.0, Culture=neutral, PublicKeyToken=7cbde695407f0333, processorArchitecture=MSIL">
Expand Down
2 changes: 1 addition & 1 deletion src/GitVersionTask/packages.config
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<packages>
<package id="Caseless.Fody" version="1.4.2" targetFramework="net40" developmentDependency="true" />
<package id="Fody" version="1.29.4" targetFramework="net40" developmentDependency="true" />
<package id="GitTools.Core" version="1.1.0-beta0001" targetFramework="net40" />
<package id="GitTools.Core" version="1.2.0" targetFramework="net40" />
<package id="ILRepack" version="2.0.10" targetFramework="net40" />
<package id="LibGit2Sharp" version="0.23.0-pre20150419160303" targetFramework="net40" />
<package id="LibGit2Sharp.NativeBinaries" version="1.0.137" targetFramework="net40" />
Expand Down