From 8b0a49438c6fb5f24312c6f86d3a68a76a432aaf Mon Sep 17 00:00:00 2001
From: Daniel Hegner <daniel.hegner@sveaekonomi.se>
Date: Mon, 4 Nov 2019 10:07:16 +0100
Subject: [PATCH 1/5] Add CompileBefore in two ItemGroups with F# language
 condition

---
 src/GitVersionTask/build/GitVersionTask.targets | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/GitVersionTask/build/GitVersionTask.targets b/src/GitVersionTask/build/GitVersionTask.targets
index e9dbe30368..726ef6199f 100644
--- a/src/GitVersionTask/build/GitVersionTask.targets
+++ b/src/GitVersionTask/build/GitVersionTask.targets
@@ -25,7 +25,10 @@
             <Output TaskParameter="AssemblyInfoTempFilePath" PropertyName="AssemblyInfoTempFilePath" />
         </UpdateAssemblyInfo>
 
-        <ItemGroup>
+        <ItemGroup Condition="Exists('$(Language)') And '$(Language)' = 'F#'">
+            <CompileBefore Include="$(AssemblyInfoTempFilePath)" />
+        </ItemGroup>
+        <ItemGroup Condition="!Exists('$(Language)') Or '$(Language)' != 'F#'">
             <Compile Include="$(AssemblyInfoTempFilePath)" />
         </ItemGroup>
 
@@ -44,14 +47,17 @@
             <Output TaskParameter="GitVersionInformationFilePath" PropertyName="GitVersionInformationFilePath" />
         </GenerateGitVersionInformation>
 
-        <ItemGroup>
+        <ItemGroup Condition="Exists('$(Language)') And '$(Language)' = 'F#'">
+            <CompileBefore Include="$(GitVersionInformationFilePath)" />
+            <FileWrites Include="$(GitVersionInformationFilePath)" />
+        </ItemGroup>
+        <ItemGroup Condition="!Exists('$(Language)') Or '$(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" />

From 461c31af33b0355b38186ab8eb8b95c81f5ad8a7 Mon Sep 17 00:00:00 2001
From: Daniel Hegner <daniel.hegner@sveaekonomi.se>
Date: Mon, 4 Nov 2019 10:21:36 +0100
Subject: [PATCH 2/5] Fix comparison in Itemgroup Condition

---
 src/GitVersionTask/build/GitVersionTask.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GitVersionTask/build/GitVersionTask.targets b/src/GitVersionTask/build/GitVersionTask.targets
index 726ef6199f..4c0039b883 100644
--- a/src/GitVersionTask/build/GitVersionTask.targets
+++ b/src/GitVersionTask/build/GitVersionTask.targets
@@ -25,7 +25,7 @@
             <Output TaskParameter="AssemblyInfoTempFilePath" PropertyName="AssemblyInfoTempFilePath" />
         </UpdateAssemblyInfo>
 
-        <ItemGroup Condition="Exists('$(Language)') And '$(Language)' = 'F#'">
+        <ItemGroup Condition="Exists('$(Language)') And '$(Language)' == 'F#'">
             <CompileBefore Include="$(AssemblyInfoTempFilePath)" />
         </ItemGroup>
         <ItemGroup Condition="!Exists('$(Language)') Or '$(Language)' != 'F#'">
@@ -47,7 +47,7 @@
             <Output TaskParameter="GitVersionInformationFilePath" PropertyName="GitVersionInformationFilePath" />
         </GenerateGitVersionInformation>
 
-        <ItemGroup Condition="Exists('$(Language)') And '$(Language)' = 'F#'">
+        <ItemGroup Condition="Exists('$(Language)') And '$(Language)' == 'F#'">
             <CompileBefore Include="$(GitVersionInformationFilePath)" />
             <FileWrites Include="$(GitVersionInformationFilePath)" />
         </ItemGroup>

From 38d8c121b7a55377d3ac67b4d3a060468cb34875 Mon Sep 17 00:00:00 2001
From: Daniel Hegner <daniel.hegner@sveaekonomi.se>
Date: Mon, 4 Nov 2019 10:51:04 +0100
Subject: [PATCH 3/5] Test CompileBefore always

---
 src/GitVersionTask/build/GitVersionTask.targets | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/GitVersionTask/build/GitVersionTask.targets b/src/GitVersionTask/build/GitVersionTask.targets
