Skip to content

Commit 6e06b20

Browse files
committed
Rename msbuild target GenerateNativeVersionInfo to GenerateNativeNBGVVersionInfo
This just keeps things consistent with the rename in the last commit and further avoids a future msbuild target name collision.
1 parent 5aeb2a8 commit 6e06b20

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1264,7 +1264,7 @@ private static class Targets
12641264
internal const string GetBuildVersion = "GetBuildVersion";
12651265
internal const string GetNuGetPackageVersion = "GetNuGetPackageVersion";
12661266
internal const string GenerateAssemblyNBGVVersionInfo = "GenerateAssemblyNBGVVersionInfo";
1267-
internal const string GenerateNativeVersionInfo = "GenerateNativeVersionInfo";
1267+
internal const string GenerateNativeNBGVVersionInfo = "GenerateNativeNBGVVersionInfo";
12681268
}
12691269

12701270
private static class Properties

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242

4343
<!-- Workaround the property stomping that msbuild does (see https://github.com/microsoft/msbuild/pull/4922) with manual imports. -->
4444
<PrepareForBuildDependsOn>
45-
GenerateNativeVersionInfo;
45+
GenerateNativeNBGVVersionInfo;
4646
$(PrepareForBuildDependsOn);
4747
</PrepareForBuildDependsOn>
4848

@@ -156,7 +156,7 @@
156156
</ItemGroup>
157157
</Target>
158158

159-
<Target Name="GenerateNativeVersionInfo" DependsOnTargets="GetBuildVersion" Condition=" '$(Language)'=='C++' and '$(GenerateAssemblyVersionInfo)' != 'false' ">
159+
<Target Name="GenerateNativeNBGVVersionInfo" DependsOnTargets="GetBuildVersion" Condition=" '$(Language)'=='C++' and '$(GenerateAssemblyVersionInfo)' != 'false' ">
160160
<PropertyGroup>
161161
<VersionSourceFile>$([MSBuild]::NormalizePath('$(IntermediateOutputPath)', '$(AssemblyName).Version.rc'))</VersionSourceFile>
162162
<NewVersionSourceFile>$(VersionSourceFile).new</NewVersionSourceFile>

0 commit comments

Comments
 (0)