diff --git a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
index dc33d577f8..d84514ec88 100644
--- a/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
+++ b/src/GitVersionCore.Tests/GitVersionCore.Tests.csproj
@@ -42,8 +42,8 @@
..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll
True
-
- ..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll
+
+ ..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll
True
diff --git a/src/GitVersionCore.Tests/packages.config b/src/GitVersionCore.Tests/packages.config
index 730bf36488..eab9432266 100644
--- a/src/GitVersionCore.Tests/packages.config
+++ b/src/GitVersionCore.Tests/packages.config
@@ -2,7 +2,7 @@
-
+
diff --git a/src/GitVersionCore/GitVersionCacheKeyFactory.cs b/src/GitVersionCore/GitVersionCacheKeyFactory.cs
index 07a814acd9..f81dea37ee 100644
--- a/src/GitVersionCore/GitVersionCacheKeyFactory.cs
+++ b/src/GitVersionCore/GitVersionCacheKeyFactory.cs
@@ -1,6 +1,6 @@
namespace GitVersion
{
- using GitVersion.Helpers;
+ using Helpers;
using System;
using System.Collections.Generic;
using System.IO;
@@ -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);
@@ -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();
@@ -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 CalculateDirectoryContents(string root)
+ static List CalculateDirectoryContents(string root)
{
var result = new List();
@@ -79,7 +79,7 @@ private static List CalculateDirectoryContents(string root)
continue;
}
- string[] files = null;
+ string[] files;
try
{
files = Directory.GetFiles(currentDir);
@@ -95,7 +95,7 @@ private static List CalculateDirectoryContents(string root)
continue;
}
- foreach (string file in files)
+ foreach (var file in files)
{
try
{
@@ -106,14 +106,13 @@ private static List 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]);
}
diff --git a/src/GitVersionCore/GitVersionCore.csproj b/src/GitVersionCore/GitVersionCore.csproj
index 42b7adbf28..25e59ea2cf 100644
--- a/src/GitVersionCore/GitVersionCore.csproj
+++ b/src/GitVersionCore/GitVersionCore.csproj
@@ -39,8 +39,8 @@
1591
-
- ..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll
+
+ ..\packages\GitTools.Core.1.2.0\lib\net4\GitTools.Core.dll
True
diff --git a/src/GitVersionCore/packages.config b/src/GitVersionCore/packages.config
index ce519f7f9c..179506243b 100644
--- a/src/GitVersionCore/packages.config
+++ b/src/GitVersionCore/packages.config
@@ -2,7 +2,7 @@
-
+
diff --git a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
index c1b178c8e0..9a5a971394 100644
--- a/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
+++ b/src/GitVersionExe.Tests/GitVersionExe.Tests.csproj
@@ -35,8 +35,8 @@
true
-
- ..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll
+
+ ..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll
True
diff --git a/src/GitVersionExe.Tests/packages.config b/src/GitVersionExe.Tests/packages.config
index fbc4933877..f6c8b4a7c5 100644
--- a/src/GitVersionExe.Tests/packages.config
+++ b/src/GitVersionExe.Tests/packages.config
@@ -1,6 +1,6 @@
-
+
diff --git a/src/GitVersionExe/GitVersionExe.csproj b/src/GitVersionExe/GitVersionExe.csproj
index 6c92543b0e..db387204a5 100644
--- a/src/GitVersionExe/GitVersionExe.csproj
+++ b/src/GitVersionExe/GitVersionExe.csproj
@@ -41,8 +41,8 @@
1591
-
- ..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll
+
+ ..\packages\GitTools.Core.1.2.0\lib\net4\GitTools.Core.dll
True
@@ -147,21 +147,19 @@
-
+
-
-
+
-
@@ -174,7 +172,6 @@
-
@@ -190,7 +187,6 @@
-
@@ -214,7 +210,6 @@
-
diff --git a/src/GitVersionExe/packages.config b/src/GitVersionExe/packages.config
index 3574c719e9..2dc57dc5c0 100644
--- a/src/GitVersionExe/packages.config
+++ b/src/GitVersionExe/packages.config
@@ -2,7 +2,7 @@
-
+
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
index 3bde0520a5..9d74a5bf43 100644
--- a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
+++ b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -56,8 +56,8 @@
..\packages\FluentDateTime.1.13.0\lib\NET35\FluentDateTime.dll
True
-
- ..\packages\GitTools.Core.1.1.0-beta0001\lib\net45\GitTools.Core.dll
+
+ ..\packages\GitTools.Core.1.2.0\lib\net45\GitTools.Core.dll
True
diff --git a/src/GitVersionTask.Tests/packages.config b/src/GitVersionTask.Tests/packages.config
index f1eac1ccd9..efbf4f2994 100644
--- a/src/GitVersionTask.Tests/packages.config
+++ b/src/GitVersionTask.Tests/packages.config
@@ -4,7 +4,7 @@
-
+
diff --git a/src/GitVersionTask/GitVersionTask.csproj b/src/GitVersionTask/GitVersionTask.csproj
index 07a3bc47cf..f000bd1aae 100644
--- a/src/GitVersionTask/GitVersionTask.csproj
+++ b/src/GitVersionTask/GitVersionTask.csproj
@@ -39,8 +39,8 @@
1591
-
- ..\packages\GitTools.Core.1.1.0-beta0001\lib\net4\GitTools.Core.dll
+
+ ..\packages\GitTools.Core.1.2.0\lib\net4\GitTools.Core.dll
True
diff --git a/src/GitVersionTask/packages.config b/src/GitVersionTask/packages.config
index 93b6121f7c..b25f2bf091 100644
--- a/src/GitVersionTask/packages.config
+++ b/src/GitVersionTask/packages.config
@@ -2,7 +2,7 @@
-
+