Set appropriate version of package built from SDK projects

Author: AArnott

src/Nerdbank.GitVersioning.NuGet/Nerdbank.GitVersioning.NuGet.nuproj

@@ -62,6 +62,7 @@
     <Content Include="..\NerdBank.GitVersioning\version.schema.json">
       <Link>tools\version.schema.json</Link>
     </Content>
+    <Content Include="buildCrossTargeting\NerdBank.GitVersioning.targets" />
     <Content Include="build\dotnet\Nerdbank.GitVersioning.targets" />
     <Content Include="build\NerdBank.GitVersioning.targets" />
     <Content Include="build\portable-net+win+wpa+wp+sl+netmf+MonoAndroid+MonoTouch+Xamarin.iOS\Nerdbank.GitVersioning.targets" />

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

@@ -19,7 +19,7 @@
     </VersionDependsOn>
 
     <GenerateNuspecDependsOn>
-      GetNuPkgVersion;
+      GetBuildVersion;
       $(GenerateNuspecDependsOn)
     </GenerateNuspecDependsOn>
 
@@ -171,4 +171,9 @@
       <NuSpecProperties>$(NuSpecProperties);$(NuGetProperties);GitCommitIdShort=$(GitCommitIdShort)</NuSpecProperties>
     </PropertyGroup>
   </Target>
+
+  <!-- Workaround till https://github.com/NuGet/NuGet.Client/issues/1064 is merged and used. -->
+  <Target Name="_NBGV_CalculateNuSpecVersionHelper"
+          BeforeTargets="GenerateNuspec"
+          DependsOnTargets="GetBuildVersion" />
 </Project>

src/Nerdbank.GitVersioning.NuGet/buildCrossTargeting/Nerdbank.GitVersioning.targets

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\build\$(MSBuildThisFileName)$(MSBuildThisFileExtension)" />
+</Project>