removed the deprecated code

Author: arturcic

src/GitVersionExe.Tests/ArgumentParserTests.cs

@@ -74,66 +74,6 @@ public void VersionSwitchTest()
             arguments.IsVersion.ShouldBe(true);
         }
 
-        [Test]
-        public void Exec()
-        {
-            var arguments = argumentParser.ParseArguments("-exec rake");
-#pragma warning disable CS0612 // Type or member is obsolete
-            arguments.Exec.ShouldBe("rake");
-#pragma warning restore CS0612 // Type or member is obsolete
-        }
-
-        [Test]
-        public void ExecWithArgs()
-        {
-            var arguments = argumentParser.ParseArguments(new[]
-            {
-                "-exec",
-                "rake",
-                "-execargs",
-                "clean build"
-            });
-#pragma warning disable CS0612 // Type or member is obsolete
-            arguments.Exec.ShouldBe("rake");
-            arguments.ExecArgs.ShouldBe("clean build");
-#pragma warning restore CS0612 // Type or member is obsolete
-        }
-
-        [Test]
-        public void Msbuild()
-        {
-            var arguments = argumentParser.ParseArguments("-proj msbuild.proj");
-#pragma warning disable CS0612 // Type or member is obsolete
-            arguments.Proj.ShouldBe("msbuild.proj");
-#pragma warning restore CS0612 // Type or member is obsolete
-        }
-
-        [Test]
-        public void MsbuildWithArgs()
-        {
-            var arguments = argumentParser.ParseArguments(new[]
-            {
-                "-proj",
-                "msbuild.proj",
-                "-projargs",
-                "/p:Configuration=Debug /p:Platform=AnyCPU"
-            });
-#pragma warning disable CS0612 // Type or member is obsolete
-            arguments.Proj.ShouldBe("msbuild.proj");
-            arguments.ProjArgs.ShouldBe("/p:Configuration=Debug /p:Platform=AnyCPU");
-#pragma warning restore CS0612 // Type or member is obsolete
-        }
-
-        [Test]
-        public void ExecwithTargetdirectory()
-        {
-            var arguments = argumentParser.ParseArguments("targetDirectoryPath -exec rake");
-            arguments.TargetPath.ShouldBe("targetDirectoryPath");
-#pragma warning disable CS0612 // Type or member is obsolete
-            arguments.Exec.ShouldBe("rake");
-#pragma warning restore CS0612 // Type or member is obsolete
-        }
-
         [Test]
         public void TargetDirectoryAndLogFilePathCanBeParsed()
         {
@@ -286,7 +226,6 @@ public void UnknownArgumentsShouldThrow(string arguments)
         [TestCase("-updateAssemblyInfo true")]
         [TestCase("-updateAssemblyInfo 1")]
         [TestCase("-updateAssemblyInfo")]
-        [TestCase("-updateAssemblyInfo -proj foo.sln")]
         [TestCase("-updateAssemblyInfo assemblyInfo.cs")]
         [TestCase("-updateAssemblyInfo assemblyInfo.cs -ensureassemblyinfo")]
         [TestCase("-updateAssemblyInfo assemblyInfo.cs otherAssemblyInfo.cs")]
@@ -480,7 +419,7 @@ public void DynamicRepoLocation()
         [Test]
         public void CanLogToConsole()
         {
-            var arguments = argumentParser.ParseArguments("-l console -proj foo.sln");
+            var arguments = argumentParser.ParseArguments("-l console");
             arguments.LogFilePath.ShouldBe("console");
         }
 
@@ -522,36 +461,6 @@ public void OtherArgumentsCanBeParsedBeforeNocache()
             arguments.NoCache.ShouldBe(true);
         }
 
