Adding Properties to generated namespace and making ThisAssembly clas…

…s and members internal
dotnet · Nov 15, 2018 · 1594cb3 · 1594cb3
1 parent 10d0aa1
commit 1594cb3
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/src/NerdBank.GitVersioning.Tests/AssemblyInfoTest.cs b/src/NerdBank.GitVersioning.Tests/AssemblyInfoTest.cs
@@ -18,7 +18,7 @@ public void FSharpGenerator()
             info.AssemblyFileVersion = "1.3";
             info.AssemblyVersion = "1.3.0";
             info.CodeLanguage = "f#";
-
+            
             var built = info.BuildCode();
 
             var expected = @"//------------------------------------------------------------------------------
@@ -31,16 +31,16 @@ public void FSharpGenerator()
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AssemblyInfo
+namespace AssemblyInfo.Properties
 [<assembly: System.Reflection.AssemblyVersionAttribute(""1.3.0"")>]
 [<assembly: System.Reflection.AssemblyFileVersionAttribute(""1.3"")>]
 [<assembly: System.Reflection.AssemblyInformationalVersionAttribute("""")>]
 do()
-type ThisAssembly() =
-  static member AssemblyVersion = ""1.3.0""
-  static member AssemblyFileVersion = ""1.3""
-  static member AssemblyCompany = ""company""
-  static member RootNamespace = """"
+type internal ThisAssembly() =
+  static member internal AssemblyVersion = ""1.3.0""
+  static member internal AssemblyFileVersion = ""1.3""
+  static member internal AssemblyCompany = ""company""
+  static member internal RootNamespace = """"
 do()
 ";
             Assert.Equal(expected, built);

diff --git a/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs b/src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs
@@ -363,12 +363,12 @@ internal override void AddComment(string comment)
 
             internal override void AddThisAssemblyMember(string name, string value)
             {
-                this.codeBuilder.AppendLine($"  static member {name} = \"{value}\"");
+                this.codeBuilder.AppendLine($"  static member internal {name} = \"{value}\"");
             }
 
             internal override void StartNamespace(string ns)
             {
-                this.codeBuilder.AppendLine($"namespace {ns}");
+                this.codeBuilder.AppendLine($"namespace {ns}.Properties");
             }
 
             internal override void DeclareAttribute(Type type, string arg)
@@ -383,7 +383,7 @@ internal override void EndThisAssemblyClass()
 
             internal override void StartThisAssemblyClass()
             {
-                this.codeBuilder.AppendLine("do()\r\ntype ThisAssembly() =");
+                this.codeBuilder.AppendLine("do()\r\ntype internal ThisAssembly() =");
             }
         }