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

Jump to bottom

Rename GenerateAssemblyVersionInfo msbuild target to GenerateAssemblyNBGVVersionInfo #701

Merged
merged 2 commits into from
Dec 14, 2021
Merged

Rename GenerateAssemblyVersionInfo msbuild target to GenerateAssemblyNBGVVersionInfo #701

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5aeb2a8
Avoid name collision in `GenerateAssemblyVersionInfo` MSBuild target
AArnott Dec 14, 2021
6e06b20
Rename msbuild target `GenerateNativeVersionInfo` to `GenerateNativeN…
AArnott Dec 14, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 11 additions & 6 deletions src/NerdBank.GitVersioning.Tests/BuildIntegrationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -897,7 +897,7 @@ public async Task AssemblyInfo_HasKeyData(string keyFile, bool delaySigned)
this.testProject.AddProperty("DelaySign", delaySigned.ToString());

this.WriteVersionFile();
var result = await this.BuildAsync(Targets.GenerateAssemblyVersionInfo, logVerbosity: LoggerVerbosity.Minimal);
var result = await this.BuildAsync(Targets.GenerateAssemblyNBGVVersionInfo, logVerbosity: LoggerVerbosity.Minimal);
string versionCsContent = File.ReadAllText(
Path.GetFullPath(
Path.Combine(
Expand Down Expand Up @@ -951,7 +951,7 @@ public async Task AssemblyInfo_NotProducedWithoutCodeDomProvider()
propertyGroup.AddProperty("Language", "NoCodeDOMProviderForThisLanguage");

this.WriteVersionFile();
var result = await this.BuildAsync(Targets.GenerateAssemblyVersionInfo, logVerbosity: LoggerVerbosity.Minimal, assertSuccessfulBuild: false);
var result = await this.BuildAsync(Targets.GenerateAssemblyNBGVVersionInfo, logVerbosity: LoggerVerbosity.Minimal, assertSuccessfulBuild: false);
Assert.Equal(BuildResultCode.Failure, result.BuildResult.OverallResult);
string versionCsFilePath = Path.Combine(this.projectDirectory, result.BuildResult.ProjectStateAfterBuild.GetPropertyValue("VersionSourceFile"));
Assert.False(File.Exists(versionCsFilePath));
Expand All @@ -968,10 +968,10 @@ public async Task AssemblyInfo_Suppressed()
var propertyGroup = this.testProject.CreatePropertyGroupElement();
this.testProject.AppendChild(propertyGroup);
propertyGroup.AddProperty("Language", "NoCodeDOMProviderForThisLanguage");
propertyGroup.AddProperty(Targets.GenerateAssemblyVersionInfo, "false");
propertyGroup.AddProperty(Properties.GenerateAssemblyVersionInfo, "false");

this.WriteVersionFile();
var result = await this.BuildAsync(Targets.GenerateAssemblyVersionInfo, logVerbosity: LoggerVerbosity.Minimal);
var result = await this.BuildAsync(Targets.GenerateAssemblyNBGVVersionInfo, logVerbosity: LoggerVerbosity.Minimal);
string versionCsFilePath = Path.Combine(this.projectDirectory, result.BuildResult.ProjectStateAfterBuild.GetPropertyValue("VersionSourceFile"));
Assert.False(File.Exists(versionCsFilePath));
Assert.Empty(result.LoggedEvents.OfType<BuildErrorEventArgs>());
Expand All @@ -991,7 +991,7 @@ public async Task AssemblyInfo_SuppressedImplicitlyByTargetExt()
propertyGroup.AddProperty("TargetExt", ".notdll");

this.WriteVersionFile();
var result = await this.BuildAsync(Targets.GenerateAssemblyVersionInfo, logVerbosity: LoggerVerbosity.Minimal);
var result = await this.BuildAsync(Targets.GenerateAssemblyNBGVVersionInfo, logVerbosity: LoggerVerbosity.Minimal);
string versionCsFilePath = Path.Combine(this.projectDirectory, result.BuildResult.ProjectStateAfterBuild.GetPropertyValue("VersionSourceFile"));
Assert.False(File.Exists(versionCsFilePath));
Assert.Empty(result.LoggedEvents.OfType<BuildErrorEventArgs>());
Expand Down Expand Up @@ -1263,8 +1263,13 @@ private static class Targets
internal const string Build = "Build";
internal const string GetBuildVersion = "GetBuildVersion";
internal const string GetNuGetPackageVersion = "GetNuGetPackageVersion";
internal const string GenerateAssemblyNBGVVersionInfo = "GenerateAssemblyNBGVVersionInfo";
internal const string GenerateNativeNBGVVersionInfo = "GenerateNativeNBGVVersionInfo";
}

private static class Properties
{
internal const string GenerateAssemblyVersionInfo = "GenerateAssemblyVersionInfo";
internal const string GenerateNativeVersionInfo = "GenerateNativeVersionInfo";
}

private class BuildResults
Expand Down
12 changes: 6 additions & 6 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 @@ -42,17 +42,17 @@

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

<PrepareResourcesDependsOn>
GenerateAssemblyVersionInfo;
GenerateAssemblyNBGVVersionInfo;
$(PrepareResourcesDependsOn)
</PrepareResourcesDependsOn>

<CoreCompileDependsOn>
GenerateAssemblyVersionInfo;
GenerateAssemblyNBGVVersionInfo;
$(CoreCompileDependsOn)
</CoreCompileDependsOn>

Expand Down Expand Up @@ -112,7 +112,7 @@

<Target Name="GetNuGetPackageVersion" DependsOnTargets="GetBuildVersion" Returns="$(NuGetPackageVersion)" />

<Target Name="GenerateAssemblyVersionInfo" DependsOnTargets="GetBuildVersion" Condition=" '$(GenerateAssemblyVersionInfo)' != 'false' ">
<Target Name="GenerateAssemblyNBGVVersionInfo" DependsOnTargets="GetBuildVersion" Condition=" '$(GenerateAssemblyVersionInfo)' != 'false' ">
<PropertyGroup>
<VersionSourceFile>$([MSBuild]::NormalizePath('$(IntermediateOutputPath)', '$(AssemblyName).Version$(DefaultLanguageSourceExtension)'))</VersionSourceFile>
<NewVersionSourceFile>$(VersionSourceFile).new</NewVersionSourceFile>
Expand Down Expand Up @@ -156,7 +156,7 @@
</ItemGroup>
</Target>

<Target Name="GenerateNativeVersionInfo" DependsOnTargets="GetBuildVersion" Condition=" '$(Language)'=='C++' and '$(GenerateAssemblyVersionInfo)' != 'false' ">
<Target Name="GenerateNativeNBGVVersionInfo" DependsOnTargets="GetBuildVersion" Condition=" '$(Language)'=='C++' and '$(GenerateAssemblyVersionInfo)' != 'false' ">
<PropertyGroup>
<VersionSourceFile>$([MSBuild]::NormalizePath('$(IntermediateOutputPath)', '$(AssemblyName).Version.rc'))</VersionSourceFile>
<NewVersionSourceFile>$(VersionSourceFile).new</NewVersionSourceFile>
Expand Down Expand Up @@ -215,7 +215,7 @@
<Target Name="AddVersionFile"
Condition="'@(RazorGenerate->Count())' != '0'"
BeforeTargets="PrepareForRazorCompile"
DependsOnTargets="GenerateAssemblyVersionInfo">
DependsOnTargets="GenerateAssemblyNBGVVersionInfo">
<ItemGroup>
<RazorCompile Include="$(VersionSourceFile)" />
</ItemGroup>
Expand Down