-        [Test]
-        public void OtherArgumentsCanBeParsedAfterNofetch()
-        {
-            var arguments = argumentParser.ParseArguments("-nofetch -proj foo.sln");
-            arguments.NoFetch.ShouldBe(true);
-#pragma warning disable CS0612 // Type or member is obsolete
-            arguments.Proj.ShouldBe("foo.sln");
-#pragma warning restore CS0612 // Type or member is obsolete
-        }
-
-        [Test]
-        public void OtherArgumentsCanBeParsedAfterNonormalize()
-        {
-            var arguments = argumentParser.ParseArguments("-nonormalize -proj foo.sln");
-            arguments.NoNormalize.ShouldBe(true);
-#pragma warning disable CS0612 // Type or member is obsolete
-            arguments.Proj.ShouldBe("foo.sln");
-#pragma warning restore CS0612 // Type or member is obsolete
-        }
-
-        [Test]
-        public void OtherArgumentsCanBeParsedAfterNocache()
-        {
-            var arguments = argumentParser.ParseArguments("-nocache -proj foo.sln");
-            arguments.NoCache.ShouldBe(true);
-#pragma warning disable CS0612 // Type or member is obsolete
-            arguments.Proj.ShouldBe("foo.sln");
-#pragma warning restore CS0612 // Type or member is obsolete
-        }
-
         [TestCase("-nofetch -nonormalize -nocache")]
         [TestCase("-nofetch -nocache -nonormalize")]
         [TestCase("-nocache -nofetch -nonormalize")]

src/GitVersionExe.Tests/ExecCmdLineArgumentTest.cs

