Skip to content

Enable GitVersionTask to work with NuGet v3 #563

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

Merged
merged 2 commits into from
Aug 12, 2015
Merged

Enable GitVersionTask to work with NuGet v3 #563

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
1e9f090
Put build assets in subdir
Aug 11, 2015
31025ab
add in sl to the build targets pcl dir
Aug 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion src/GitVersionTask/GitVersionTask.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)" />
Expand Down
18 changes: 12 additions & 6 deletions src/GitVersionTask/NugetAssets/GitVersionTask.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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">
Expand Down Expand Up @@ -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>
Expand Down