Skip to content

Commit e7536a1

Browse files
author
Oren Novotny
committed
Inject into correct point in build pipeline
1 parent 8650152 commit e7536a1

File tree

3 files changed

+69
-6
lines changed

3 files changed

+69
-6
lines changed

‎src/GitVersionTask/GitVersionTask.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,8 @@
7979
</ItemGroup>
8080
<ItemGroup>
8181
<None Include="app.config" />
82-
<None Include="NugetAssets\GitVersionTask.targets">
83-
<SubType>Designer</SubType>
84-
</None>
82+
<None Include="NugetAssets\buildMultiTargeting\GitVersionTask.targets" />
83+
<None Include="NugetAssets\build\GitVersionTask.targets" />
8584
<None Include="NugetAssets\GitVersionTask.nuspec">
8685
<SubType>Designer</SubType>
8786
</None>
@@ -127,7 +126,9 @@
127126
<Copy SourceFiles="$(TargetDir)ILMergeTemp\GitVersionTask.dll" DestinationFolder="$(BuildDir)NuGetTaskBuild\build" Condition="Exists('$(TargetDir)ILMergeTemp\GitVersionTask.dll')" />
128127
<Copy SourceFiles="$(TargetDir)GitVersionTask.pdb" DestinationFolder="$(BuildDir)NuGetTaskBuild\build" Condition="Exists('$(TargetDir)GitVersionTask.pdb')" />
129128
<Copy SourceFiles="$(TargetDir)GitVersionTask.dll.mdb" DestinationFolder="$(BuildDir)NuGetTaskBuild\build" Condition="Exists('$(TargetDir)GitVersionTask.dll.mdb')" />
130-
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersionTask.targets" DestinationFolder="$(BuildDir)NuGetTaskBuild\build" />
129+
<Copy SourceFiles="$(ProjectDir)NugetAssets\build\GitVersionTask.targets" DestinationFolder="$(BuildDir)NuGetTaskBuild\build" />
130+
<Copy SourceFiles="$(ProjectDir)NugetAssets\buildMultiTargeting\GitVersionTask.targets" DestinationFolder="$(BuildDir)NuGetTaskBuild\buildMultiTargeting" />
131+
<Copy SourceFiles="$(ProjectDir)NugetAssets\buildMultiTargeting\GitVersionTask.targets" DestinationFolder="$(BuildDir)NuGetTaskBuild\buildCrossTargeting" />
131132
<Copy SourceFiles="$(ProjectDir)NugetAssets\GitVersionTask.nuspec" DestinationFolder="$(BuildDir)NuGetTaskBuild" />
132133
<PepitaPackage.CreatePackageTask NuGetBuildDirectory="$(BuildDir)NuGetTaskBuild" MetadataAssembly="$(ILMergeTemp)GitVersionTask.dll" Version="$(GitVersion_NuGetVersion)" />
133134
<Delete Files="@(TempFiles)" />

‎src/GitVersionTask/NugetAssets/GitVersionTask.targets renamed to ‎src/GitVersionTask/NugetAssets/build/GitVersionTask.targets

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
TaskName="GitVersionTask.WriteVersionInfoToBuildLog"
2828
AssemblyFile="$(GitVersionTaskLibrary)GitVersionTask.dll" />
2929

30-
<Target Name="WriteVersionInfoToBuildLog" BeforeTargets="CoreCompile" Condition="$(WriteVersionInfoToBuildLog) == 'true'">
30+
<Target Name="WriteVersionInfoToBuildLog" BeforeTargets="CoreCompile;GetAssemblyVersion;GenerateNuspec" Condition="$(WriteVersionInfoToBuildLog) == 'true'">
3131
<WriteVersionInfoToBuildLog SolutionDirectory="$(SolutionDir)" NoFetch="$(GitVersion_NoFetchEnabled)"/>
3232
</Target>
3333

@@ -49,7 +49,7 @@
4949
</ItemGroup>
5050
</Target>
5151

52-
<Target Name="GetVersion" BeforeTargets="CoreCompile" Condition="$(GetVersion) == 'true'">
52+
<Target Name="GetVersion" BeforeTargets="CoreCompile;GetAssemblyVersion;GenerateNuspec" Condition="$(GetVersion) == 'true'">
5353

5454
<GetVersion SolutionDirectory="$(SolutionDir)" NoFetch="$(GitVersion_NoFetchEnabled)">
5555
<Output TaskParameter="Major" PropertyName="GitVersion_Major" />

‎src/GitVersionTask/NugetAssets/buildMultiTargeting/GitVersionTask.targets

