Merge pull request #1125 from vitezslav-popovsky-solarwinds/assembly-…

…version-native

Introduce `NBGV_UseAssemblyVersionInNativeVersion` msbuild property

doc/msbuild.md

@@ -49,6 +49,7 @@ Property | Default | Description
 `NBGV_ThisAssemblyNamespace` | (empty) | Sets the namespace to use for the generated `ThisAssembly` class.
 `NBGV_EmitThisAssemblyClass` | `true` | When `false`, suppresses generation of the `ThisAssembly` class.
 `NBGV_ThisAssemblyIncludesPackageVersion` | `false` | When `true`, a `NuGetPackageVersion` property is added to the `ThisAssembly` class.
+`NBGV_UseAssemblyVersionInNativeVersion` | `true` | When `false`, uses the `AssemblyFileVersion` as a native `PRODUCTVERSION`.
 
 ### Custom `ThisAssembly` static fields and constants
 

src/Nerdbank.GitVersioning.Tasks/NativeVersionInfo.cs

@@ -108,6 +108,8 @@ BLOCK NBGV_VERSION_BLOCK
 
         public string TargetFileName { get; set; }
 
+        public bool UseAssemblyVersionInNativeVersion { get; set; } = true;
+
         /// <inheritdoc/>
         public override bool Execute()
         {
@@ -166,7 +168,7 @@ private void CreateDefines()
                 return;
             }
 
-            if (!Version.TryParse(this.AssemblyVersion, out Version productVersion))
+            if (!Version.TryParse(this.AssemblyVersion, out Version productVersion) || !this.UseAssemblyVersionInNativeVersion)
             {
                 productVersion = fileVersion;
             }

src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets

@@ -215,6 +215,7 @@
                   AssemblyLanguage="$(AssemblyLanguage)"
                   AssemblyCodepage="$(AssemblyCodepage)"
                   TargetFileName="$(TargetFileName)"
+                  UseAssemblyVersionInNativeVersion="$(NBGV_UseAssemblyVersionInNativeVersion)"
                   />
     <!-- Avoid applying the newly generated Version.rc file to the build
          unless it has changed in order to allow for incremental building. -->