improve CompileBefore for F# and Compile condition for C# and VB for …

…msbuild targets
GitTools · Sep 29, 2023 · 505aa28 · 505aa28
1 parent 03a9d8f
commit 505aa28
Showing 1 changed file with 4 additions and 13 deletions.
diff --git a/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets b/src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets
@@ -108,14 +108,9 @@
             <Output TaskParameter="GitVersionInformationFilePath" PropertyName="GitVersionInformationFilePath" />
         </GenerateGitVersionInformation>
         <!-- <Message Importance="High" Text="Info: $(GitVersionInformationFilePath)" /> -->
-
-        <ItemGroup Condition="'$(Language)' == 'F#'">
-            <CompileBefore Include="$(GitVersionInformationFilePath)" />
-        </ItemGroup>
-        <ItemGroup Condition="'$(Language)' != 'F#'">
-            <Compile Include="$(GitVersionInformationFilePath)" />
-        </ItemGroup>
         <ItemGroup>
+            <CompileBefore Include="$(GitVersionInformationFilePath)" Condition=" '$(Language)' == 'F#' " />
+            <Compile Include="$(GitVersionInformationFilePath)" Condition=" '$(Language)' == 'C#' Or '$(Language)' == 'VB' " />
             <FileWrites Include="$(GitVersionInformationFilePath)" />
             <_GeneratedCodeFiles Include="$(GitVersionInformationFilePath)" />
         </ItemGroup>
@@ -133,13 +128,9 @@
             <Output TaskParameter="AssemblyInfoTempFilePath" PropertyName="AssemblyInfoTempFilePath" />
         </UpdateAssemblyInfo>
         <!-- <Message Importance="High" Text="Assembly: $(AssemblyInfoTempFilePath)" /> -->
-        <ItemGroup Condition="'$(Language)' == 'F#'">
-            <CompileBefore Include="$(AssemblyInfoTempFilePath)" />
-        </ItemGroup>
-        <ItemGroup Condition="'$(Language)' != 'F#'">
-            <Compile Include="$(AssemblyInfoTempFilePath)" />
-        </ItemGroup>
         <ItemGroup>
+            <CompileBefore Include="$(AssemblyInfoTempFilePath)" Condition=" '$(Language)' == 'F#' " />
+            <Compile Include="$(AssemblyInfoTempFilePath)" Condition=" '$(Language)' == 'C#' Or '$(Language)' == 'VB' " />
             <FileWrites Include="$(AssemblyInfoTempFilePath)" />
             <_GeneratedCodeFiles Include="$(AssemblyInfoTempFilePath)" />
         </ItemGroup>