Skip to content

Commit 01f9f7a

Browse files
committed
GitTools#2595 - added GenerateGitVersionFiles only for c#, f# and vb
1 parent bd1d126 commit 01f9f7a

File tree

2 files changed

+7
-2
lines changed

2 files changed

+7
-2
lines changed

src/GitVersion.MsBuild/msbuild/tools/GitVersion.MsBuild.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434
<!-- Property that enables UpdateAssemblyInfo. -->
3535
<UpdateAssemblyInfo Condition=" '$(DisableGitVersionTask)' == 'true' ">false</UpdateAssemblyInfo>
36-
<UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == '' ">true</UpdateAssemblyInfo>
36+
<UpdateAssemblyInfo Condition=" '$(UpdateAssemblyInfo)' == '' And '$(GenerateGitVersionFiles)' == 'true' ">true</UpdateAssemblyInfo>
3737
<GenerateAssemblyFileVersionAttribute Condition=" '$(UpdateAssemblyInfo)' == 'true' ">false</GenerateAssemblyFileVersionAttribute>
3838
<GenerateAssemblyInformationalVersionAttribute Condition=" '$(UpdateAssemblyInfo)' == 'true' ">false</GenerateAssemblyInformationalVersionAttribute>
3939
<GenerateAssemblyVersionAttribute Condition=" '$(UpdateAssemblyInfo)' == 'true' ">false</GenerateAssemblyVersionAttribute>
@@ -48,7 +48,7 @@
4848
(The global property "_TargetAssemblyProjectName" is injected by XAML's above-mentioned task)
4949
-->
5050
<GenerateGitVersionInformation Condition=" '$(GenerateGitVersionInformation)' == '' And '$(_TargetAssemblyProjectName)' != '' ">false</GenerateGitVersionInformation>
51-
<GenerateGitVersionInformation Condition=" '$(GenerateGitVersionInformation)' == '' ">true</GenerateGitVersionInformation>
51+
<GenerateGitVersionInformation Condition=" '$(GenerateGitVersionInformation)' == '' And '$(GenerateGitVersionFiles)' == 'true' ">true</GenerateGitVersionInformation>
5252
<!--
5353
Compounding on the previous "GenerateTemporaryTargetAssembly" explanation, "UpdateAssemblyInfo" is
5454
also called in this temp-build. This results in a warning since we already updated assembly info.

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

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,11 @@
55
<UsingTask TaskName="WriteVersionInfoToBuildLog" AssemblyFile="$(GitVersionAssemblyFile)"/>
66
<UsingTask TaskName="UpdateAssemblyInfo" AssemblyFile="$(GitVersionAssemblyFile)"/>
77

8+
<PropertyGroup>
9+
<GenerateGitVersionFiles>false</GenerateGitVersionFiles>
10+
<GenerateGitVersionFiles Condition=" '$(Language)' == 'C#' Or '$(Language)' == 'F#' Or '$(Language)' == 'VB' ">true</GenerateGitVersionFiles>
11+
</PropertyGroup>
12+
813
<Target Name="RunGitVersion" Condition="'$(DisableGitVersionTask)' == 'false'">
914
<Exec Command="$(GitVersionFileExe) &quot;$(MSBuildProjectDirectory)&quot; $(GitVersion_ToolArgments)" />
1015
</Target>

0 commit comments

Comments
 (0)