File tree Expand file tree Collapse file tree 2 files changed +10
-2
lines changed
src/GitVersion.MsBuild/msbuild/tools Expand file tree Collapse file tree 2 files changed +10
-2
lines changed Original file line number Diff line number Diff line change 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 >
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.
Original file line number Diff line number Diff line change 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+
12+ <UpdateAssemblyInfo Condition =" '$(UpdateAssemblyInfo)' == 'true' And '$(GenerateGitVersionFiles)' == 'true' " >true</UpdateAssemblyInfo >
13+ <GenerateGitVersionInformation Condition =" '$(GenerateGitVersionInformation)' == '' And '$(GenerateGitVersionFiles)' == 'true' " >true</GenerateGitVersionInformation >
14+ </PropertyGroup >
15+
816 <Target Name =" RunGitVersion" Condition =" '$(DisableGitVersionTask)' == 'false'" >
917 <Exec Command =" $(GitVersionFileExe) " $(MSBuildProjectDirectory)" $(GitVersion_ToolArgments)" />
1018 </Target >
You can’t perform that action at this time.
0 commit comments