added GitVersionOptions similar to Arguments

GitVersionOptions is used internally
Arguments is used in the Exe and is transformed into GitVersionOptions

Author: arturcic

src/GitVersionCore.Tests/Configuration/ConfigProviderTests.cs

@@ -33,7 +33,7 @@ public class ConfigProviderTests : TestBase
         public void Setup()
         {
             repoPath = DefaultRepoPath;
-            var options = Options.Create(new Arguments { TargetPath = repoPath });
+            var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
             var sp = ConfigureServices(services =>
             {
                 services.AddSingleton(options);
@@ -264,7 +264,7 @@ public void NoWarnOnGitVersionYmlFile()
             var logAppender = new TestLogAppender(Action);
             var log = new Log(logAppender);
 
-            var options = Options.Create(new Arguments { TargetPath = repoPath });
+            var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
             var sp = ConfigureServices(services =>
             {
                 services.AddSingleton(options);

src/GitVersionCore.Tests/Configuration/DefaultConfigFileLocatorTests.cs

@@ -26,7 +26,7 @@ public void Setup()
         {
             repoPath = DefaultRepoPath;
             workingPath = DefaultWorkingPath;
-            var options = Options.Create(new Arguments { TargetPath = repoPath });
+            var options = Options.Create(new GitVersionOptions { WorkingDirectory = repoPath });
 
             var sp = ConfigureServices(services =>
             {

src/GitVersionCore.Tests/Configuration/Init/InitScenarios.cs

@@ -26,7 +26,7 @@ public void Setup()
         public void CanSetNextVersion()
         {
             var workingDirectory = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? "c:\\proj" : "/proj";
-            var options = Options.Create(new Arguments { TargetPath = workingDirectory });
+            var options = Options.Create(new GitVersionOptions { WorkingDirectory = workingDirectory });
 
             var sp = ConfigureServices(services =>
             {

src/GitVersionCore.Tests/Configuration/NamedConfigFileLocatorTests.cs

@@ -21,12 +21,12 @@ public class NamedConfigFileLocatorTests : TestBase
         private string workingPath;
         private IFileSystem fileSystem;
         private IConfigFileLocator configFileLocator;
-        private Arguments arguments;
+        private GitVersionOptions gitVersionOptions;
 
         [SetUp]
         public void Setup()
         {
-            arguments = new Arguments { ConfigFile = "my-config.yaml" };
+            gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigFile = "my-config.yaml" } };
             repoPath = DefaultRepoPath;
             workingPath = DefaultWorkingPath;
 
@@ -36,7 +36,7 @@ public void Setup()
         [Test]
         public void ThrowsExceptionOnAmbiguousConfigFileLocation()
         {
-            var sp = GetServiceProvider(arguments);
+            var sp = GetServiceProvider(gitVersionOptions);
             configFileLocator = sp.GetService<IConfigFileLocator>();
             fileSystem = sp.GetService<IFileSystem>();
 
@@ -54,7 +54,7 @@ public void DoNotThrowWhenWorkingAndRepoPathsAreSame()
         {
             workingPath = DefaultRepoPath;
 
-            var sp = GetServiceProvider(arguments);
+            var sp = GetServiceProvider(gitVersionOptions);
             configFileLocator = sp.GetService<IConfigFileLocator>();
             fileSystem = sp.GetService<IFileSystem>();
 
@@ -68,7 +68,7 @@ public void DoNotThrowWhenWorkingAndRepoPathsAreSame_WithDifferentCasing()
         {
             workingPath = DefaultRepoPath.ToLower();
 
-            var sp = GetServiceProvider(arguments);
+            var sp = GetServiceProvider(gitVersionOptions);
             configFileLocator = sp.GetService<IConfigFileLocator>();
             fileSystem = sp.GetService<IFileSystem>();
 
@@ -82,8 +82,8 @@ public void DoNotThrowWhenConfigFileIsInSubDirectoryOfRepoPath()
         {
             workingPath = DefaultRepoPath;
 
-            arguments = new Arguments { ConfigFile = "./src/my-config.yaml" };
-            var sp = GetServiceProvider(arguments);
+            gitVersionOptions = new GitVersionOptions { ConfigInfo = { ConfigFile = "./src/my-config.yaml" } };
+            var sp = GetServiceProvider(gitVersionOptions);
             configFileLocator = sp.GetService<IConfigFileLocator>();
             fileSystem = sp.GetService<IFileSystem>();
 
@@ -101,7 +101,7 @@ public void NoWarnOnCustomYmlFile()
             var logAppender = new TestLogAppender(Action);
             var log = new Log(logAppender);
 
-            var sp = GetServiceProvider(arguments, log);
+            var sp = GetServiceProvider(gitVersionOptions, log);
             configFileLocator = sp.GetService<IConfigFileLocator>();
             fileSystem = sp.GetService<IFileSystem>();
 
@@ -122,7 +122,7 @@ public void NoWarnOnCustomYmlFileOutsideRepoPath()
             var logAppender = new TestLogAppender(Action);
             var log = new Log(logAppender);
 
-            var sp = GetServiceProvider(arguments, log);
+            var sp = GetServiceProvider(gitVersionOptions, log);
             configFileLocator = sp.GetService<IConfigFileLocator>();
             fileSystem = sp.GetService<IFileSystem>();
 
@@ -137,13 +137,13 @@ public void NoWarnOnCustomYmlFileOutsideRepoPath()
         [Test]
         public void ThrowsExceptionOnCustomYmlFileDoesNotExist()
         {
-            var sp = GetServiceProvider(arguments);
+            var sp = GetServiceProvider(gitVersionOptions);
             configFileLocator = sp.GetService<IConfigFileLocator>();
 
             var exception = Should.Throw<WarningException>(() => { configFileLocator.Verify(workingPath, repoPath); });
 
-            var workingPathFileConfig = Path.Combine(workingPath, arguments.ConfigFile);
-            var repoPathFileConfig = Path.Combine(repoPath, arguments.ConfigFile);
+            var workingPathFileConfig = Path.Combine(workingPath, gitVersionOptions.ConfigInfo.ConfigFile);
+            var repoPathFileConfig = Path.Combine(repoPath, gitVersionOptions.ConfigInfo.ConfigFile);
             var expectedMessage = $"The configuration file was not found at '{workingPathFileConfig}' or '{repoPathFileConfig}'";
             exception.Message.ShouldBe(expectedMessage);
         }
@@ -158,12 +158,12 @@ private string SetupConfigFileContent(string text, string fileName = null, strin
             return filePath;
         }
 
-        private static IServiceProvider GetServiceProvider(Arguments arguments, ILog log = null)
+        private static IServiceProvider GetServiceProvider(GitVersionOptions gitVersionOptions, ILog log = null)
         {
             return ConfigureServices(services =>
             {
                 if (log != null) services.AddSingleton(log);
-                services.AddSingleton(Options.Create(arguments));
+                services.AddSingleton(Options.Create(gitVersionOptions));
             });
         }
     }

src/GitVersionCore.Tests/Core/DynamicRepositoryTests.cs

@@ -60,16 +60,19 @@ public void FindsVersionInDynamicRepo(string name, string url, string targetBran
             var root = Path.Combine(workDirectory, name);
             var dynamicDirectory = Path.Combine(root, "D"); // dynamic, keeping directory as short as possible
             var workingDirectory = Path.Combine(root, "W"); // working, keeping directory as short as possible
-            var arguments = new Arguments
+            var gitVersionOptions = new GitVersionOptions
             {
-                TargetUrl = url,
-                DynamicRepositoryClonePath = dynamicDirectory,
-                TargetBranch = targetBranch,
+                RepositoryInfo =
+                {
+                    TargetUrl = url,
+                    DynamicRepositoryClonePath = dynamicDirectory,
+                    TargetBranch = targetBranch,
+                    CommitId = commitId,
+                },
                 NoFetch = false,
-                TargetPath = workingDirectory,
-                CommitId = commitId
+                WorkingDirectory = workingDirectory,
             };
-            var options = Options.Create(arguments);
+            var options = Options.Create(gitVersionOptions);
 
             Directory.CreateDirectory(dynamicDirectory);
             Directory.CreateDirectory(workingDirectory);