Skip to content

Feature/enable git version task for f sharp exe projects #1889

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

Closed
da9l wants to merge 13 commits into from
Closed

Feature/enable git version task for f sharp exe projects #1889

Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
a274b6e
Merge pull request #1 from GitTools/master
da9l Sep 30, 2019
c08928f
Merge remote-tracking branch 'upstream/master'
Oct 10, 2019
3b4f08a
Merge remote-tracking branch 'upstream/master'
Oct 31, 2019
93496b2
Merge branch 'master' of https://github.com/da9l/GitVersion
da9l Nov 2, 2019
8b0a494
Add CompileBefore in two ItemGroups with F# language condition
Nov 4, 2019
461c31a
Fix comparison in Itemgroup Condition
Nov 4, 2019
38d8c12
Test CompileBefore always
Nov 4, 2019
b6d7649
Remove exists expression
Nov 5, 2019
ad9819f
Merge remote-tracking branch 'upstream/master'
Nov 5, 2019
61ddbad
Merge branch 'master' of https://github.com/da9l/GitVersion
Nov 5, 2019
7c60dd4
Merge branch 'master' into feature/EnableGitVersionTaskForFSharpExePr…
Nov 5, 2019
22efda7
Merge remote-tracking branch 'upstream/master'
Nov 6, 2019
9fd8394
Merge branch 'master' into feature/EnableGitVersionTaskForFSharpExePr…
Nov 6, 2019
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
14 changes: 10 additions & 4 deletions src/GitVersionTask/build/GitVersionTask.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,10 @@
<Output TaskParameter="AssemblyInfoTempFilePath" PropertyName="AssemblyInfoTempFilePath" />
</UpdateAssemblyInfo>

<ItemGroup>
<ItemGroup Condition="'$(Language)' == 'F#'">
<CompileBefore Include="$(AssemblyInfoTempFilePath)" />
</ItemGroup>
<ItemGroup Condition="'$(Language)' != 'F#'">
<Compile Include="$(AssemblyInfoTempFilePath)" />
</ItemGroup>

Expand All @@ -44,14 +47,17 @@
<Output TaskParameter="GitVersionInformationFilePath" PropertyName="GitVersionInformationFilePath" />
</GenerateGitVersionInformation>

<ItemGroup>
<ItemGroup Condition="'$(Language)' == 'F#'">
<CompileBefore Include="$(GitVersionInformationFilePath)" />
<FileWrites Include="$(GitVersionInformationFilePath)" />
</ItemGroup>
<ItemGroup Condition="'$(Language)' != 'F#'">
<Compile Include="$(GitVersionInformationFilePath)" />
<FileWrites Include="$(GitVersionInformationFilePath)" />
</ItemGroup>

</Target>

<Target Name="GetVersion" BeforeTargets="CoreCompile;GetAssemblyVersion;GenerateNuspec;_GenerateRestoreProjectSpec;_GetOutputItemsFromPack;EnsureWixToolsetInstalled" Condition="$(GetVersion) == 'true'">
<Target Name="GetVersion" BeforeTargets="CoreCompile;GetAssemblyVersion;GenerateNuspec;_GenerateRestoreProjectSpec;_GetOutputItemsFromPack;EnsureWixToolsetInstalled" Condition="$(GetVersion) == 'true'">

<GetVersion SolutionDirectory="$(GitVersionPath)" ConfigFilePath="$(GitVersionConfig)" NoFetch="$(GitVersion_NoFetchEnabled)">
<Output TaskParameter="Major" PropertyName="GitVersion_Major" />
Expand Down