Added failing tests for #1255, #1844, #2034, #2454, #2693, #2821, #2786

.github/ISSUE_TEMPLATE/documentation.md

@@ -1,6 +1,6 @@
 ---
 name: Documentation
-about: Describe this issue template's purpose here.
+about: Describe the missing/wrong information in the documentation.
 title: "[Docs]"
 labels: documentation
 assignees: ''

.github/ISSUE_TEMPLATE/failing-test.md

@@ -1,6 +1,6 @@
 ---
 name: Failing test
-about: Describe this issue template's purpose here.
+about: Describe the scenario you have as a unit test.
 title: "[Failing test]"
 labels: failing test case
 assignees: ''

.github/ISSUE_TEMPLATE/improvement-request.md

@@ -1,6 +1,6 @@
 ---
 name: Improvement request
-about: Describe this issue template's purpose here.
+about: Describe the change you want to request.
 title: "[Improvement]"
 labels: improvement
 assignees: ''

.github/workflows/stale.yml

@@ -13,7 +13,7 @@ jobs:
   stale:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/stale@v7
+      - uses: actions/stale@v8
         with:
           # set 'stale' label
           stale-issue-label: stale

build/Directory.Packages.props

@@ -1,4 +1,4 @@
-<Project>
+<Project>
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
   </PropertyGroup>
@@ -7,7 +7,7 @@
     <PackageVersion Include="Cake.Codecov" Version="1.0.1" />
     <PackageVersion Include="Cake.Coverlet" Version="3.0.4" />
     <PackageVersion Include="Cake.Frosting" Version="3.0.0" />
-    <PackageVersion Include="Cake.Http" Version="2.0.0" />
+    <PackageVersion Include="Cake.Http" Version="3.0.2" />
     <PackageVersion Include="Cake.Incubator" Version="8.0.0" />
     <PackageVersion Include="Cake.DotNetLocalTools.Module" Version="3.0.12" />
     <PackageVersion Include="Cake.Docker" Version="1.2.0" />

src/Directory.Packages.props

@@ -4,7 +4,7 @@
   </PropertyGroup>
   <ItemGroup>
     <PackageVersion Include="FluentDateTime" Version="2.1.0" />
-    <PackageVersion Include="JsonSchema.Net.Generation" Version="3.0.3" />
+    <PackageVersion Include="JsonSchema.Net.Generation" Version="3.1.0" />
     <PackageVersion Include="LibGit2Sharp" Version="0.27.0-preview-0182" />
     <PackageVersion Include="LibGit2Sharp.NativeBinaries" Version="2.0.315-alpha.0.9" />
     <PackageVersion Include="JetBrains.Annotations" Version="2022.3.1" />

src/GitVersion.App.Tests/ArgumentParserOnBuildServerTests.cs

@@ -34,7 +34,7 @@ private class MockBuildAgent : ICurrentBuildAgent
         public bool IsDefault => false;
         public bool CanApplyToCurrentContext() => throw new NotImplementedException();
 
-        public void WriteIntegration(Action<string> writer, VersionVariables variables, bool updateBuildNumber = true) => throw new NotImplementedException();
+        public void WriteIntegration(Action<string> writer, GitVersionVariables variables, bool updateBuildNumber = true) => throw new NotImplementedException();
 
         public string GetCurrentBranch(bool usingDynamicRepos) => throw new NotImplementedException();
 

src/GitVersion.App.Tests/ArgumentParserTests.cs

@@ -395,7 +395,7 @@ private static IEnumerable<TestCaseData> OverrideconfigWithInvalidOptionTestData
     }
 
     [TestCaseSource(nameof(OverrideConfigWithSingleOptionTestData))]
