Small code cleanup and fixed build server issues

Author: JakeGinnivan

src/GitVersionCore.Tests/ExecuteCoreTests.cs

@@ -18,7 +18,7 @@ public class ExecuteCoreTests
     [SetUp]
     public void SetUp()
     {
-        this.fileSystem = new FileSystem();
+        fileSystem = new FileSystem();
     }
 
 
@@ -50,11 +50,11 @@ public void CacheFileExistsOnDisk()
 CommitDate: 2015-11-10
 ";
 
-        var versionAndBranchFinder = new ExecuteCore(this.fileSystem);
+        var versionAndBranchFinder = new ExecuteCore(fileSystem);
 
         var info = RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
         {
-            this.fileSystem.WriteAllText(vv.FileName, versionCacheFileContent);
+            fileSystem.WriteAllText(vv.FileName, versionCacheFileContent);
             vv = versionAndBranchFinder.ExecuteGitVersion(null, null, null, null, false, fixture.RepositoryPath, null);
             vv.AssemblySemVer.ShouldBe("4.10.3.0");
         });
@@ -67,10 +67,11 @@ public void CacheFileExistsOnDisk()
     public void CacheFileExistsInMemory()
     {
         var cache = new ConcurrentDictionary<string, VersionVariables>();
-        var versionAndBranchFinder = new ExecuteCore(this.fileSystem, cache.GetOrAdd);
+        var versionAndBranchFinder = new ExecuteCore(fileSystem, cache.GetOrAdd);
 
         var info = RepositoryScope(versionAndBranchFinder, (fixture, vv) =>
         {
+            vv.AssemblySemVer.ShouldBe("0.1.0.0");
             vv = versionAndBranchFinder.ExecuteGitVersion(null, null, null, null, false, fixture.RepositoryPath, null);
             vv.AssemblySemVer.ShouldBe("0.1.0.0");
         });
@@ -90,9 +91,11 @@ public void CacheFileIsMissing()
 
     string RepositoryScope(ExecuteCore executeCore = null, Action<EmptyRepositoryFixture, VersionVariables> fixtureAction = null)
     {
+        // Make sure GitVersion doesn't trigger build server mode when we are running the tests
+        Environment.SetEnvironmentVariable("APPVEYOR", null);
         var infoBuilder = new StringBuilder();
         Action<string> infoLogger = s => { infoBuilder.AppendLine(s); };
-        executeCore = executeCore ?? new ExecuteCore(this.fileSystem);
+        executeCore = executeCore ?? new ExecuteCore(fileSystem);
 
         Logger.SetLoggers(infoLogger, s => { }, s => { });
 

src/GitVersionCore.Tests/FileSystemTests.cs

@@ -1,8 +1,5 @@
 using System;
 using System.IO;
-using GitVersion;
-using GitVersion.Helpers;
-
 using LibGit2Sharp;
 using NUnit.Framework;
 

src/GitVersionCore.Tests/Fixtures/RemoteRepositoryFixture.cs

@@ -1,7 +1,5 @@
 using System;
 using GitVersion;
-using GitVersion.Helpers;
-
 using LibGit2Sharp;
 
 public class RemoteRepositoryFixture : RepositoryFixtureBase

src/GitVersionCore.Tests/GitPreparerTests.cs

@@ -2,8 +2,6 @@
 using System.IO;
 using System.Linq;
 using GitVersion;
-using GitVersion.Helpers;
-
 using LibGit2Sharp;
 using NUnit.Framework;
 using Shouldly;

src/GitVersionCore/ExecuteCore.cs

@@ -34,15 +34,15 @@ public ExecuteCore(IFileSystem fileSystem, Func<string, Func<string, VersionVari
         public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicRepositoryLocation, Authentication authentication, string targetBranch, bool noFetch, string workingDirectory, string commitId)
         {
             var gitDir = Repository.Discover(workingDirectory);
-            using (var repo = this.fileSystem.GetRepository(gitDir))
+            using (var repo = fileSystem.GetRepository(gitDir))
             {
                 // Maybe using timestamp in .git/refs directory is enough?
-                var ticks = this.fileSystem.GetLastDirectoryWrite(Path.Combine(gitDir, "refs"));
+                var ticks = fileSystem.GetLastDirectoryWrite(Path.Combine(gitDir, "refs"));
                 var key = string.Format("{0}:{1}:{2}:{3}", gitDir, repo.Head.CanonicalName, repo.Head.Tip.Sha, ticks);
 
-                if (this.getOrAddFromCache != null)
+                if (getOrAddFromCache != null)
                 {
-                    return this.getOrAddFromCache(key, k =>
+                    return getOrAddFromCache(key, k =>
                     {
                         Logger.WriteInfo("Version not in memory cache. Attempting to load version from disk cache.");
                         return LoadVersionVariablesFromDiskCache(key, gitDir, targetUrl, dynamicRepositoryLocation, authentication, targetBranch, noFetch, workingDirectory, commitId);
@@ -97,11 +97,11 @@ VersionVariables LoadVersionVariablesFromDiskCache(string key, string gitDir, st
 
                 var cacheDir = Path.Combine(gitDir, "gitversion_cache");
                 // If the cacheDir already exists, CreateDirectory just won't do anything (it won't fail). @asbjornu
-                this.fileSystem.CreateDirectory(cacheDir);
+                fileSystem.CreateDirectory(cacheDir);
 
                 var cacheFileName = string.Concat(Path.Combine(cacheDir, cacheKey), ".yml");
                 VersionVariables vv = null;
-                if (this.fileSystem.Exists(cacheFileName))
+                if (fileSystem.Exists(cacheFileName))
                 {
                     using (Logger.IndentLog("Deserializing version variables from cache file " + cacheFileName))
                     {
@@ -115,7 +115,7 @@ VersionVariables LoadVersionVariablesFromDiskCache(string key, string gitDir, st
                             Logger.WriteInfo(ex.ToString());
                             try
                             {
-                                this.fileSystem.Delete(cacheFileName);
+                                fileSystem.Delete(cacheFileName);
                             }
                             catch (Exception deleteEx)
                             {
@@ -179,7 +179,7 @@ VersionVariables ExecuteInternal(string targetUrl, string dynamicRepositoryLocat
             var versionFinder = new GitVersionFinder();
             var configuration = ConfigurationProvider.Provide(projectRoot, fileSystem);
 
-            using (var repo = this.fileSystem.GetRepository(dotGitDirectory))
+            using (var repo = fileSystem.GetRepository(dotGitDirectory))
             {
                 var gitVersionContext = new GitVersionContext(repo, configuration, commitId : commitId);
                 var semanticVersion = versionFinder.FindVersion(gitVersionContext);

src/GitVersionExe.Tests/ExecutionResults.cs

@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections.Generic;
 using System.Web.Script.Serialization;
 using GitVersion;