Adding FSharp support, including unit tests for the associated tasks

Author: kwpatrick

src/NerdBank.GitVersioning.Tests/NerdBank.GitVersioning.Tests.csproj

@@ -20,6 +20,7 @@
     <EmbeddedResource Include="repos\submodules.7z" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\MSBuildExtensionTask\MSBuildExtensionTask.csproj" />
     <ProjectReference Include="..\Nerdbank.GitVersioning.Tasks\Nerdbank.GitVersioning.Tasks.csproj" />
     <ProjectReference Include="..\NerdBank.GitVersioning\NerdBank.GitVersioning.csproj" />
   </ItemGroup>

src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs

@@ -4,7 +4,6 @@
     using System.CodeDom;
     using System.CodeDom.Compiler;
     using System.Collections.Generic;
-    using System.Diagnostics;
     using System.IO;
     using System.Linq;
     using System.Reflection;
@@ -22,7 +21,7 @@ public class AssemblyVersionInfo : Task
         };
 
         private CodeCompileUnit generatedFile;
-#else
+#endif
         private const string FileHeaderComment = @"------------------------------------------------------------------------------
  <auto-generated>
      This code was generated by a tool.
@@ -35,9 +34,7 @@ the code is regenerated.
 ";
 
         private CodeGenerator generator;
-
-#endif
-
+        
         [Required]
         public string CodeLanguage { get; set; }
 
@@ -101,7 +98,17 @@ public override bool Execute()
             }
             else
             {
-                this.Log.LogError("CodeDomProvider not available for language: {0}. No version info will be embedded into assembly.", this.CodeLanguage);
+                // attempt to use local codegen
+                string fileContent = this.BuildCode();
+                if (fileContent != null)
+                {
+                    Directory.CreateDirectory(Path.GetDirectoryName(this.OutputFile));
+                    Utilities.FileOperationWithRetry(() => File.WriteAllText(this.OutputFile, fileContent));
+                }
+                else
+                {
+                    this.Log.LogError("CodeDomProvider not available for language: {0}. No version info will be embedded into assembly.", this.CodeLanguage);
+                }
             }
 
             return !this.Log.HasLoggedErrors;
@@ -205,24 +212,35 @@ private static CodeAttributeDeclaration DeclareAttribute(Type attributeType, par
 #else
 
         public override bool Execute()
+        {
+            string fileContent = this.BuildCode();
+            if (fileContent != null)
+            {
+                Directory.CreateDirectory(Path.GetDirectoryName(this.OutputFile));
+                Utilities.FileOperationWithRetry(() => File.WriteAllText(this.OutputFile, fileContent));
+            }
+            return !this.Log.HasLoggedErrors;
+        }
+
+#endif
+
+        public string BuildCode()
         {
             this.generator = this.CreateGenerator();
             if (this.generator != null)
             {
                 this.generator.AddComment(FileHeaderComment);
                 this.generator.AddBlankLine();
-                this.CreateAssemblyAttributes();
-                this.CreateThisAssemblyClass();
-
-                Directory.CreateDirectory(Path.GetDirectoryName(this.OutputFile));
-                string fileContent = this.generator.GetCode();
-                Utilities.FileOperationWithRetry(() => File.WriteAllText(this.OutputFile, fileContent));
+                this.generator.StartNamespace(this.RootNamespace ?? "AssemblyInfo");
+                this.GenerateAssemblyAttributes();
+                this.GenerateThisAssemblyClass();
+                this.generator.EndNamespace();
+                return this.generator.GetCode();
             }
-
-            return !this.Log.HasLoggedErrors;
+            return null;
         }
 
-        private void CreateAssemblyAttributes()
+        private void GenerateAssemblyAttributes()
         {
             this.generator.DeclareAttribute(typeof(AssemblyVersionAttribute), this.AssemblyVersion);
             this.generator.DeclareAttribute(typeof(AssemblyFileVersionAttribute), this.AssemblyFileVersion);
@@ -240,7 +258,7 @@ private void CreateAssemblyAttributes()
             }
         }
 
-        private void CreateThisAssemblyClass()
+        private void GenerateThisAssemblyClass()
         {
             this.generator.StartThisAssemblyClass();
 
@@ -290,6 +308,8 @@ private CodeGenerator CreateGenerator()
                 case "visualbasic":
                 case "vb":
                     return new VisualBasicCodeGenerator();
+                case "f#":
+                    return new FSharpCodeGenerator();
                 default:
                     this.Log.LogError("Code provider not available for language: {0}. No version info will be embedded into assembly.", this.CodeLanguage);
                     return null;
@@ -315,6 +335,10 @@ internal CodeGenerator()
 
             internal abstract void EndThisAssemblyClass();
 
+            internal virtual void StartNamespace(string ns) { }
+
+            internal virtual void EndNamespace() { }
+
             internal string GetCode() => this.codeBuilder.ToString();
 
             internal void AddBlankLine()
@@ -334,6 +358,39 @@ protected void AddCodeComment(string comment, string token)
             }
         }
 
+        private class FSharpCodeGenerator : CodeGenerator
+        {
+            internal override void AddComment(string comment)
+            {
+                this.AddCodeComment(comment, "//");
+            }
+
+            internal override void AddThisAssemblyMember(string name, string value)
+            {
+                this.codeBuilder.AppendLine($"  static member {name} = \"{value}\"");
+            }
+
+            internal override void StartNamespace(string ns)
+            {
+                this.codeBuilder.AppendLine($"namespace {ns}");
+            }
+
+            internal override void DeclareAttribute(Type type, string arg)
+            {
+                this.codeBuilder.AppendLine($"[<assembly: {type.FullName}(\"{arg}\")>]");
+            }
+
+            internal override void EndThisAssemblyClass()
+            {
+                this.codeBuilder.AppendLine("do()");
+            }
+
+            internal override void StartThisAssemblyClass()
+            {
+                this.codeBuilder.AppendLine("do()\r\ntype ThisAssembly() =");
+            }
+        }
+
         private class CSharpCodeGenerator : CodeGenerator
         {
             internal override void AddComment(string comment)
@@ -389,7 +446,7 @@ internal override void EndThisAssemblyClass()
                 this.codeBuilder.AppendLine("End Class");
             }
         }
-#endif
+//#endif
 
         private static string ToHex(byte[] data)
         {