fixed bug: /overrideconfig was ignored in caching results

When /overrideconfig presents version must be calculated explicitly
without saving in cache.

Author: sergiorykov

src/GitVersionCore/ExecuteCore.cs

@@ -1,12 +1,11 @@
 namespace GitVersion
 {
+    using GitVersion.Helpers;
+    using LibGit2Sharp;
     using System;
     using System.ComponentModel;
     using System.IO;
     using System.Linq;
-    using GitVersion.Helpers;
-
-    using LibGit2Sharp;
 
     public class ExecuteCore
     {
@@ -16,7 +15,7 @@ public class ExecuteCore
         public ExecuteCore(IFileSystem fileSystem)
         {
             if (fileSystem == null) throw new ArgumentNullException("fileSystem");
-            
+
             this.fileSystem = fileSystem;
             gitVersionCache = new GitVersionCache(fileSystem);
         }
@@ -52,10 +51,16 @@ public VersionVariables ExecuteGitVersion(string targetUrl, string dynamicReposi
                 throw new Exception(string.Format("Failed to prepare or find the .git directory in path '{0}'.", workingDirectory));
             }
 
+            if (overrideConfig != null)
+            {
+                var overridenVersionVariables = ExecuteInternal(targetBranch, commitId, gitPreparer, buildServer, overrideConfig: overrideConfig);
+                return overridenVersionVariables;
+            }
+
             var versionVariables = gitVersionCache.LoadVersionVariablesFromDiskCache(gitPreparer);
             if (versionVariables == null)
             {
-                versionVariables = ExecuteInternal(targetBranch, commitId, gitPreparer, buildServer, overrideConfig: overrideConfig);
+                versionVariables = ExecuteInternal(targetBranch, commitId, gitPreparer, buildServer);
                 try
                 {
                     gitVersionCache.WriteVariablesToDiskCache(repo, dotGitDirectory, versionVariables);
@@ -100,7 +105,7 @@ static string ResolveCurrentBranch(IBuildServer buildServer, string targetBranch
         VersionVariables ExecuteInternal(string targetBranch, string commitId, GitPreparer gitPreparer, IBuildServer buildServer, Config overrideConfig = null)
         {
             var versionFinder = new GitVersionFinder();
-           var configuration = ConfigurationProvider.Provide(gitPreparer, fileSystem, overrideConfig: overrideConfig);
+            var configuration = ConfigurationProvider.Provide(gitPreparer, fileSystem, overrideConfig: overrideConfig);
 
             return gitPreparer.WithRepository(repo =>
             {

src/GitVersionExe/ArgumentParser.cs

@@ -263,25 +263,43 @@ public static Arguments ParseArguments(List<string> commandLineArguments)
 
                     if (arguments.UpdateAssemblyInfoFileName.Count > 1 && arguments.EnsureAssemblyInfo)
                     {
-                        throw new WarningException("Can't specify multiple assembly info files when using -ensureassemblyinfo switch, either use a single assembly info file or do not specify -ensureassemblyinfo and create assembly info files manually");
+                        throw new WarningException("Can't specify multiple assembly info files when using /ensureassemblyinfo switch, either use a single assembly info file or do not specify /ensureassemblyinfo and create assembly info files manually");
                     }
                     continue;
                 }
 
                 if (name.IsSwitch("overrideconfig"))
                 {
-                    foreach (var item in value.Split(';'))
+                    var keyValueOptions = value.Split(';');
+                    if (keyValueOptions.Length == 0)
+                    {
+                        continue;
+                    }
+
+                    arguments.HasOverrideConfig = true;
+
+                    if (keyValueOptions.Length > 1)
                     {
-                        var configOverride = item.Split('=');
+                        throw new WarningException("Can't specify multiple /overrideconfig options: currently supported only 'tag-prefix' option");
+                    }
+
+                    // key=value
+                    foreach (var keyValueOption in keyValueOptions)
+                    {
+                        var keyAndValue = keyValueOption.Split('=');
+                        if (keyAndValue.Length > 1)
+                        {
+                            throw new WarningException(string.Format("Could not parse /overrideconfig option: {0}. Ensure it is in format 'key=value'", keyValueOption));
+                        }
 
-                        switch (configOverride[0])
+                        var optionKey = keyAndValue[0].ToLowerInvariant();
+                        switch (optionKey)
                         {
                             case "tag-prefix":
-                                if (1 < configOverride.Length)
-                                {
-                                    arguments.OverrideConfig.TagPrefix = configOverride[1];
-                                }
+                                arguments.OverrideConfig.TagPrefix = keyAndValue[1];
                                 break;
+                            default:
+                                throw new WarningException(string.Format("Could not parse /overrideconfig option: {0}. Currently supported only 'tag-prefix' option", optionKey));
                         }
                     }
 

src/GitVersionExe/Arguments.cs

@@ -15,6 +15,7 @@ public Arguments()
         public Authentication Authentication;
 
         public Config OverrideConfig;
+        public bool HasOverrideConfig { get; set; }
 
         public string TargetPath;
 
@@ -30,7 +31,7 @@ public Arguments()
         public string ShowVariable;
 
         public OutputType Output;
-        
+
         public string Proj;
         public string ProjArgs;
         public string Exec;

src/GitVersionExe/SpecifiedArgumentRunner.cs

@@ -1,16 +1,16 @@
 namespace GitVersion
 {
+    using GitTools;
+    using GitVersion.Helpers;
     using System;
     using System.Collections.Generic;
     using System.Linq;
-    using GitTools;
-    using GitVersion.Helpers;
     using WarningException = System.ComponentModel.WarningException;
 
     class SpecifiedArgumentRunner
     {
         private static readonly bool runningOnMono = Type.GetType("Mono.Runtime") != null;
-        public static readonly string BuildTool = runningOnMono? "xbuild" : @"c:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe";
+        public static readonly string BuildTool = runningOnMono ? "xbuild" : @"c:\Windows\Microsoft.NET\Framework\v4.0.30319\msbuild.exe";
 
         public static void Run(Arguments arguments, IFileSystem fileSystem)
         {
@@ -23,7 +23,7 @@ public static void Run(Arguments arguments, IFileSystem fileSystem)
             var dynamicRepositoryLocation = arguments.DynamicRepositoryLocation;
             var targetBranch = arguments.TargetBranch;
             var commitId = arguments.CommitId;
-            var overrideConfig = arguments.OverrideConfig;
+            var overrideConfig = arguments.HasOverrideConfig ? arguments.OverrideConfig : null;
 
             var executeCore = new ExecuteCore(fileSystem);
             var variables = executeCore.ExecuteGitVersion(targetUrl, dynamicRepositoryLocation, authentication, targetBranch, noFetch, targetPath, commitId, overrideConfig: overrideConfig);