-    public void OverrideConfigWithSingleOptions(string options, GitVersionConfiguration expected)
+    public void OverrideConfigWithSingleOptions(string options, IGitVersionConfiguration expected)
     {
         var arguments = this.argumentParser.ParseArguments($"/overrideconfig {options}");
 
@@ -534,7 +534,7 @@ private static IEnumerable<TestCaseData> OverrideConfigWithSingleOptionTestData(
     }
 
     [TestCaseSource(nameof(OverrideConfigWithMultipleOptionsTestData))]
-    public void OverrideConfigWithMultipleOptions(string options, GitVersionConfiguration expected)
+    public void OverrideConfigWithMultipleOptions(string options, IGitVersionConfiguration expected)
     {
         var arguments = this.argumentParser.ParseArguments(options);
         ConfigurationHelper configurationHelper = new(arguments.OverrideConfiguration);

src/GitVersion.App.Tests/Helpers/ExecutionResults.cs

@@ -15,15 +15,15 @@ public ExecutionResults(int exitCode, string output, string? logContents)
     public string Output { get; }
     public string? Log { get; }
 
-    public virtual VersionVariables OutputVariables
+    public virtual GitVersionVariables OutputVariables
     {
         get
         {
             var jsonStartIndex = Output.IndexOf("{", StringComparison.Ordinal);
             var jsonEndIndex = Output.IndexOf("}", StringComparison.Ordinal);
             var json = Output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
 
-            return VersionVariables.FromJson(json);
+            return VersionVariablesHelper.FromJson(json);
         }
     }
 }

src/GitVersion.App.Tests/Helpers/ProgramFixture.cs

@@ -80,7 +80,7 @@ public class ProgramFixtureResult
     public string? Output { get; set; }
     public string Log { get; set; }
 
-    public VersionVariables? OutputVariables
+    public GitVersionVariables? OutputVariables
     {
         get
         {
@@ -90,7 +90,7 @@ public VersionVariables? OutputVariables
             var jsonEndIndex = Output.IndexOf("}", StringComparison.Ordinal);
             var json = Output.Substring(jsonStartIndex, jsonEndIndex - jsonStartIndex + 1);
 
-            return VersionVariables.FromJson(json);
+            return VersionVariablesHelper.FromJson(json);
         }
     }
 }

src/GitVersion.App.Tests/JsonOutputOnBuildServerTest.cs

@@ -61,7 +61,7 @@ public void BeingOnBuildServerWithOutputJsonAndOutputFileDoesNotFail(string outp
         var filePath = PathHelper.Combine(fixture.LocalRepositoryFixture.RepositoryPath, fileName);
         var json = File.ReadAllText(filePath);
 
-        var outputVariables = VersionVariables.FromJson(json);
+        var outputVariables = VersionVariablesHelper.FromJson(json);
         outputVariables.ShouldNotBeNull();
         outputVariables.FullSemVer.ShouldBeEquivalentTo(expectedVersion);
     }

src/GitVersion.App.Tests/UpdateWixVersionFileTests.cs

@@ -37,7 +37,7 @@ public void WixVersionFileVarCountTest()
         GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
 
         var gitVersionVarsInWix = GetGitVersionVarsInWixFile(PathHelper.Combine(fixture.RepositoryPath, this.wixVersionFileName));
-        var gitVersionVars = VersionVariables.AvailableVariables;
+        var gitVersionVars = GitVersionVariables.AvailableVariables;
 
         Assert.That(gitVersionVarsInWix, Has.Count.EqualTo(gitVersionVars.Count()));
     }
@@ -55,7 +55,7 @@ public void WixVersionFileContentTest()
         GitVersionHelper.ExecuteIn(fixture.RepositoryPath, arguments: " /updatewixversionfile");
 
         var gitVersionVarsInWix = GetGitVersionVarsInWixFile(PathHelper.Combine(fixture.RepositoryPath, this.wixVersionFileName));
