Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Introduce NBGV_UseAssemblyVersionInNativeVersion msbuild property #1125

Merged
merged 1 commit into from
Dec 9, 2024
Merged

Introduce NBGV_UseAssemblyVersionInNativeVersion msbuild property #1125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions doc/msbuild.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 3 additions & 1 deletion src/Nerdbank.GitVersioning.Tasks/NativeVersionInfo.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,6 +108,8 @@ BLOCK NBGV_VERSION_BLOCK

public string TargetFileName { get; set; }

public bool UseAssemblyVersionInNativeVersion { get; set; } = true;

/// <inheritdoc/>
public override bool Execute()
{
Expand Down Expand Up @@ -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;
}
Expand Down
1 change: 1 addition & 0 deletions src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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. -->
Expand Down