File tree Expand file tree Collapse file tree 2 files changed +7
-2
lines changed
src/GitVersion.MsBuild/msbuild/tools Expand file tree Collapse file tree 2 files changed +7
-2
lines changed Original file line number Diff line number Diff line change 33
33
34
34
<!-- Property that enables UpdateAssemblyInfo. -->
35
35
<UpdateAssemblyInfo Condition =" '$(DisableGitVersionTask)' == 'true' " >false</UpdateAssemblyInfo >
36
- <UpdateAssemblyInfo Condition =" '$(UpdateAssemblyInfo)' == '' " >true</UpdateAssemblyInfo >
36
+ <UpdateAssemblyInfo Condition =" '$(UpdateAssemblyInfo)' == '' And '$(GenerateGitVersionFiles)' == 'true' " >true</UpdateAssemblyInfo >
37
37
<GenerateAssemblyFileVersionAttribute Condition =" '$(UpdateAssemblyInfo)' == 'true' " >false</GenerateAssemblyFileVersionAttribute >
38
38
<GenerateAssemblyInformationalVersionAttribute Condition =" '$(UpdateAssemblyInfo)' == 'true' " >false</GenerateAssemblyInformationalVersionAttribute >
39
39
<GenerateAssemblyVersionAttribute Condition =" '$(UpdateAssemblyInfo)' == 'true' " >false</GenerateAssemblyVersionAttribute >
48
48
(The global property "_TargetAssemblyProjectName" is injected by XAML's above-mentioned task)
49
49
-->
50
50
<GenerateGitVersionInformation Condition =" '$(GenerateGitVersionInformation)' == '' And '$(_TargetAssemblyProjectName)' != '' " >false</GenerateGitVersionInformation >
51
- <GenerateGitVersionInformation Condition =" '$(GenerateGitVersionInformation)' == '' " >true</GenerateGitVersionInformation >
51
+ <GenerateGitVersionInformation Condition =" '$(GenerateGitVersionInformation)' == '' And '$(GenerateGitVersionFiles)' == 'true' " >true</GenerateGitVersionInformation >
52
52
<!--
53
53
Compounding on the previous "GenerateTemporaryTargetAssembly" explanation, "UpdateAssemblyInfo" is
54
54
also called in this temp-build. This results in a warning since we already updated assembly info.
Original file line number Diff line number Diff line change 5
5
<UsingTask TaskName =" WriteVersionInfoToBuildLog" AssemblyFile =" $(GitVersionAssemblyFile)" />
6
6
<UsingTask TaskName =" UpdateAssemblyInfo" AssemblyFile =" $(GitVersionAssemblyFile)" />
7
7
8
+ <PropertyGroup >
9
+ <GenerateGitVersionFiles >false</GenerateGitVersionFiles >
10
+ <GenerateGitVersionFiles Condition =" '$(Language)' == 'C#' Or '$(Language)' == 'F#' Or '$(Language)' == 'VB' " >true</GenerateGitVersionFiles >
11
+ </PropertyGroup >
12
+
8
13
<Target Name =" RunGitVersion" Condition =" '$(DisableGitVersionTask)' == 'false'" >
9
14
<Exec Command =" $(GitVersionFileExe) " $(MSBuildProjectDirectory)" $(GitVersion_ToolArgments)" />
10
15
</Target >
You can’t perform that action at this time.
0 commit comments