Merge pull request #710 from sponge-b0b/assemblyinfo-namespace-conflict

JakeGinnivan · JakeGinnivan · commit f5af64d4fff7 · 2015-11-22T10:51:51.000+08:00
Added global:: prefix in AssemblyInfoBuilder to avoid namespace conflicts.
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major.approved.txt
@@ -18,7 +18,7 @@ using System.Reflection;
 namespace Fake
 {
 
-    [System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
     static class GitVersionInformation
     {
         public static string Major = "2";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt
@@ -18,7 +18,7 @@ using System.Reflection;
 namespace Fake
 {
 
-    [System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
     static class GitVersionInformation
     {
         public static string Major = "2";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt
@@ -18,7 +18,7 @@ using System.Reflection;
 namespace Fake
 {
 
-    [System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
     static class GitVersionInformation
     {
         public static string Major = "2";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt
@@ -18,7 +18,7 @@ using System.Reflection;
 namespace Fake
 {
 
-    [System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
     static class GitVersionInformation
     {
         public static string Major = "2";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt
@@ -18,7 +18,7 @@ using System.Reflection;
 namespace Fake
 {
 
-    [System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
     static class GitVersionInformation
     {
         public static string Major = "2";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt
@@ -18,7 +18,7 @@ using System.Reflection;
 namespace Fake
 {
 
-    [System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
     static class GitVersionInformation
     {
         public static string Major = "2";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt
@@ -18,7 +18,7 @@ using System.Reflection;
 namespace Fake
 {
 
-    [System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
     static class GitVersionInformation
     {
         public static string Major = "2";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt
@@ -18,7 +18,7 @@ using System.Reflection;
 namespace Fake
 {
 
-    [System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
     static class GitVersionInformation
     {
         public static string Major = "2";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt
@@ -18,7 +18,7 @@ using System.Reflection;
 namespace Fake
 {
 
-    [System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
     static class GitVersionInformation
     {
         public static string Major = "2";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt
@@ -18,7 +18,7 @@ using System.Reflection;
 namespace Fake
 {
 
-    [System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
     static class GitVersionInformation
     {
         public static string Major = "1";
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt
@@ -0,0 +1,48 @@
+﻿//------------------------------------------------------------------------------
+// <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>
+//------------------------------------------------------------------------------
+
+using System;
+using System.Reflection;
+
+[assembly: AssemblyVersion("1.2.3.0")]
+[assembly: AssemblyFileVersion("1.2.3.0")]
+[assembly: AssemblyInformationalVersion("1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha")]
+
+namespace Fake.System
+{
+
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
+    static class GitVersionInformation
+    {
+        public static string Major = "1";
+        public static string Minor = "2";
+        public static string Patch = "3";
+        public static string PreReleaseTag = "unstable.4";
+        public static string PreReleaseTagWithDash = "-unstable.4";
+        public static string BuildMetaData = "5";
+        public static string BuildMetaDataPadded = "0005";
+        public static string FullBuildMetaData = "5.Branch.feature1.Sha.commitSha";
+        public static string MajorMinorPatch = "1.2.3";
+        public static string SemVer = "1.2.3-unstable.4";
+        public static string LegacySemVer = "1.2.3-unstable4";
+        public static string LegacySemVerPadded = "1.2.3-unstable0004";
+        public static string AssemblySemVer = "1.2.3.0";
+        public static string FullSemVer = "1.2.3-unstable.4+5";
+        public static string InformationalVersion = "1.2.3-unstable.4+5.Branch.feature1.Sha.commitSha";
+        public static string BranchName = "feature1";
+        public static string Sha = "commitSha";
+        public static string NuGetVersionV2 = "1.2.3-unstable0004";
+        public static string NuGetVersion = "1.2.3-unstable0004";
+        public static string CommitsSinceVersionSource = "5";
+        public static string CommitsSinceVersionSourcePadded = "0005";
+        public static string CommitDate = "2014-03-06";
+    }
+
+}
diff --git a/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs b/src/GitVersionTask.Tests/AssemblyInfoBuilderTests.cs
@@ -41,7 +41,7 @@ public void VerifyCreatedCode()
         using (var stream = new MemoryStream())
         {
             var emitResult = compilation.Emit(stream);
-            
+
             Assert.IsTrue(emitResult.Success, string.Join(Environment.NewLine, emitResult.Diagnostics.Select(x => x.Descriptor)));
 
             stream.Seek(0, SeekOrigin.Begin);
@@ -50,6 +50,35 @@ public void VerifyCreatedCode()
         }
     }
 
+    [Test]
+    public void VerifyCreatedCode_NoNamespaceConflict()
+    {
+        var semanticVersion = new SemanticVersion
+        {
+            Major = 1,
+            Minor = 2,
+            Patch = 3,
+            PreReleaseTag = "unstable4",
+            BuildMetaData = new SemanticVersionBuildMetaData(5,
+                "feature1", "commitSha", DateTimeOffset.Parse("2014-03-06 23:59:59Z"))
+        };
+        var assemblyInfoBuilder = new AssemblyInfoBuilder();
+
+        var config = new TestEffectiveConfiguration();
+
+        var versionVariables = VariableProvider.GetVariablesFor(semanticVersion, config, false);
+        var assemblyInfoText = assemblyInfoBuilder.GetAssemblyInfoText(versionVariables, "Fake.System");
+        Approvals.Verify(assemblyInfoText);
+
+        var compilation = CSharpCompilation.Create("Fake.System.dll")
+            .WithOptions(new CSharpCompilationOptions(OutputKind.DynamicallyLinkedLibrary))
+            .AddReferences(MetadataReference.CreateFromFile(typeof(object).Assembly.Location))
+            .AddSyntaxTrees(CSharpSyntaxTree.ParseText(assemblyInfoText));
+
+        var emitResult = compilation.Emit(new MemoryStream());
+        Assert.IsTrue(emitResult.Success, string.Join(Environment.NewLine, emitResult.Diagnostics.Select(x => x.Descriptor)));
+    }
+
     [Test]
     [MethodImpl(MethodImplOptions.NoInlining)]
     public void VerifyAssemblyVersion_Major()
diff --git a/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj b/src/GitVersionTask.Tests/GitVersionTask.Tests.csproj
@@ -143,6 +143,12 @@
     <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor.approved.txt" />
     <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch.approved.txt" />
     <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag.approved.txt" />
+    <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatchTag_NugetAssemblyInfo.approved.txt" />
+    <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinorPatch_NugetAssemblyInfo.approved.txt" />
+    <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfo.approved.txt" />
+    <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_MajorMinor_NugetAssemblyInfoWithMultipleVariables.approved.txt" />
+    <Content Include="AssemblyInfoBuilderTests.VerifyAssemblyVersion_Major_NugetAssemblyInfo.approved.txt" />
+    <Content Include="AssemblyInfoBuilderTests.VerifyCreatedCode_NoNamespaceConflict.approved.txt" />
     <Content Include="AssemblyInfoBuilderTests.VerifyCreatedCode.approved.txt" />
     <Content Include="FodyWeavers.xml" />
   </ItemGroup>
diff --git a/src/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs b/src/GitVersionTask/AssemblyInfoBuilder/AssemblyInfoBuilder.cs
@@ -30,7 +30,7 @@ public string GetAssemblyInfoText(VersionVariables vars, string rootNamespace)
 namespace {4}
 {{
 
-    [System.Runtime.CompilerServices.CompilerGenerated]
+    [global::System.Runtime.CompilerServices.CompilerGenerated]
     static class GitVersionInformation
     {{
 {3}

Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ using System.Reflection;`
`18`	`18`	`namespace Fake`
`19`	`19`	`{`
`20`	`20`
`21`		`- [System.Runtime.CompilerServices.CompilerGenerated]`
	`21`	`+ [global::System.Runtime.CompilerServices.CompilerGenerated]`
`22`	`22`	`static class GitVersionInformation`
`23`	`23`	`{`
`24`	`24`	`public static string Major = "2";`