Merge pull request #563 from onovotny/nuget3

Enable GitVersionTask to work with NuGet v3

Author: JakeGinnivan

src/GitVersionTask/GitVersionTask.csproj

@@ -115,7 +115,8 @@
     <Copy SourceFiles="@(x86)" DestinationFolder="$(BuildDir)NuGetTaskBuild\NativeBinaries\x86" />
     <Copy SourceFiles="$(TargetDir)ILMergeTemp\GitVersionTask.dll" DestinationFolder="$(BuildDir)NuGetTaskBuild" />
     <Copy SourceFiles="$(TargetDir)ILMergeTemp\GitVersionTask.pdb" DestinationFolder="$(BuildDir)NuGetTaskBuild" />
-    <Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersionTask.targets" DestinationFolder="$(BuildDir)NuGetTaskBuild\Build" />
+    <Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersionTask.targets" DestinationFolder="$(BuildDir)NuGetTaskBuild\Build\portable-net+sl+win+wpa+wp" />
+    <Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersionTask.targets" DestinationFolder="$(BuildDir)NuGetTaskBuild\Build\dotnet" />
     <Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersionTask.nuspec" DestinationFolder="$(BuildDir)NuGetTaskBuild" />
     <PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(BuildDir)NuGetTaskBuild" MetadataAssembly="$(ILMergeTemp)GitVersionTask.dll" Version="$(GitVersion_NuGetVersion)" />
     <Delete Files="@(TempFiles)" />

src/GitVersionTask/NugetAssets/GitVersionTask.targets

@@ -8,13 +8,13 @@
 
   <UsingTask
       TaskName="GitVersionTask.UpdateAssemblyInfo"
-      AssemblyFile="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
+      AssemblyFile="$(MSBuildThisFileDirectory)..\..\GitVersionTask.dll" />
   <UsingTask 
     TaskName="GitVersionTask.GetVersion" 
-    AssemblyFile="$(MSBuildThisFileDirectory)..\GitVersionTask.dll"  />
+    AssemblyFile="$(MSBuildThisFileDirectory)..\..\GitVersionTask.dll"  />
   <UsingTask
       TaskName="GitVersionTask.WriteVersionInfoToBuildLog"
-      AssemblyFile="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
+      AssemblyFile="$(MSBuildThisFileDirectory)..\..\GitVersionTask.dll" />
 
   <Target Name="UpdateAssemblyInfo"
           BeforeTargets="CoreCompile">
@@ -61,9 +61,15 @@
 
   <!--Support for ncrunch-->
   <ItemGroup>
-    <None Include="$(MSBuildThisFileDirectory)..\GitVersionTask.dll" />
-    <None Include="$(MSBuildThisFileDirectory)..\GitVersionTask.pdb" />
-    <None Include="$(MSBuildThisFileDirectory)..\NativeBinaries\**\*" />
+    <None Include="$(MSBuildThisFileDirectory)..\..\GitVersionTask.dll">
+      <Visible>False</Visible>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)..\..\GitVersionTask.pdb">
+      <Visible>False</Visible>
+    </None>
+    <None Include="$(MSBuildThisFileDirectory)..\..\NativeBinaries\**\*">
+      <Visible>False</Visible>
+    </None>
   </ItemGroup>
 
 </Project>