Skip to content

Commit 83aa956

Browse files
authored
Merge pull request #918 from maniglia/main
Compatibility improvement for WiX Toolset V4 projects.
2 parents 6f51530 + 102980f commit 83aa956

1 file changed

Lines changed: 3 additions & 0 deletions

File tree

src/Nerdbank.GitVersioning.Tasks/build/Nerdbank.GitVersioning.targets

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@
4040
<GenerateAssemblyVersionInfo Condition=" '$(GenerateAssemblyVersionInfo)' == '' and '$(TargetExt)' != '.dll' and '$(TargetExt)' != '.exe' ">false</GenerateAssemblyVersionInfo>
4141
<GenerateAssemblyVersionInfo Condition=" '$(GenerateAssemblyVersionInfo)' == '' and '$(NBGV_CacheMode)' == 'VersionGenerationTarget' ">false</GenerateAssemblyVersionInfo>
4242

43+
<!-- Suppress assembly version info generation for WiX Toolset project. -->
44+
<GenerateAssemblyVersionInfo Condition=" '$(GenerateAssemblyVersionInfo)' == '' and '$(Language)' == 'wix' ">false</GenerateAssemblyVersionInfo>
45+
4346
<!-- Workaround the property stomping that msbuild does (see https://github.com/microsoft/msbuild/pull/4922) with manual imports. -->
4447
<PrepareForBuildDependsOn>
4548
GenerateNativeNBGVVersionInfo;

0 commit comments

Comments
 (0)