Merge pull request #3398 from arturcic/main

Move output (VersionConverters) to its own module

Author: arturcic

src/GitVersion.App.Tests/ArgumentParserTests.cs

@@ -393,8 +393,8 @@ public void OverrideConfigWithSingleOptions(string options, GitVersionConfigurat
     {
         var arguments = this.argumentParser.ParseArguments($"/overrideconfig {options}");
 
-        ConfigurationHelper configruationHelper = new(arguments.OverrideConfig);
-        configruationHelper.Configuration.ShouldBeEquivalentTo(expected);
+        ConfigurationHelper configurationHelper = new(arguments.OverrideConfig);
+        configurationHelper.Configuration.ShouldBeEquivalentTo(expected);
     }
 
     private static IEnumerable<TestCaseData> OverrideConfigWithSingleOptionTestData()

src/GitVersion.App.Tests/PullRequestInBuildAgentTest.cs

@@ -1,6 +1,7 @@
 using GitVersion.BuildAgents;
 using GitVersion.Core.Tests.Helpers;
 using GitVersion.Extensions;
+using GitVersion.Output;
 using LibGit2Sharp;
 
 namespace GitVersion.App.Tests;
@@ -167,7 +168,11 @@ private static async Task VerifyPullRequestVersionIsCalculatedProperly(string pu
         }
 
         var programFixture = new ProgramFixture(fixture.RepositoryPath);
-        programFixture.WithOverrides(services => services.AddModule(new GitVersionBuildAgentsModule()));
+        programFixture.WithOverrides(services =>
+        {
+            services.AddModule(new GitVersionBuildAgentsModule());
+            services.AddModule(new GitVersionOutputModule());
+        });
         programFixture.WithEnv(env.ToArray());
 
         var result = await programFixture.Run();

src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs

@@ -1,6 +1,6 @@
 using GitVersion.Helpers;
+using GitVersion.Output.WixUpdater;
 using GitVersion.OutputVariables;
-using GitVersion.VersionConverters.WixUpdater;
 
 namespace GitVersion.App.Tests;
 

src/GitVersion.App/GitVersion.App.csproj

@@ -29,6 +29,7 @@
         <ProjectReference Include="..\GitVersion.BuildAgents\GitVersion.BuildAgents.csproj" />
         <ProjectReference Include="..\GitVersion.LibGit2Sharp\GitVersion.LibGit2Sharp.csproj" />
         <ProjectReference Include="..\GitVersion.Core\GitVersion.Core.csproj" />
+        <ProjectReference Include="..\GitVersion.Output\GitVersion.Output.csproj" />
     </ItemGroup>
 
     <ItemGroup>

src/GitVersion.App/Program.cs

@@ -1,5 +1,6 @@
 using GitVersion.BuildAgents;
 using GitVersion.Extensions;
+using GitVersion.Output;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
@@ -25,6 +26,7 @@ private IHostBuilder CreateHostBuilder(string[] args) =>
                 services.AddModule(new GitVersionCoreModule());
                 services.AddModule(new GitVersionLibGit2SharpModule());
                 services.AddModule(new GitVersionBuildAgentsModule());
+                services.AddModule(new GitVersionOutputModule());
                 services.AddModule(new GitVersionAppModule());
 
                 services.AddSingleton(sp =>

src/GitVersion.Core.Tests/GitVersion.Core.Tests.csproj

@@ -16,6 +16,7 @@
         <ProjectReference Include="..\GitVersion.BuildAgents\GitVersion.BuildAgents.csproj" />
         <ProjectReference Include="..\GitVersion.LibGit2Sharp\GitVersion.LibGit2Sharp.csproj" />
         <ProjectReference Include="..\GitVersion.Core\GitVersion.Core.csproj" />
+        <ProjectReference Include="..\GitVersion.Output\GitVersion.Output.csproj" />
     </ItemGroup>
     <ItemGroup>
         <Content Include="VersionCalculation\Approved\**\*.approved.txt" />

src/GitVersion.Core.Tests/Helpers/GitVersionCoreTestModule.cs

@@ -1,6 +1,7 @@
 using GitVersion.BuildAgents;
 using GitVersion.Extensions;
 using GitVersion.Logging;
+using GitVersion.Output;
 using Microsoft.Extensions.DependencyInjection;
 
 namespace GitVersion.Core.Tests.Helpers;
@@ -11,6 +12,7 @@ public void RegisterTypes(IServiceCollection services)
     {
         services.AddModule(new GitVersionLibGit2SharpModule());
         services.AddModule(new GitVersionBuildAgentsModule());
+        services.AddModule(new GitVersionOutputModule());
         services.AddModule(new GitVersionCoreModule());
 
         services.AddSingleton<IFileSystem, TestFileSystem>();

src/GitVersion.Core/Extensions/CommonExtensions.cs

@@ -5,10 +5,10 @@ namespace GitVersion.Extensions;
 
 public static class CommonExtensions
 {
-    public static T NotNull<T>([NotNull] this T? value, [CallerArgumentExpression("value")] string name = "")
+    public static T NotNull<T>([NotNull] this T? value, [CallerArgumentExpression(nameof(value))] string name = "")
         where T : class => value ?? throw new ArgumentNullException(name);
 
-    public static string NotNullOrEmpty([NotNull] this string? value, [CallerArgumentExpression("value")] string name = "")
+    public static string NotNullOrEmpty([NotNull] this string? value, [CallerArgumentExpression(nameof(value))] string name = "")
     {
         if (string.IsNullOrEmpty(value))
         {
@@ -18,7 +18,7 @@ public static string NotNullOrEmpty([NotNull] this string? value, [CallerArgumen
         return value;
     }
 
-    public static string NotNullOrWhitespace([NotNull] this string? value, [CallerArgumentExpression("value")] string name = "")
+    public static string NotNullOrWhitespace([NotNull] this string? value, [CallerArgumentExpression(nameof(value))] string name = "")
     {
         if (string.IsNullOrWhiteSpace(value))
         {

src/GitVersion.Core/GitVersion.Core.csproj

@@ -21,13 +21,6 @@
         <PackageReference Include="YamlDotNet" />
     </ItemGroup>
 
-    <ItemGroup>
-        <Compile Remove="VersionConverters\*\AddFormats\**\*.*" />
-        <Compile Remove="VersionConverters\*\Templates\**\*.*" />
-        <EmbeddedResource Include="VersionConverters\*\AddFormats\**\*.*" />
-        <EmbeddedResource Include="VersionConverters\*\Templates\**\*.*" />
-    </ItemGroup>
-
     <ItemGroup>
         <InternalsVisibleTo Include="GitVersion.Core.Tests" />
         <InternalsVisibleTo Include="GitVersion.App.Tests" />

src/GitVersion.Core/GitVersionCommonModule.cs

@@ -13,8 +13,6 @@ public void RegisterTypes(IServiceCollection services)
         services.AddSingleton<IEnvironment, Environment>();
         services.AddSingleton<IConsole, ConsoleAdapter>();
 
-        services.AddSingleton<IGitVersionOutputTool, GitVersionOutputTool>();
-
         services.AddSingleton<IBuildAgent, LocalBuild>();
         services.AddSingleton<IBuildAgentResolver, BuildAgentResolver>();
         services.AddSingleton(sp => sp.GetRequiredService<IBuildAgentResolver>().Resolve());