Skip to content

Commit 505aa28

Browse files
committed
improve CompileBefore for F# and Compile condition for C# and VB for msbuild targets
1 parent 03a9d8f commit 505aa28

File tree

1 file changed

+4
-13
lines changed

1 file changed

+4
-13
lines changed

src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.targets

Lines changed: 4 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -108,14 +108,9 @@
108108
<Output TaskParameter="GitVersionInformationFilePath" PropertyName="GitVersionInformationFilePath" />
109109
</GenerateGitVersionInformation>
110110
<!-- <Message Importance="High" Text="Info: $(GitVersionInformationFilePath)" /> -->
111-
112-
<ItemGroup Condition="'$(Language)' == 'F#'">
113-
<CompileBefore Include="$(GitVersionInformationFilePath)" />
114-
</ItemGroup>
115-
<ItemGroup Condition="'$(Language)' != 'F#'">
116-
<Compile Include="$(GitVersionInformationFilePath)" />
117-
</ItemGroup>
118111
<ItemGroup>
112+
<CompileBefore Include="$(GitVersionInformationFilePath)" Condition=" '$(Language)' == 'F#' " />
113+
<Compile Include="$(GitVersionInformationFilePath)" Condition=" '$(Language)' == 'C#' Or '$(Language)' == 'VB' " />
119114
<FileWrites Include="$(GitVersionInformationFilePath)" />
120115
<_GeneratedCodeFiles Include="$(GitVersionInformationFilePath)" />
121116
</ItemGroup>
@@ -133,13 +128,9 @@
133128
<Output TaskParameter="AssemblyInfoTempFilePath" PropertyName="AssemblyInfoTempFilePath" />
134129
</UpdateAssemblyInfo>
135130
<!-- <Message Importance="High" Text="Assembly: $(AssemblyInfoTempFilePath)" /> -->
136-
<ItemGroup Condition="'$(Language)' == 'F#'">
137-
<CompileBefore Include="$(AssemblyInfoTempFilePath)" />
138-
</ItemGroup>
139-
<ItemGroup Condition="'$(Language)' != 'F#'">
140-
<Compile Include="$(AssemblyInfoTempFilePath)" />
141-
</ItemGroup>
142131
<ItemGroup>
132+
<CompileBefore Include="$(AssemblyInfoTempFilePath)" Condition=" '$(Language)' == 'F#' " />
133+
<Compile Include="$(AssemblyInfoTempFilePath)" Condition=" '$(Language)' == 'C#' Or '$(Language)' == 'VB' " />
143134
<FileWrites Include="$(AssemblyInfoTempFilePath)" />
144135
<_GeneratedCodeFiles Include="$(AssemblyInfoTempFilePath)" />
145136
</ItemGroup>

0 commit comments

Comments
 (0)