Merge remote-tracking branch 'origin/master' into dotnetCore

Author: AArnott

src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs

@@ -590,16 +590,23 @@ public async Task PublicRelease_RegEx_SatisfiedByCheckedOutBranch()
     }
 
     [Theory]
-    [InlineData(false)]
-    [InlineData(true)]
-    public async Task AssemblyInfo(bool isVB)
+    [InlineData(false, false)]
+    [InlineData(true, false)]
+    [InlineData(false, true)]
+    [InlineData(true, true)]
+    public async Task AssemblyInfo(bool isVB, bool includeNonVersionAttributes)
     {
         this.WriteVersionFile();
         if (isVB)
         {
             this.MakeItAVBProject();
         }
 
+        if (includeNonVersionAttributes)
+        {
+            this.testProject.AddProperty("NBGV_EmitNonVersionCustomAttributes", "true");
+        }
+
         var result = await this.BuildAsync("Build", logVerbosity: LoggerVerbosity.Minimal);
         string assemblyPath = result.BuildResult.ProjectStateAfterBuild.GetPropertyValue("TargetPath");
         string versionFileContent = File.ReadAllText(Path.Combine(this.projectDirectory, result.BuildResult.ProjectStateAfterBuild.GetPropertyValue("VersionSourceFile")));
@@ -619,22 +626,32 @@ public async Task AssemblyInfo(bool isVB)
         Assert.Equal(new Version(result.AssemblyVersion), assembly.GetName().Version);
         Assert.Equal(result.AssemblyFileVersion, assemblyFileVersion.Version);
         Assert.Equal(result.AssemblyInformationalVersion, assemblyInformationalVersion.InformationalVersion);
-        Assert.Equal(result.AssemblyTitle, assemblyTitle.Title);
-        Assert.Equal(result.AssemblyProduct, assemblyProduct.Product);
-        Assert.Equal(result.AssemblyCompany, assemblyCompany.Company);
-        Assert.Equal(result.AssemblyCopyright, assemblyCopyright.Copyright);
+        if (includeNonVersionAttributes)
+        {
+            Assert.Equal(result.AssemblyTitle, assemblyTitle.Title);
+            Assert.Equal(result.AssemblyProduct, assemblyProduct.Product);
+            Assert.Equal(result.AssemblyCompany, assemblyCompany.Company);
+            Assert.Equal(result.AssemblyCopyright, assemblyCopyright.Copyright);
+        }
+        else
+        {
+            Assert.Null(assemblyTitle);
+            Assert.Null(assemblyProduct);
+            Assert.Null(assemblyCompany);
+            Assert.Null(assemblyCopyright);
+        }
 
         const BindingFlags fieldFlags = BindingFlags.Static | BindingFlags.NonPublic;
         Assert.Equal(result.AssemblyVersion, thisAssemblyClass.GetField("AssemblyVersion", fieldFlags).GetValue(null));
         Assert.Equal(result.AssemblyFileVersion, thisAssemblyClass.GetField("AssemblyFileVersion", fieldFlags).GetValue(null));
         Assert.Equal(result.AssemblyInformationalVersion, thisAssemblyClass.GetField("AssemblyInformationalVersion", fieldFlags).GetValue(null));
         Assert.Equal(result.AssemblyName, thisAssemblyClass.GetField("AssemblyName", fieldFlags).GetValue(null));
         Assert.Equal(result.RootNamespace, thisAssemblyClass.GetField("RootNamespace", fieldFlags).GetValue(null));
-        Assert.Equal(result.AssemblyTitle, thisAssemblyClass.GetField("AssemblyTitle", fieldFlags).GetValue(null));
-        Assert.Equal(result.AssemblyProduct, thisAssemblyClass.GetField("AssemblyProduct", fieldFlags).GetValue(null));
-        Assert.Equal(result.AssemblyCompany, thisAssemblyClass.GetField("AssemblyCompany", fieldFlags).GetValue(null));
-        Assert.Equal(result.AssemblyCopyright, thisAssemblyClass.GetField("AssemblyCopyright", fieldFlags).GetValue(null));
         Assert.Equal(result.AssemblyConfiguration, thisAssemblyClass.GetField("AssemblyConfiguration", fieldFlags).GetValue(null));
+        Assert.Equal(result.AssemblyTitle, thisAssemblyClass.GetField("AssemblyTitle", fieldFlags)?.GetValue(null));
+        Assert.Equal(result.AssemblyProduct, thisAssemblyClass.GetField("AssemblyProduct", fieldFlags)?.GetValue(null));
+        Assert.Equal(result.AssemblyCompany, thisAssemblyClass.GetField("AssemblyCompany", fieldFlags)?.GetValue(null));
+        Assert.Equal(result.AssemblyCopyright, thisAssemblyClass.GetField("AssemblyCopyright", fieldFlags)?.GetValue(null));
 
         // Verify that it doesn't have key fields
         Assert.Null(thisAssemblyClass.GetField("PublicKey", fieldFlags));

src/Nerdbank.GitVersioning.NuGet/build/Nerdbank.GitVersioning.targets

@@ -45,12 +45,6 @@
     <_NBGV_BuildingRef>$(_NBGV_BuildingTag)</_NBGV_BuildingRef>
     <_NBGV_BuildingRef Condition=" '$(_NBGV_BuildingRef)' == '' ">$(_NBGV_BuildingBranch)</_NBGV_BuildingRef>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(NBGV_DoNotEmitNonVersionCustomAttributes)' != 'true' ">
-    <_NBGV_AssemblyTitle>$(AssemblyTitle)</_NBGV_AssemblyTitle>
-    <_NBGV_AssemblyProduct>$(AssemblyProduct)</_NBGV_AssemblyProduct>
-    <_NBGV_AssemblyCopyright>$(AssemblyCopyright)</_NBGV_AssemblyCopyright>
-    <_NBGV_AssemblyCompany>$(AssemblyCompany)</_NBGV_AssemblyCompany>
-  </PropertyGroup>
 
   <Target Name="GetBuildVersion" Returns="$(BuildVersion)">
     <Nerdbank.GitVersioning.Tasks.GetBuildVersion
@@ -135,11 +129,13 @@
                   AssemblyName="$(AssemblyName)"
                   RootNamespace="$(RootNamespace)"
                   AssemblyOriginatorKeyFile="$(AssemblyOriginatorKeyFile)"
-                  AssemblyTitle="$(_NBGV_AssemblyTitle)"
-                  AssemblyProduct="$(_NBGV_AssemblyProduct)"
-                  AssemblyCopyright="$(_NBGV_AssemblyCopyright)"
-                  AssemblyCompany="$(_NBGV_AssemblyCompany)"
-                  AssemblyConfiguration="$(Configuration)"/>
+                  AssemblyTitle="$(AssemblyTitle)"
+                  AssemblyProduct="$(AssemblyProduct)"
+                  AssemblyCopyright="$(AssemblyCopyright)"
+                  AssemblyCompany="$(AssemblyCompany)"
+                  AssemblyConfiguration="$(Configuration)"
+                  EmitNonVersionCustomAttributes="$(NBGV_EmitNonVersionCustomAttributes)"
+                  />
     <!-- Avoid applying the newly generated AssemblyVersionInfo.cs file to the build 
          unless it has changed in order to allow for incremental building. -->
     <Nerdbank.GitVersioning.Tasks.CompareFiles OriginalItems="$(VersionSourceFile)" NewItems="$(NewVersionSourceFile)">

src/Nerdbank.GitVersioning.Tasks/AssemblyVersionInfo.cs

@@ -46,6 +46,8 @@ the code is regenerated.
         [Required]
         public string OutputFile { get; set; }
 
+        public bool EmitNonVersionCustomAttributes { get; set; }
+
         public string AssemblyName { get; set; }
 
         public string AssemblyVersion { get; set; }
@@ -187,14 +189,17 @@ private IEnumerable<CodeAttributeDeclaration> CreateAssemblyAttributes()
             yield return DeclareAttribute(typeof(AssemblyVersionAttribute), this.AssemblyVersion);
             yield return DeclareAttribute(typeof(AssemblyFileVersionAttribute), this.AssemblyFileVersion);
             yield return DeclareAttribute(typeof(AssemblyInformationalVersionAttribute), this.AssemblyInformationalVersion);
-            if (!string.IsNullOrEmpty(this.AssemblyTitle))
-                yield return DeclareAttribute(typeof(AssemblyTitleAttribute), this.AssemblyTitle);
-            if (!string.IsNullOrEmpty(this.AssemblyProduct))
-                yield return DeclareAttribute(typeof(AssemblyProductAttribute), this.AssemblyProduct);
-            if (!string.IsNullOrEmpty(this.AssemblyCompany))
-                yield return DeclareAttribute(typeof(AssemblyCompanyAttribute), this.AssemblyCompany);
-            if (!string.IsNullOrEmpty(this.AssemblyCopyright))
-                yield return DeclareAttribute(typeof(AssemblyCopyrightAttribute), this.AssemblyCopyright);
+            if (this.EmitNonVersionCustomAttributes)
+            {
+                if (!string.IsNullOrEmpty(this.AssemblyTitle))
+                    yield return DeclareAttribute(typeof(AssemblyTitleAttribute), this.AssemblyTitle);
+                if (!string.IsNullOrEmpty(this.AssemblyProduct))
+                    yield return DeclareAttribute(typeof(AssemblyProductAttribute), this.AssemblyProduct);
+                if (!string.IsNullOrEmpty(this.AssemblyCompany))
+                    yield return DeclareAttribute(typeof(AssemblyCompanyAttribute), this.AssemblyCompany);
+                if (!string.IsNullOrEmpty(this.AssemblyCopyright))
+                    yield return DeclareAttribute(typeof(AssemblyCopyrightAttribute), this.AssemblyCopyright);
+            }
         }
 
         private static IEnumerable<CodeMemberField> CreateFields(IReadOnlyDictionary<string, string> namesAndValues)