Lines changed: 62 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
<PropertyGroup>
4+
<SolutionDir Condition="$(SolutionDir) == '' Or $(SolutionDir) == '*Undefined*'">$(MSBuildProjectDirectory)\..\</SolutionDir>
5+
<GitVersion_NoFetchEnabled Condition="$(GitVersion_NoFetchEnabled) == ''">false</GitVersion_NoFetchEnabled>
6+
7+
<!-- Property that enables WriteVersionInfoToBuildLog -->
8+
<WriteVersionInfoToBuildLog Condition=" '$(WriteVersionInfoToBuildLog)' == '' ">true</WriteVersionInfoToBuildLog>
9+
10+
<!-- Property that enables GetVersion -->
11+
<GetVersion Condition=" '$(GetVersion)' == '' ">true</GetVersion>
12+
13+
<GitVersionTaskLibrary>$(MSBuildThisFileDirectory)..\build\</GitVersionTaskLibrary>
14+
</PropertyGroup>
15+
16+
<UsingTask
17+
TaskName="GitVersionTask.UpdateAssemblyInfo"
18+
AssemblyFile="$(GitVersionTaskLibrary)GitVersionTask.dll" />
19+
<UsingTask
20+
TaskName="GitVersionTask.GetVersion"
21+
AssemblyFile="$(GitVersionTaskLibrary)GitVersionTask.dll" />
22+
<UsingTask
23+
TaskName="GitVersionTask.WriteVersionInfoToBuildLog"
24+
AssemblyFile="$(GitVersionTaskLibrary)GitVersionTask.dll" />
25+
26+
<Target Name="WriteVersionInfoToBuildLog" BeforeTargets="DispatchToInnerBuilds" Condition="$(WriteVersionInfoToBuildLog) == 'true'">
27+
<WriteVersionInfoToBuildLog SolutionDirectory="$(SolutionDir)" NoFetch="$(GitVersion_NoFetchEnabled)"/>
28+
</Target>
29+
30+
<Target Name="GetVersion" BeforeTargets="DispatchToInnerBuilds" Condition="$(GetVersion) == 'true'">
31+
32+
<GetVersion SolutionDirectory="$(SolutionDir)" NoFetch="$(GitVersion_NoFetchEnabled)">
33+
<Output TaskParameter="Major" PropertyName="GitVersion_Major" />
34+
<Output TaskParameter="Minor" PropertyName="GitVersion_Minor" />
35+
<Output TaskParameter="Patch" PropertyName="GitVersion_Patch" />
36+
<Output TaskParameter="BuildMetaData" PropertyName="GitVersion_BuildMetaData" />
37+
<Output TaskParameter="BuildMetaDataPadded" PropertyName="GitVersion_BuildMetaDataPadded" />
38+
<Output TaskParameter="FullBuildMetaData" PropertyName="GitVersion_FullBuildMetaData" />
39+
<Output TaskParameter="BranchName" PropertyName="GitVersion_BranchName" />
40+
<Output TaskParameter="Sha" PropertyName="GitVersion_Sha" />
41+
<Output TaskParameter="MajorMinorPatch" PropertyName="GitVersion_MajorMinorPatch" />
42+
<Output TaskParameter="SemVer" PropertyName="GitVersion_SemVer" />
43+
<Output TaskParameter="LegacySemVer" PropertyName="GitVersion_LegacySemVer" />
44+
<Output TaskParameter="LegacySemVerPadded" PropertyName="GitVersion_LegacySemVerPadded" />
45+
<Output TaskParameter="FullSemVer" PropertyName="GitVersion_FullSemVer" />
46+
<Output TaskParameter="AssemblySemVer" PropertyName="GitVersion_AssemblySemVer" />
47+
<Output TaskParameter="NuGetVersion" PropertyName="GitVersion_NuGetVersion" />
48+
<Output TaskParameter="NuGetPreReleaseTag" PropertyName="GitVersion_NuGetPreReleaseTag" />
49+
<Output TaskParameter="PreReleaseTag" PropertyName="GitVersion_PreReleaseTag" />
50+
<Output TaskParameter="PreReleaseTagWithDash" PropertyName="GitVersion_PreReleaseTagWithDash" />
51+
<Output TaskParameter="PreReleaseLabel" PropertyName="GitVersion_PreReleaseLabel" />
52+
<Output TaskParameter="PreReleaseNumber" PropertyName="GitVersion_PreReleaseNumber" />
53+
<Output TaskParameter="InformationalVersion" PropertyName="GitVersion_InformationalVersion" />
54+
<Output TaskParameter="CommitDate" PropertyName="GitVersion_CommitDate" />
55+
<Output TaskParameter="CommitsSinceVersionSource" PropertyName="GitVersion_CommitsSinceVersionSource" />
56+
<Output TaskParameter="CommitsSinceVersionSourcePadded" PropertyName="GitVersion_CommitsSinceVersionSourcePadded" />
57+
</GetVersion>
58+
59+
</Target>
60+
</Project>
61+
62+

0 commit comments

Comments
 (0)