Merge pull request #4197 from rose-a/fix-4196

Fix syntax error in generated GitVersionInformation class when using project namespace

Author: arturcic

src/GitVersion.Output.Tests/Output/Approved/cs/GitVersionInfoGeneratorTests.ShouldProperlyOutputNamespaceDeclaration.approved.txt

@@ -0,0 +1,59 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     GitVersion
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+#if NET20 || NET35 || NETCOREAPP1_0 || NETCOREAPP1_1 || NETSTANDARD1_0 || NETSTANDARD1_1 || NETSTANDARD1_2 || NETSTANDARD1_3 || NETSTANDARD1_4 || NETSTANDARD1_5 || NETSTANDARD1_6
+namespace System.Diagnostics.CodeAnalysis
+{
+    [global::System.AttributeUsage(
+        global::System.AttributeTargets.Assembly |
+        global::System.AttributeTargets.Class |
+        global::System.AttributeTargets.Struct |
+        global::System.AttributeTargets.Constructor |
+        global::System.AttributeTargets.Method |
+        global::System.AttributeTargets.Property |
+        global::System.AttributeTargets.Event,
+        Inherited = false, AllowMultiple = false)]
+    internal sealed class ExcludeFromCodeCoverageAttribute : global::System.Attribute { }
+}
+#endif
+
+namespace My.Custom.Namespace
+{
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage]
+    static class GitVersionInformation
+    {
+        public const string AssemblySemFileVer = "1.2.3.0";
+        public const string AssemblySemVer = "1.2.3.0";
+        public const string BranchName = "feature1";
+        public const string BuildMetaData = "5";
+        public const string CommitDate = "2014-03-06";
+        public const string CommitsSinceVersionSource = "5";
+        public const string EscapedBranchName = "feature1";
+        public const string FullBuildMetaData = "5.Branch.feature1.Sha.commitSha";
+        public const string FullSemVer = "1.2.3-unstable.4+5";
+        public const string InformationalVersion = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha";
+        public const string Major = "1";
+        public const string MajorMinorPatch = "1.2.3";
+        public const string Minor = "2";
+        public const string Patch = "3";
+        public const string PreReleaseLabel = "unstable";
+        public const string PreReleaseLabelWithDash = "-unstable";
+        public const string PreReleaseNumber = "4";
+        public const string PreReleaseTag = "unstable.4";
+        public const string PreReleaseTagWithDash = "-unstable.4";
+        public const string SemVer = "1.2.3-unstable.4";
+        public const string Sha = "commitSha";
+        public const string ShortSha = "commitShortSha";
+        public const string UncommittedChanges = "0";
+        public const string VersionSourceSha = "versionSourceSha";
+        public const string WeightedPreReleaseNumber = "4";
+    }
+}

src/GitVersion.Output.Tests/Output/GitVersionInfoGeneratorTests.cs

@@ -49,4 +49,44 @@ public void ShouldCreateFile(string fileExtension)
 
         DirectoryHelper.DeleteDirectory(directory);
     }
+
+    /// <summary>
+    /// Regression test for issue #4196 (https://github.com/GitTools/GitVersion/issues/4196)
+    /// </summary>
+    [TestCase]
+    public void ShouldProperlyOutputNamespaceDeclaration()
+    {
+        const string fileExtension = "cs";
+        const string targetNamespace = "My.Custom.Namespace";
+
+        var directory = PathHelper.Combine(PathHelper.GetTempPath(), "GitVersionInfoGeneratorTests", Guid.NewGuid().ToString());
+        if (!Directory.Exists(directory))
+            Directory.CreateDirectory(directory);
+        var fileName = "GitVersionInformation.g." + fileExtension;
+        var fullPath = PathHelper.Combine(directory, fileName);
+
+        var semanticVersion = new SemanticVersion
+        {
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "unstable4",
+            BuildMetaData = new("versionSourceSha", 5,
+                "feature1", "commitSha", "commitShortSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"), 0)
+        };
+
+        var sp = ConfigureServices();
+
+        var fileSystem = sp.GetRequiredService<IFileSystem>();
+        var variableProvider = sp.GetRequiredService<IVariableProvider>();
+
+        var variables = variableProvider.GetVariablesFor(semanticVersion, EmptyConfigurationBuilder.New.Build(), 0);
+        using var generator = sp.GetRequiredService<IGitVersionInfoGenerator>();
+
+        generator.Execute(variables, new(directory, fileName, fileExtension, targetNamespace));
+
+        fileSystem.ReadAllText(fullPath).ShouldMatchApproved(c => c.SubFolder(PathHelper.Combine("Approved", fileExtension)));
+
+        DirectoryHelper.DeleteDirectory(directory);
+    }
 }

src/GitVersion.Output/GitVersionInfo/GitVersionInfoGenerator.cs

@@ -61,7 +61,7 @@ public void Execute(GitVersionVariables variables, GitVersionInfoContext context
         string getTargetNamespace(string extension) => extension switch
         {
             ".vb" => context.TargetNamespace ?? "Global",
-            ".cs" => context.TargetNamespace != null ? $"{PathHelper.NewLine}namespace {context.TargetNamespace};" : "",
+            ".cs" => context.TargetNamespace != null ? $"{PathHelper.NewLine}namespace {context.TargetNamespace}" : "",
             ".fs" => context.TargetNamespace ?? "global",
             _ => targetNamespaceSentinelValue,
         };