@@ -13,25 +13,6 @@ namespace GitVersionExe.Tests
     [Parallelizable(ParallelScope.None)]
     public class ExecCmdLineArgumentTest
     {
-        [Test]
-        public void RunExecViaCommandLine()
-        {
-            using var fixture = new EmptyRepositoryFixture();
-            fixture.MakeATaggedCommit("1.2.3");
-            fixture.MakeACommit();
-
-            var buildFile = Path.Combine(fixture.RepositoryPath, "RunExecViaCommandLine.csproj");
-            File.Delete(buildFile);
-
-            File.WriteAllText(buildFile, MsBuildProjectArgTest.TestProject);
-            var exec = "dotnet";
-            var execArgs = "msbuild RunExecViaCommandLine.csproj /target:OutputResults";
-            var result = GitVersionHelper.ExecuteIn(fixture.RepositoryPath, exec, execArgs);
-
-            result.ExitCode.ShouldBe(0, result.Log);
-            result.Log.ShouldContain("GitVersion_FullSemVer: 1.2.4+1");
-        }
-
         [Test]
         public void InvalidArgumentsExitCodeShouldNotBeZero()
         {

src/GitVersionExe.Tests/GitVersionExe.Tests.csproj

@@ -7,9 +7,9 @@
     <Import Project="..\test.props" />
     <ItemGroup>
         <PackageReference Include="Mono.Cecil" Version="0.11.2" />
+        <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="$(PackageVersion_MicrosoftExtensions)" />
     </ItemGroup>
     <ItemGroup>
-        <ProjectReference Include="..\GitVersionCore.Tests\GitVersionCore.Tests.csproj" />
         <ProjectReference Include="..\GitVersionCore\GitVersionCore.csproj" />
         <ProjectReference Include="..\GitVersionExe\GitVersionExe.csproj" />
     </ItemGroup>
@@ -30,6 +30,8 @@
       <Compile Include="..\GitVersionCore.Tests\Helpers\TestFileSystem.cs" Link="Helpers\TestFileSystem.cs" />
       <Compile Include="..\GitVersionCore.Tests\Helpers\TestLogAppender.cs" Link="Helpers\TestLogAppender.cs" />
       <Compile Include="..\GitVersionCore.Tests\Helpers\TestStream.cs" Link="Helpers\TestStream.cs" />
+      <Compile Include="..\GitVersionCore.Tests\Helpers\TestBase.cs" Link="Helpers\TestBase.cs" />
+      <Compile Include="..\GitVersionCore.Tests\Helpers\GitVersionCoreTestModule.cs" Link="Helpers\GitVersionCoreTestModule.cs" />
     </ItemGroup>
 
 </Project>

src/GitVersionExe.Tests/MsBuildProjectArgTest.cs

@@ -207,7 +207,15 @@ private static bool ParseSwitches(Arguments arguments, string name, string[] val
 
             if (ParseRemoteArguments(arguments, name, values, value)) return true;
 
-            if (ParseExecArguments(arguments, name, values, value)) return true;
+            if (name.IsSwitch("diag"))
+            {
+                if (value == null || value.IsTrue())
+                {
+                    arguments.Diag = true;
+                }
+
+                return true;
+            }
 
             if (name.IsSwitch("updateprojectfiles"))
             {
@@ -303,57 +311,6 @@ private static bool ParseConfigArguments(Arguments arguments, string name, strin
             return false;
         }
 
-        private static bool ParseExecArguments(Arguments arguments, string name, string[] values, string value)
-        {
-            if (name.IsSwitch("exec"))
-            {
-                EnsureArgumentValueCount(values);
-#pragma warning disable CS0612 // Type or member is obsolete
-                arguments.Exec = value;
-#pragma warning restore CS0612 // Type or member is obsolete
-                return true;
-            }
-
-            if (name.IsSwitch("execargs"))
-            {
-                EnsureArgumentValueCount(values);
-#pragma warning disable CS0612 // Type or member is obsolete
-                arguments.ExecArgs = value;
-#pragma warning restore CS0612 // Type or member is obsolete
-                return true;
-            }
-
-            if (name.IsSwitch("proj"))
-            {
-                EnsureArgumentValueCount(values);
-#pragma warning disable CS0612 // Type or member is obsolete
-                arguments.Proj = value;
-#pragma warning restore CS0612 // Type or member is obsolete
-                return true;
-            }
-
-            if (name.IsSwitch("projargs"))
-            {
-                EnsureArgumentValueCount(values);
-#pragma warning disable CS0612 // Type or member is obsolete
-                arguments.ProjArgs = value;
-#pragma warning restore CS0612 // Type or member is obsolete
-                return true;
-            }
-
-            if (name.IsSwitch("diag"))
-            {
-                if (value == null || value.IsTrue())
-                {
-                    arguments.Diag = true;
-                }
-
-                return true;
-            }
-
-            return false;
-        }
-
         private static bool ParseRemoteArguments(Arguments arguments, string name, string[] values, string value)
         {
             if (name.IsSwitch("dynamicRepoLocation"))

src/GitVersionExe/ArgumentParser.cs

@@ -1,4 +1,3 @@
-using System;
 using System.Collections.Generic;
 using GitVersion.Logging;
 using GitVersion.Model;
@@ -43,15 +42,6 @@ public class Arguments
         public bool EnsureAssemblyInfo;
         public ISet<string> UpdateAssemblyInfoFileName = new HashSet<string>();
 
-        [Obsolete]
-        public string Proj;
-        [Obsolete]
-        public string ProjArgs;
-        [Obsolete]
-        public string Exec;
-        [Obsolete]
-        public string ExecArgs;
-
         public GitVersionOptions ToOptions()
         {
             var workingDirectory = TargetPath?.TrimEnd('/', '\\');
@@ -111,13 +101,7 @@ public GitVersionOptions ToOptions()
                 ShowVariable = ShowVariable,
                 Verbosity = Verbosity,
                 Output = Output,
-                OutputFile = OutputFile,
-
-                // TODO obsolete to be removed in version 6.0.0
-                Proj = Proj,
-                ProjArgs = ProjArgs,
-                Exec = Exec,
-                ExecArgs = ExecArgs,
+                OutputFile = OutputFile
             };
         }
     }

src/GitVersionExe/Arguments.cs

@@ -12,8 +12,6 @@ public void RegisterTypes(IServiceCollection services)
             services.AddSingleton<IHelpWriter, HelpWriter>();
             services.AddSingleton<IVersionWriter, VersionWriter>();
             services.AddSingleton<IGitVersionExecutor, GitVersionExecutor>();
-
-            services.AddTransient<IExecCommand, ExecCommand>();
         }
     }
 }