Fix .NET SDK project support that now emits more assembly attributes

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,43 @@ 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));
+        if (includeNonVersionAttributes)
+        {
+
+            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));
+        }
+        else
+        {
+            Assert.Null(thisAssemblyClass.GetField("AssemblyTitle", fieldFlags));
+            Assert.Null(thisAssemblyClass.GetField("AssemblyProduct", fieldFlags));
+            Assert.Null(thisAssemblyClass.GetField("AssemblyCompany", fieldFlags));
+            Assert.Null(thisAssemblyClass.GetField("AssemblyCopyright", fieldFlags));
+        }
 
         // Verify that it doesn't have key fields
         Assert.Null(thisAssemblyClass.GetField("PublicKey", fieldFlags));

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

@@ -43,7 +43,7 @@
     <_NBGV_BuildingRef>$(_NBGV_BuildingTag)</_NBGV_BuildingRef>
     <_NBGV_BuildingRef Condition=" '$(_NBGV_BuildingRef)' == '' ">$(_NBGV_BuildingBranch)</_NBGV_BuildingRef>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(NBGV_DoNotEmitNonVersionCustomAttributes)' != 'true' ">
+  <PropertyGroup Condition=" '$(NBGV_EmitNonVersionCustomAttributes)' == 'true' ">
     <_NBGV_AssemblyTitle>$(AssemblyTitle)</_NBGV_AssemblyTitle>
     <_NBGV_AssemblyProduct>$(AssemblyProduct)</_NBGV_AssemblyProduct>
     <_NBGV_AssemblyCopyright>$(AssemblyCopyright)</_NBGV_AssemblyCopyright>