Move output (VersionConverters) to its own module

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());

src/GitVersion.Core/GitVersionCoreModule.cs

@@ -3,7 +3,6 @@
 using GitVersion.Extensions;
 using GitVersion.VersionCalculation;
 using GitVersion.VersionCalculation.Caching;
-using GitVersion.VersionConverters;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;
 
@@ -32,6 +31,5 @@ public void RegisterTypes(IServiceCollection services)
  services.AddModule(new GitVersionCommonModule());
  services.AddModule(new ConfigurationModule());
  services.AddModule(new VersionCalculationModule());
- services.AddModule(new VersionConvertersModule());
  }
 }

src/GitVersion.Core/VersionConverters/IConverterContext.cs → src/GitVersion.Core/Output/IConverterContext.cs

@@ -1,4 +1,4 @@
-namespace GitVersion.VersionConverters;
+namespace GitVersion.Output;
 
 public interface IConverterContext
 {

src/GitVersion.Core/VersionConverters/IVersionConverter.cs → src/GitVersion.Core/Output/IVersionConverter.cs

@@ -1,6 +1,6 @@
 using GitVersion.OutputVariables;
 
-namespace GitVersion.VersionConverters;
+namespace GitVersion.Output;
 
 public interface IVersionConverter<in T> : IDisposable where T : IConverterContext
 {

src/GitVersion.Core/PublicAPI.Unshipped.txt

@@ -389,12 +389,6 @@ GitVersion.GitVersionOptions.Verbosity -> GitVersion.Logging.Verbosity
 GitVersion.GitVersionOptions.WixInfo.get -> GitVersion.WixInfo!
 GitVersion.GitVersionOptions.WorkingDirectory.get -> string!
 GitVersion.GitVersionOptions.WorkingDirectory.set -> void
-GitVersion.GitVersionOutputTool
-GitVersion.GitVersionOutputTool.GenerateGitVersionInformation(GitVersion.OutputVariables.VersionVariables! variables, GitVersion.FileWriteInfo! fileWriteInfo) -> void
-GitVersion.GitVersionOutputTool.GitVersionOutputTool(Microsoft.Extensions.Options.IOptions<GitVersion.GitVersionOptions!>! options, GitVersion.VersionConverters.OutputGenerator.IOutputGenerator! outputGenerator, GitVersion.VersionConverters.WixUpdater.IWixVersionFileUpdater! wixVersionFileUpdater, GitVersion.VersionConverters.GitVersionInfo.IGitVersionInfoGenerator! gitVersionInfoGenerator, GitVersion.VersionConverters.AssemblyInfo.IAssemblyInfoFileUpdater! assemblyInfoFileUpdater, GitVersion.VersionConverters.AssemblyInfo.IProjectFileUpdater! projectFileUpdater) -> void
-GitVersion.GitVersionOutputTool.OutputVariables(GitVersion.OutputVariables.VersionVariables! variables, bool updateBuildNumber) -> void
-GitVersion.GitVersionOutputTool.UpdateAssemblyInfo(GitVersion.OutputVariables.VersionVariables! variables) -> void
-GitVersion.GitVersionOutputTool.UpdateWixVersionFile(GitVersion.OutputVariables.VersionVariables! variables) -> void
 GitVersion.Helpers.EncodingHelper
 GitVersion.Helpers.LambdaEqualityHelper<T>
 GitVersion.Helpers.LambdaEqualityHelper<T>.Equals(T? instance, T? other) -> bool
@@ -601,6 +595,10 @@ GitVersion.MergeMessage.MergedBranch.get -> string!
 GitVersion.MergeMessage.PullRequestNumber.get -> int?
 GitVersion.MergeMessage.TargetBranch.get -> string?
 GitVersion.MergeMessage.Version.get -> GitVersion.SemanticVersion?
+GitVersion.Output.IConverterContext
+GitVersion.Output.IConverterContext.WorkingDirectory.get -> string!
+GitVersion.Output.IVersionConverter<T>
+GitVersion.Output.IVersionConverter<T>.Execute(GitVersion.OutputVariables.VersionVariables! variables, T context) -> void
 GitVersion.OutputType
 GitVersion.OutputType.BuildServer = 0 -> GitVersion.OutputType
 GitVersion.OutputType.File = 2 -> GitVersion.OutputType
@@ -922,62 +920,6 @@ GitVersion.VersionCalculation.VersioningMode
 GitVersion.VersionCalculation.VersioningMode.ContinuousDelivery = 0 -> GitVersion.VersionCalculation.VersioningMode
 GitVersion.VersionCalculation.VersioningMode.ContinuousDeployment = 1 -> GitVersion.VersionCalculation.VersioningMode
 GitVersion.VersionCalculation.VersioningMode.Mainline = 2 -> GitVersion.VersionCalculation.VersioningMode
-GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoContext
-GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoContext.AssemblyInfoContext() -> void
-GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoContext.AssemblyInfoContext(string! workingDirectory, bool ensureAssemblyInfo, params string![]! assemblyInfoFiles) -> void
-GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoContext.AssemblyInfoFiles.get -> string![]!
-GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoContext.EnsureAssemblyInfo.get -> bool
-GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoContext.WorkingDirectory.get -> string!
-GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoFileUpdater
-GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoFileUpdater.AssemblyInfoFileUpdater(GitVersion.Logging.ILog! log, GitVersion.IFileSystem! fileSystem) -> void
-GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoFileUpdater.Dispose() -> void
-GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoFileUpdater.Execute(GitVersion.OutputVariables.VersionVariables! variables, GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoContext context) -> void
-GitVersion.VersionConverters.AssemblyInfo.IAssemblyInfoFileUpdater
-GitVersion.VersionConverters.AssemblyInfo.IProjectFileUpdater
-GitVersion.VersionConverters.AssemblyInfo.IProjectFileUpdater.CanUpdateProjectFile(System.Xml.Linq.XElement! xmlRoot) -> bool
-GitVersion.VersionConverters.AssemblyInfo.ProjectFileUpdater
-GitVersion.VersionConverters.AssemblyInfo.ProjectFileUpdater.CanUpdateProjectFile(System.Xml.Linq.XElement! xmlRoot) -> bool
-GitVersion.VersionConverters.AssemblyInfo.ProjectFileUpdater.Dispose() -> void
-GitVersion.VersionConverters.AssemblyInfo.ProjectFileUpdater.Execute(GitVersion.OutputVariables.VersionVariables! variables, GitVersion.VersionConverters.AssemblyInfo.AssemblyInfoContext context) -> void
-GitVersion.VersionConverters.AssemblyInfo.ProjectFileUpdater.ProjectFileUpdater(GitVersion.Logging.ILog! log, GitVersion.IFileSystem! fileSystem) -> void
-GitVersion.VersionConverters.GitVersionInfo.GitVersionInfoContext
-GitVersion.VersionConverters.GitVersionInfo.GitVersionInfoContext.FileExtension.get -> string!
-GitVersion.VersionConverters.GitVersionInfo.GitVersionInfoContext.FileName.get -> string!
-GitVersion.VersionConverters.GitVersionInfo.GitVersionInfoContext.GitVersionInfoContext() -> void
-GitVersion.VersionConverters.GitVersionInfo.GitVersionInfoContext.GitVersionInfoContext(string! workingDirectory, string! fileName, string! fileExtension) -> void
-GitVersion.VersionConverters.GitVersionInfo.GitVersionInfoContext.WorkingDirectory.get -> string!
-GitVersion.VersionConverters.GitVersionInfo.GitVersionInfoGenerator
-GitVersion.VersionConverters.GitVersionInfo.GitVersionInfoGenerator.Dispose() -> void
-GitVersion.VersionConverters.GitVersionInfo.GitVersionInfoGenerator.Execute(GitVersion.OutputVariables.VersionVariables! variables, GitVersion.VersionConverters.GitVersionInfo.GitVersionInfoContext context) -> void
-GitVersion.VersionConverters.GitVersionInfo.GitVersionInfoGenerator.GitVersionInfoGenerator(GitVersion.IFileSystem! fileSystem) -> void
-GitVersion.VersionConverters.GitVersionInfo.IGitVersionInfoGenerator
-GitVersion.VersionConverters.IConverterContext
-GitVersion.VersionConverters.IConverterContext.WorkingDirectory.get -> string!
-GitVersion.VersionConverters.IVersionConverter<T>
-GitVersion.VersionConverters.IVersionConverter<T>.Execute(GitVersion.OutputVariables.VersionVariables! variables, T context) -> void
-GitVersion.VersionConverters.OutputGenerator.IOutputGenerator
-GitVersion.VersionConverters.OutputGenerator.OutputContext
-GitVersion.VersionConverters.OutputGenerator.OutputContext.OutputContext() -> void
-GitVersion.VersionConverters.OutputGenerator.OutputContext.OutputContext(string! workingDirectory, string? outputFile, bool? updateBuildNumber) -> void
-GitVersion.VersionConverters.OutputGenerator.OutputContext.OutputFile.get -> string?
-GitVersion.VersionConverters.OutputGenerator.OutputContext.UpdateBuildNumber.get -> bool?
-GitVersion.VersionConverters.OutputGenerator.OutputContext.WorkingDirectory.get -> string!
-GitVersion.VersionConverters.OutputGenerator.OutputGenerator
-GitVersion.VersionConverters.OutputGenerator.OutputGenerator.Dispose() -> void
-GitVersion.VersionConverters.OutputGenerator.OutputGenerator.Execute(GitVersion.OutputVariables.VersionVariables! variables, GitVersion.VersionConverters.OutputGenerator.OutputContext context) -> void
-GitVersion.VersionConverters.OutputGenerator.OutputGenerator.OutputGenerator(GitVersion.BuildAgents.ICurrentBuildAgent! buildAgent, GitVersion.Logging.IConsole! console, GitVersion.IFileSystem! fileSystem, Microsoft.Extensions.Options.IOptions<GitVersion.GitVersionOptions!>! options) -> void
-GitVersion.VersionConverters.VersionConvertersModule
-GitVersion.VersionConverters.VersionConvertersModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
-GitVersion.VersionConverters.VersionConvertersModule.VersionConvertersModule() -> void
-GitVersion.VersionConverters.WixUpdater.IWixVersionFileUpdater
-GitVersion.VersionConverters.WixUpdater.WixVersionContext
-GitVersion.VersionConverters.WixUpdater.WixVersionContext.WixVersionContext() -> void
-GitVersion.VersionConverters.WixUpdater.WixVersionContext.WixVersionContext(string! workingDirectory) -> void
-GitVersion.VersionConverters.WixUpdater.WixVersionContext.WorkingDirectory.get -> string!
-GitVersion.VersionConverters.WixUpdater.WixVersionFileUpdater
-GitVersion.VersionConverters.WixUpdater.WixVersionFileUpdater.Dispose() -> void
-GitVersion.VersionConverters.WixUpdater.WixVersionFileUpdater.Execute(GitVersion.OutputVariables.VersionVariables! variables, GitVersion.VersionConverters.WixUpdater.WixVersionContext context) -> void
-GitVersion.VersionConverters.WixUpdater.WixVersionFileUpdater.WixVersionFileUpdater(GitVersion.Logging.ILog! log, GitVersion.IFileSystem! fileSystem) -> void
 GitVersion.VersionField
 GitVersion.VersionField.Major = 3 -> GitVersion.VersionField
 GitVersion.VersionField.Minor = 2 -> GitVersion.VersionField
@@ -1018,7 +960,6 @@ const GitVersion.VersionCalculation.IncrementStrategyFinder.DefaultMinorPattern
 const GitVersion.VersionCalculation.IncrementStrategyFinder.DefaultNoBumpPattern = "\\+semver:\\s?(none|skip)" -> string!
 const GitVersion.VersionCalculation.IncrementStrategyFinder.DefaultPatchPattern = "\\+semver:\\s?(fix|patch)" -> string!
 const GitVersion.VersionCalculation.MergeMessageVersionStrategy.MergeMessageStrategyPrefix = "Merge message" -> string!
-const GitVersion.VersionConverters.WixUpdater.WixVersionFileUpdater.WixVersionFileName = "GitVersion_WixVersion.wxi" -> string!
 override GitVersion.BranchCommit.Equals(object? obj) -> bool
 override GitVersion.BranchCommit.GetHashCode() -> int
 override GitVersion.BuildAgents.LocalBuild.CanApplyToCurrentContext() -> bool

src/GitVersion.MsBuild.Tests/GitVersion.MsBuild.Tests.csproj

@@ -12,6 +12,7 @@
  <ProjectReference Include="..\GitVersion.LibGit2Sharp\GitVersion.LibGit2Sharp.csproj" />
  <ProjectReference Include="..\GitVersion.MsBuild\GitVersion.MsBuild.csproj" />
  <ProjectReference Include="..\GitVersion.Core\GitVersion.Core.csproj" />
+ <ProjectReference Include="..\GitVersion.Output\GitVersion.Output.csproj" />
  </ItemGroup>
  <ItemGroup>
  <Compile Include="..\GitVersion.Core.Tests\Helpers\DirectoryHelper.cs" Link="Helpers\DirectoryHelper.cs" />

src/GitVersion.MsBuild.Tests/Tasks/TestTaskBase.cs

@@ -4,6 +4,7 @@
 using GitVersion.Extensions;
 using GitVersion.Helpers;
 using GitVersion.MsBuild.Tests.Helpers;
+using GitVersion.Output;
 using LibGit2Sharp;
 using Microsoft.Build.Utilities.ProjectCreation;
 
@@ -21,7 +22,7 @@ protected static MsBuildTaskFixtureResult<T> ExecuteMsBuildTask<T>(T task) where
  {
  var fixture = CreateLocalRepositoryFixture();
  task.SolutionDirectory = fixture.RepositoryPath;
- task.WithOverrides(services => services.AddModule(new GitVersionBuildAgentsModule()));
+ AddOverrides(task);
  var msbuildFixture = new MsBuildTaskFixture(fixture);
  var result = msbuildFixture.Execute(task);
  if (result.Success == false) Console.WriteLine(result.Log);
@@ -45,7 +46,7 @@ protected static MsBuildTaskFixtureResult<T> ExecuteMsBuildTaskInAzurePipeline<T
  {
  var fixture = CreateRemoteRepositoryFixture();
  task.SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath;
- task.WithOverrides(services => services.AddModule(new GitVersionBuildAgentsModule()));
+ AddOverrides(task);
  var msbuildFixture = new MsBuildTaskFixture(fixture);
  var environmentVariables = new List<KeyValuePair<string, string?>>(env.ToArray());
  if (buildNumber != null)
@@ -68,7 +69,7 @@ protected static MsBuildTaskFixtureResult<T> ExecuteMsBuildTaskInGitHubActions<T
  {
  var fixture = CreateRemoteRepositoryFixture();
  task.SolutionDirectory = fixture.LocalRepositoryFixture.RepositoryPath;
- task.WithOverrides(services => services.AddModule(new GitVersionBuildAgentsModule()));
+ AddOverrides(task);
  var msbuildFixture = new MsBuildTaskFixture(fixture);
  msbuildFixture.WithEnv(
  new KeyValuePair<string, string?>("GITHUB_ACTIONS", "true"),
@@ -93,6 +94,12 @@ protected static MsBuildExeFixtureResult ExecuteMsBuildExeInAzurePipeline(Action
  if (result.MsBuild.OverallSuccess == false) Console.WriteLine(result.Output);
  return result;
  }
+ private static void AddOverrides(GitVersionTaskBase task) =>
+ task.WithOverrides(services =>
+ {
+ services.AddModule(new GitVersionBuildAgentsModule());
+ services.AddModule(new GitVersionOutputModule());
+ });
 
  private static EmptyRepositoryFixture CreateLocalRepositoryFixture()
  {

src/GitVersion.MsBuild/GitVersion.MsBuild.csproj

@@ -19,6 +19,7 @@
  <ItemGroup>
  <ProjectReference Include="..\GitVersion.BuildAgents\GitVersion.BuildAgents.csproj" PrivateAssets="All" />
  <ProjectReference Include="..\GitVersion.Core\GitVersion.Core.csproj" PrivateAssets="All" />
+ <ProjectReference Include="..\GitVersion.Output\GitVersion.Output.csproj" PrivateAssets="All" />
  </ItemGroup>
 
  <Import Project="nuget-files.props" />