Skip to content

Commit 1ac9af8

Browse files
committed
Get along better with the new VS2017 SDK targets
1 parent 9d499af commit 1ac9af8

File tree

1 file changed

+15
-1
lines changed

1 file changed

+15
-1
lines changed

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

+15-1
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,19 @@
1818
$(VersionDependsOn)
1919
</VersionDependsOn>
2020

21+
<GenerateNuspecDependsOn>
22+
GetNuPkgVersion;
23+
$(GenerateNuspecDependsOn)
24+
</GenerateNuspecDependsOn>
25+
2126
<!-- Suppress assembly version info generation if not obviously compiling an assembly. -->
2227
<GenerateAssemblyVersionInfo Condition=" '$(GenerateAssemblyVersionInfo)' == '' and '$(TargetExt)' != '.dll' and '$(TargetExt)' != '.exe'">false</GenerateAssemblyVersionInfo>
28+
29+
<!-- Suppress version attribute generation in Microsoft.NET.Sdk projects to avoid build failures
30+
when two sets of attributes are emitted. -->
31+
<GenerateAssemblyInformationalVersionAttribute>false</GenerateAssemblyInformationalVersionAttribute>
32+
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
33+
<GenerateAssemblyFileVersionAttribute>false</GenerateAssemblyFileVersionAttribute>
2334
</PropertyGroup>
2435

2536
<UsingTask AssemblyFile="$(NerdbankGitVersioningTasksPath)Nerdbank.GitVersioning.Tasks.dll" TaskName="Nerdbank.GitVersioning.Tasks.AssemblyVersionInfo"/>
@@ -38,7 +49,7 @@
3849
<_NBGV_AssemblyCopyright>$(AssemblyCopyright)</_NBGV_AssemblyCopyright>
3950
<_NBGV_AssemblyCompany>$(AssemblyCompany)</_NBGV_AssemblyCompany>
4051
</PropertyGroup>
41-
52+
4253
<Target Name="GetBuildVersion" Returns="$(BuildVersion)">
4354
<Nerdbank.GitVersioning.Tasks.GetBuildVersion
4455
BuildingRef="$(_NBGV_BuildingRef)"
@@ -49,6 +60,7 @@
4960
<Output TaskParameter="Version" PropertyName="BuildVersion" />
5061
<Output TaskParameter="AssemblyInformationalVersion" PropertyName="AssemblyInformationalVersion" />
5162
<Output TaskParameter="AssemblyFileVersion" PropertyName="AssemblyFileVersion" />
63+
<Output TaskParameter="AssemblyFileVersion" PropertyName="FileVersion" />
5264
<Output TaskParameter="SimpleVersion" PropertyName="BuildVersionSimple" />
5365
<Output TaskParameter="PrereleaseVersion" PropertyName="PrereleaseVersion" />
5466
<Output TaskParameter="MajorMinorVersion" PropertyName="MajorMinorVersion" />
@@ -62,6 +74,8 @@
6274
<Output TaskParameter="CloudBuildNumber" PropertyName="CloudBuildNumber" Condition=" '$(CloudBuildNumber)' == '' "/>
6375
<Output TaskParameter="BuildMetadataFragment" PropertyName="SemVerBuildSuffix" />
6476
<Output TaskParameter="NuGetPackageVersion" PropertyName="NuGetPackageVersion" />
77+
<Output TaskParameter="NuGetPackageVersion" PropertyName="Version" />
78+
<Output TaskParameter="NuGetPackageVersion" PropertyName="PackageVersion" />
6579
<Output TaskParameter="NPMPackageVersion" PropertyName="NPMPackageVersion" />
6680
<Output TaskParameter="CloudBuildVersionVars" ItemName="CloudBuildVersionVars" />
6781
</Nerdbank.GitVersioning.Tasks.GetBuildVersion>

0 commit comments

Comments
 (0)