-        var gitVersionVars = VersionVariables.AvailableVariables;
+        var gitVersionVars = GitVersionVariables.AvailableVariables;
 
         foreach (var variable in gitVersionVars)
         {

src/GitVersion.App/ArgumentParser.cs

@@ -6,13 +6,14 @@
 
 namespace GitVersion;
 
-public class ArgumentParser : IArgumentParser
+internal class ArgumentParser : IArgumentParser
 {
     private readonly IEnvironment environment;
     private readonly ICurrentBuildAgent buildAgent;
     private readonly IConsole console;
     private readonly IGlobbingResolver globbingResolver;
     private const string defaultOutputFileName = "GitVersion.json";
+    private static readonly IEnumerable<string> availableVariables = GitVersionVariables.AvailableVariables;
 
     public ArgumentParser(IEnvironment environment, ICurrentBuildAgent buildAgent, IConsole console, IGlobbingResolver globbingResolver)
     {
@@ -382,13 +383,13 @@ private static void ParseShowVariable(Arguments arguments, string? value, string
 
         if (!value.IsNullOrWhiteSpace())
         {
-            versionVariable = VersionVariables.AvailableVariables.SingleOrDefault(av => av.Equals(value.Replace("'", ""), StringComparison.CurrentCultureIgnoreCase));
+            versionVariable = availableVariables.SingleOrDefault(av => av.Equals(value.Replace("'", ""), StringComparison.CurrentCultureIgnoreCase));
         }
 
         if (versionVariable == null)
         {
             var message = $"{name} requires a valid version variable. Available variables are:{System.Environment.NewLine}" +
-                          string.Join(", ", VersionVariables.AvailableVariables.Select(x => string.Concat("'", x, "'")));
+                          string.Join(", ", availableVariables.Select(x => string.Concat("'", x, "'")));
             throw new WarningException(message);
         }
 
@@ -399,14 +400,14 @@ private static void ParseFormat(Arguments arguments, string? value)
     {
         if (value.IsNullOrWhiteSpace())
         {
-            throw new WarningException("Format requires a valid format string. Available variables are: " + string.Join(", ", VersionVariables.AvailableVariables));
+            throw new WarningException("Format requires a valid format string. Available variables are: " + string.Join(", ", availableVariables));
         }
 
-        var foundVariable = VersionVariables.AvailableVariables.Any(variable => value.Contains(variable, StringComparison.CurrentCultureIgnoreCase));
+        var foundVariable = availableVariables.Any(variable => value.Contains(variable, StringComparison.CurrentCultureIgnoreCase));
 
         if (!foundVariable)
         {
-            throw new WarningException("Format requires a valid format string. Available variables are: " + string.Join(", ", VersionVariables.AvailableVariables));
+            throw new WarningException("Format requires a valid format string. Available variables are: " + string.Join(", ", availableVariables));
         }
 
         arguments.Format = value;

src/GitVersion.App/Arguments.cs

@@ -2,7 +2,7 @@
 
 namespace GitVersion;
 
-public class Arguments
+internal class Arguments
 {
     public AuthenticationInfo Authentication = new();
 

src/GitVersion.App/GitVersionAppModule.cs

@@ -2,7 +2,7 @@
 
 namespace GitVersion;
 
-public class GitVersionAppModule : IGitVersionModule
+internal class GitVersionAppModule : IGitVersionModule
 {
     public void RegisterTypes(IServiceCollection services)
     {

src/GitVersion.App/GitVersionExecutor.cs

@@ -4,7 +4,7 @@
 
 namespace GitVersion;
 
-public class GitVersionExecutor : IGitVersionExecutor
+internal class GitVersionExecutor : IGitVersionExecutor
 {
     private readonly ILog log;
     private readonly IConsole console;

src/GitVersion.App/GlobbingResolver.cs

@@ -3,7 +3,7 @@
 
 namespace GitVersion;
 
-public class GlobbingResolver : IGlobbingResolver
+internal class GlobbingResolver : IGlobbingResolver
 {
     private readonly Matcher matcher = new(StringComparison.OrdinalIgnoreCase);
 

src/GitVersion.App/HelpWriter.cs

@@ -3,7 +3,7 @@
 
 namespace GitVersion;
 
-public class HelpWriter : IHelpWriter
+internal class HelpWriter : IHelpWriter
 {
     private readonly IVersionWriter versionWriter;
     private readonly IConsole console;

src/GitVersion.App/IArgumentParser.cs

@@ -1,6 +1,6 @@
 namespace GitVersion;
 
-public interface IArgumentParser
+internal interface IArgumentParser
 {
     Arguments ParseArguments(string commandLineArguments);
     Arguments ParseArguments(string[] commandLineArguments);

src/GitVersion.App/IGitVersionExecutor.cs

@@ -1,6 +1,6 @@
 namespace GitVersion;
 
-public interface IGitVersionExecutor
+internal interface IGitVersionExecutor
 {
     int Execute(GitVersionOptions gitVersionOptions);
 }

src/GitVersion.App/IGlobbingResolver.cs

@@ -1,6 +1,6 @@
 namespace GitVersion;
 
-public interface IGlobbingResolver
+internal interface IGlobbingResolver
 {
     public IEnumerable<string> Resolve(string workingDirectory, string pattern);
 }

src/GitVersion.App/IHelpWriter.cs

@@ -1,6 +1,6 @@
 namespace GitVersion;
 
-public interface IHelpWriter
+internal interface IHelpWriter
 {
     void Write();
     void WriteTo(Action<string> writeAction);

src/GitVersion.App/IVersionWriter.cs

@@ -1,6 +1,6 @@
 namespace GitVersion;
 
-public interface IVersionWriter
+internal interface IVersionWriter
 {
     void Write(Assembly assembly);
     void WriteTo(Assembly assembly, Action<string?> writeAction);

src/GitVersion.App/PublicAPI.Unshipped.txt

@@ -1,69 +1 @@
 #nullable enable
-GitVersion.ArgumentParser
-GitVersion.ArgumentParser.ArgumentParser(GitVersion.IEnvironment! environment, GitVersion.Agents.ICurrentBuildAgent! buildAgent, GitVersion.Logging.IConsole! console, GitVersion.IGlobbingResolver! globbingResolver) -> void
-GitVersion.ArgumentParser.ParseArguments(string! commandLineArguments) -> GitVersion.Arguments!
-GitVersion.ArgumentParser.ParseArguments(string![]! commandLineArguments) -> GitVersion.Arguments!
-GitVersion.Arguments
-GitVersion.Arguments.Arguments() -> void
-GitVersion.Arguments.Authentication -> GitVersion.AuthenticationInfo!
-GitVersion.Arguments.ClonePath -> string?
-GitVersion.Arguments.CommitId -> string?
-GitVersion.Arguments.ConfigurationFile -> string?
-GitVersion.Arguments.Diag -> bool
-GitVersion.Arguments.EnsureAssemblyInfo -> bool
-GitVersion.Arguments.Format -> string?
-GitVersion.Arguments.Init -> bool
-GitVersion.Arguments.IsHelp -> bool
-GitVersion.Arguments.IsVersion -> bool
-GitVersion.Arguments.LogFilePath -> string?
-GitVersion.Arguments.NoCache -> bool
-GitVersion.Arguments.NoFetch -> bool
-GitVersion.Arguments.NoNormalize -> bool
-GitVersion.Arguments.Output -> System.Collections.Generic.ISet<GitVersion.OutputType>!
-GitVersion.Arguments.OutputFile -> string?
-GitVersion.Arguments.OverrideConfiguration -> System.Collections.Generic.IReadOnlyDictionary<object!, object?>!
-GitVersion.Arguments.ShowConfiguration -> bool
-GitVersion.Arguments.ShowVariable -> string?
-GitVersion.Arguments.TargetBranch -> string?
-GitVersion.Arguments.TargetPath -> string?
-GitVersion.Arguments.TargetUrl -> string?
-GitVersion.Arguments.ToOptions() -> GitVersion.GitVersionOptions!
-GitVersion.Arguments.UpdateAssemblyInfo -> bool
-GitVersion.Arguments.UpdateAssemblyInfoFileName -> System.Collections.Generic.ISet<string!>!
-GitVersion.Arguments.UpdateProjectFiles -> bool
-GitVersion.Arguments.UpdateWixVersionFile -> bool
-GitVersion.Arguments.Verbosity -> GitVersion.Logging.Verbosity
-GitVersion.GitVersionAppModule
-GitVersion.GitVersionAppModule.GitVersionAppModule() -> void
-GitVersion.GitVersionAppModule.RegisterTypes(Microsoft.Extensions.DependencyInjection.IServiceCollection! services) -> void
-GitVersion.GitVersionExecutor
-GitVersion.GitVersionExecutor.Execute(GitVersion.GitVersionOptions! gitVersionOptions) -> int
-GitVersion.GitVersionExecutor.GitVersionExecutor(GitVersion.Logging.ILog! log, GitVersion.Logging.IConsole! console, GitVersion.Configuration.IConfigurationFileLocator! configurationFileLocator, GitVersion.Configuration.IConfigurationProvider! configurationProvider, GitVersion.IGitVersionCalculateTool! gitVersionCalculateTool, GitVersion.IGitVersionOutputTool! gitVersionOutputTool, GitVersion.IVersionWriter! versionWriter, GitVersion.IHelpWriter! helpWriter, GitVersion.IGitRepositoryInfo! repositoryInfo) -> void
-GitVersion.GlobbingResolver
-GitVersion.GlobbingResolver.GlobbingResolver() -> void
-GitVersion.GlobbingResolver.Resolve(string! workingDirectory, string! pattern) -> System.Collections.Generic.IEnumerable<string!>!
-GitVersion.HelpWriter
-GitVersion.HelpWriter.HelpWriter(GitVersion.IVersionWriter! versionWriter, GitVersion.Logging.IConsole! console) -> void
-GitVersion.HelpWriter.Write() -> void
-GitVersion.HelpWriter.WriteTo(System.Action<string!>! writeAction) -> void
-GitVersion.IArgumentParser
-GitVersion.IArgumentParser.ParseArguments(string! commandLineArguments) -> GitVersion.Arguments!
-GitVersion.IArgumentParser.ParseArguments(string![]! commandLineArguments) -> GitVersion.Arguments!
-GitVersion.IGitVersionExecutor
-GitVersion.IGitVersionExecutor.Execute(GitVersion.GitVersionOptions! gitVersionOptions) -> int
-GitVersion.IGlobbingResolver
-GitVersion.IGlobbingResolver.Resolve(string! workingDirectory, string! pattern) -> System.Collections.Generic.IEnumerable<string!>!
-GitVersion.IHelpWriter
-GitVersion.IHelpWriter.Write() -> void
-GitVersion.IHelpWriter.WriteTo(System.Action<string!>! writeAction) -> void
-GitVersion.IVersionWriter
-GitVersion.IVersionWriter.Write(System.Reflection.Assembly! assembly) -> void
-GitVersion.IVersionWriter.WriteTo(System.Reflection.Assembly! assembly, System.Action<string?>! writeAction) -> void
-GitVersion.QuotedStringHelpers
-GitVersion.VersionWriter
-GitVersion.VersionWriter.VersionWriter(GitVersion.Logging.IConsole! console) -> void
-GitVersion.VersionWriter.Write(System.Reflection.Assembly! assembly) -> void
-GitVersion.VersionWriter.WriteTo(System.Reflection.Assembly! assembly, System.Action<string?>! writeAction) -> void
-static GitVersion.QuotedStringHelpers.SplitUnquoted(string? input, char splitChar) -> string![]!
-static GitVersion.QuotedStringHelpers.UnquoteText(string! input) -> string!
-virtual GitVersion.GlobbingResolver.GetDirectoryInfoWrapper(string! workingDirectory) -> Microsoft.Extensions.FileSystemGlobbing.Abstractions.DirectoryInfoBase!

src/GitVersion.App/QuotedStringHelpers.cs

@@ -2,7 +2,7 @@
 
 namespace GitVersion;
 
-public static class QuotedStringHelpers
+internal static class QuotedStringHelpers
 {
     /// <summary>
     /// Splits input string based on split-character, ignoring split-character in

src/GitVersion.App/VersionWriter.cs

@@ -3,7 +3,7 @@
 
 namespace GitVersion;
 
-public class VersionWriter : IVersionWriter
+internal class VersionWriter : IVersionWriter
 {
     private readonly IConsole console;