index 4c0039b883..f94bebecc2 100644
--- a/src/GitVersionTask/build/GitVersionTask.targets
+++ b/src/GitVersionTask/build/GitVersionTask.targets
@@ -29,7 +29,7 @@
             <CompileBefore Include="$(AssemblyInfoTempFilePath)" />
         </ItemGroup>
         <ItemGroup Condition="!Exists('$(Language)') Or '$(Language)' != 'F#'">
-            <Compile Include="$(AssemblyInfoTempFilePath)" />
+            <CompileBefore Include="$(AssemblyInfoTempFilePath)" />
         </ItemGroup>
 
     </Target>
@@ -52,7 +52,7 @@
             <FileWrites Include="$(GitVersionInformationFilePath)" />
         </ItemGroup>
         <ItemGroup Condition="!Exists('$(Language)') Or '$(Language)' != 'F#'">
-            <Compile Include="$(GitVersionInformationFilePath)" />
+            <CompileBefore Include="$(GitVersionInformationFilePath)" />
             <FileWrites Include="$(GitVersionInformationFilePath)" />
         </ItemGroup>
     </Target>

From b6d7649eb5aa3a2272ab3cd015ae0ef5570c3b2c Mon Sep 17 00:00:00 2001
From: Daniel Hegner <daniel.hegner@sveaekonomi.se>
Date: Tue, 5 Nov 2019 08:42:53 +0100
Subject: [PATCH 4/5] Remove exists expression

---
 src/GitVersionTask/build/GitVersionTask.targets | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/GitVersionTask/build/GitVersionTask.targets b/src/GitVersionTask/build/GitVersionTask.targets
index f94bebecc2..32552e7d22 100644
--- a/src/GitVersionTask/build/GitVersionTask.targets
+++ b/src/GitVersionTask/build/GitVersionTask.targets
@@ -25,11 +25,11 @@
             <Output TaskParameter="AssemblyInfoTempFilePath" PropertyName="AssemblyInfoTempFilePath" />
         </UpdateAssemblyInfo>
 
-        <ItemGroup Condition="Exists('$(Language)') And '$(Language)' == 'F#'">
+        <ItemGroup Condition="'$(Language)' == 'F#'">
             <CompileBefore Include="$(AssemblyInfoTempFilePath)" />
         </ItemGroup>
-        <ItemGroup Condition="!Exists('$(Language)') Or '$(Language)' != 'F#'">
-            <CompileBefore Include="$(AssemblyInfoTempFilePath)" />
+        <ItemGroup Condition="'$(Language)' != 'F#'">
+            <Compile Include="$(AssemblyInfoTempFilePath)" />
         </ItemGroup>
 
     </Target>
@@ -47,12 +47,12 @@
             <Output TaskParameter="GitVersionInformationFilePath" PropertyName="GitVersionInformationFilePath" />
         </GenerateGitVersionInformation>
 
-        <ItemGroup Condition="Exists('$(Language)') And '$(Language)' == 'F#'">
+        <ItemGroup Condition="'$(Language)' == 'F#'">
             <CompileBefore Include="$(GitVersionInformationFilePath)" />
             <FileWrites Include="$(GitVersionInformationFilePath)" />
         </ItemGroup>
-        <ItemGroup Condition="!Exists('$(Language)') Or '$(Language)' != 'F#'">
-            <CompileBefore Include="$(GitVersionInformationFilePath)" />
+        <ItemGroup Condition="'$(Language)' != 'F#'">
+            <Compile Include="$(GitVersionInformationFilePath)" />
             <FileWrites Include="$(GitVersionInformationFilePath)" />
         </ItemGroup>
     </Target>

From 58eda3ce7fe80423f03c97eff9873cabfe158ffb Mon Sep 17 00:00:00 2001
From: Daniel Hegner <daniel.hegner@sveaekonomi.se>
Date: Mon, 4 Nov 2019 10:07:16 +0100
Subject: [PATCH 5/5] Enable GitVersionTask for F# exe projects

CompileBefore Include is used for F# projects to
include the generated AssemblyInfo and GitVersionInfo files
in the project before any already included fs source files.

This is accomplished with a conditional F# check on the language property.
---
 src/GitVersionTask/build/GitVersionTask.targets | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/GitVersionTask/build/GitVersionTask.targets b/src/GitVersionTask/build/GitVersionTask.targets
index e9dbe30368..32552e7d22 100644
--- a/src/GitVersionTask/build/GitVersionTask.targets
+++ b/src/GitVersionTask/build/GitVersionTask.targets
@@ -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>
 
@@ -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" />