added GitVersionOptions similar to Arguments

Author: arturcic

src/GitVersionCore.Tests/Core/DynamicRepositoryTests.cs

@@ -69,7 +69,7 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
                     TargetBranch = targetBranch,
                     CommitId = commitId,
                 },
-                NoFetch = false,
+                Settings = { NoFetch = false },
                 WorkingDirectory = workingDirectory,
             };
             var options = Options.Create(gitVersionOptions);

src/GitVersionCore.Tests/Core/GitVersionExecutorTests.cs

@@ -366,7 +366,7 @@ public void NoCacheBypassesCache()
             versionVariables = gitVersionCalculator.CalculateVersionVariables();
             versionVariables.AssemblySemVer.ShouldBe("4.10.3.0");
 
-            gitVersionOptions.NoCache = true;
+            gitVersionOptions.Settings.NoCache = true;
             versionVariables = gitVersionCalculator.CalculateVersionVariables();
             versionVariables.AssemblySemVer.ShouldBe("0.1.0.0");
         }

src/GitVersionCore.Tests/Core/GitVersionToolDirectoryTests.cs

@@ -35,7 +35,7 @@ public void FindsGitDirectory()
         {
             try
             {
-                var options = Options.Create(new GitVersionOptions { WorkingDirectory = workDirectory, NoFetch = true });
+                var options = Options.Create(new GitVersionOptions { WorkingDirectory = workDirectory, Settings = { NoFetch = true } });
 
                 var sp = ConfigureServices(services =>
                 {
@@ -63,7 +63,7 @@ public void FindsGitDirectoryInParent()
 
             try
             {
-                var options = Options.Create(new GitVersionOptions { WorkingDirectory = childDir, NoFetch = true });
+                var options = Options.Create(new GitVersionOptions { WorkingDirectory = childDir, Settings = { NoFetch = true } });
 
                 var sp = ConfigureServices(services =>
                 {

src/GitVersionCore.Tests/Extensions/GitToolsTestingExtensions.cs

@@ -35,7 +35,7 @@ public static VersionVariables GetVersion(this RepositoryFixtureBase fixture, Co
                     TargetBranch = branch,
                     CommitId = commitId,
                 },
-                OnlyTrackedBranches = onlyTrackedBranches
+                Settings = { OnlyTrackedBranches = onlyTrackedBranches }
             });
 
             var sp = ConfigureServices(services =>

src/GitVersionCore/Core/GitPreparer.cs

@@ -32,7 +32,7 @@ public void Prepare()
             var buildServer = buildServerResolver.Resolve();
 
             // Normalize if we are running on build server
-            var normalizeGitDirectory = !gitVersionOptions.NoNormalize && buildServer != null;
+            var normalizeGitDirectory = !gitVersionOptions.Settings.NoNormalize && buildServer != null;
             var shouldCleanUpRemotes = buildServer != null && buildServer.ShouldCleanUpRemotes();
 
             var currentBranch = ResolveCurrentBranch(buildServer, gitVersionOptions.RepositoryInfo.TargetBranch, !string.IsNullOrWhiteSpace(gitVersionOptions.RepositoryInfo.DynamicRepositoryClonePath));
@@ -178,7 +178,7 @@ private void NormalizeGitDirectory(AuthenticationInfo auth, string targetBranch,
             using (log.IndentLog($"Normalizing git directory for branch '{targetBranch}'"))
             {
                 // Normalize (download branches) before using the branch
-                GitRepositoryHelper.NormalizeGitDirectory(log, environment, gitDirectory, auth, options.Value.NoFetch, targetBranch, isDynamicRepository);
+                GitRepositoryHelper.NormalizeGitDirectory(log, environment, gitDirectory, auth, options.Value.Settings.NoFetch, targetBranch, isDynamicRepository);
             }
         }
 

src/GitVersionCore/Core/GitVersionContextFactory.cs

@@ -25,7 +25,7 @@ public GitVersionContextFactory(IConfigProvider configProvider, IRepositoryMetad
         public GitVersionContext Create(GitVersionOptions gitVersionOptions)
         {
             var targetBranch = repositoryMetadataProvider.GetTargetBranch(gitVersionOptions.RepositoryInfo.TargetBranch);
-            return Init(targetBranch, gitVersionOptions.RepositoryInfo.CommitId, gitVersionOptions.OnlyTrackedBranches);
+            return Init(targetBranch, gitVersionOptions.RepositoryInfo.CommitId, gitVersionOptions.Settings.OnlyTrackedBranches);
         }
 
         private GitVersionContext Init(Branch currentBranch, string commitId = null, bool onlyTrackedBranches = false)

src/GitVersionCore/Core/GitVersionTool.cs

@@ -56,14 +56,14 @@ public VersionVariables CalculateVersionVariables()
             var gitVersionOptions = options.Value;
 
             var cacheKey = cacheKeyFactory.Create(gitVersionOptions.ConfigInfo.OverrideConfig);
-            var versionVariables = gitVersionOptions.NoCache ? default : gitVersionCache.LoadVersionVariablesFromDiskCache(cacheKey);
+            var versionVariables = gitVersionOptions.Settings.NoCache ? default : gitVersionCache.LoadVersionVariablesFromDiskCache(cacheKey);
 
             if (versionVariables != null) return versionVariables;
 
             var semanticVersion = nextVersionCalculator.FindVersion();
             versionVariables = variableProvider.GetVariablesFor(semanticVersion, context.Configuration, context.IsCurrentCommitTagged);
 
-            if (gitVersionOptions.NoCache) return versionVariables;
+            if (gitVersionOptions.Settings.NoCache) return versionVariables;
             try
             {
                 gitVersionCache.WriteVariablesToDiskCache(cacheKey, versionVariables);

src/GitVersionCore/Model/GitVersionOptions.cs

@@ -20,6 +20,7 @@ public GitVersionOptions()
             ConfigInfo = new ConfigInfo();
             WixInfo = new WixInfo();
             RepositoryInfo = new RepositoryInfo();
+            Settings = new Settings();
         }
 
         private string workingDirectory;
@@ -37,17 +38,13 @@ public string WorkingDirectory
         public ConfigInfo ConfigInfo { get; }
         public RepositoryInfo RepositoryInfo { get; }
         public WixInfo WixInfo { get; }
+        public Settings Settings { get; }
 
         public bool Init;
         public bool Diag;
         public bool IsVersion;
         public bool IsHelp;
 
-        public bool NoFetch;
-        public bool NoCache;
-        public bool NoNormalize;
-        public bool OnlyTrackedBranches = false;
-
         public string LogFilePath;
         public string ShowVariable;
         public ISet<OutputType> Output = new HashSet<OutputType>();

src/GitVersionCore/Model/Settings.cs

@@ -0,0 +1,10 @@
+namespace GitVersion
+{
+    public class Settings
+    {
+        public bool NoFetch;
+        public bool NoCache;
+        public bool NoNormalize;
+        public bool OnlyTrackedBranches = false;
+    }
+}

src/GitVersionExe/Arguments.cs

@@ -85,6 +85,13 @@ public GitVersionOptions ToOptions()
                     DynamicRepositoryClonePath = DynamicRepositoryClonePath,
                 },
 
+                Settings =
+                {
+                    NoFetch = NoFetch,
+                    NoCache = NoCache,
+                    NoNormalize = NoNormalize,
+                },
+
                 WixInfo =
                 {
                     ShouldUpdate = UpdateWixVersionFile,
@@ -95,10 +102,6 @@ public GitVersionOptions ToOptions()
                 IsVersion = IsVersion,
                 IsHelp = IsHelp,
 
-                NoFetch = NoFetch,
-                NoCache = NoCache,
-                NoNormalize = NoNormalize,
-
                 LogFilePath = LogFilePath,
                 ShowVariable = ShowVariable,
                 Verbosity = Verbosity,