diff options
| author | Rob Mensching <rob@firegiant.com> | 2019-05-23 22:52:24 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2019-10-20 01:06:43 -0700 |
| commit | c8c22de1957f8eeb2c9fc03df12db6af41613ca9 (patch) | |
| tree | 9bb7684a5e2e67116a9503df5a5011f71c78396e /src/thmviewer | |
| parent | 70d459c39d1716b2d26ffcbd2c4037d646b9ec37 (diff) | |
| download | wix-c8c22de1957f8eeb2c9fc03df12db6af41613ca9.tar.gz wix-c8c22de1957f8eeb2c9fc03df12db6af41613ca9.tar.bz2 wix-c8c22de1957f8eeb2c9fc03df12db6af41613ca9.zip | |
Fix versioning of thmviewer and include MSI package in build
Diffstat (limited to 'src/thmviewer')
| -rw-r--r-- | src/thmviewer/thmviewer.vcxproj | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/thmviewer/thmviewer.vcxproj b/src/thmviewer/thmviewer.vcxproj index 0c4612f2..ea589b4c 100644 --- a/src/thmviewer/thmviewer.vcxproj +++ b/src/thmviewer/thmviewer.vcxproj | |||
| @@ -31,7 +31,6 @@ | |||
| 31 | </ImportGroup> | 31 | </ImportGroup> |
| 32 | 32 | ||
| 33 | <ImportGroup Label="Shared"> | 33 | <ImportGroup Label="Shared"> |
| 34 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> | ||
| 35 | </ImportGroup> | 34 | </ImportGroup> |
| 36 | 35 | ||
| 37 | <PropertyGroup> | 36 | <PropertyGroup> |
| @@ -62,6 +61,9 @@ | |||
| 62 | </ItemGroup> | 61 | </ItemGroup> |
| 63 | 62 | ||
| 64 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> | 63 | <Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" /> |
| 64 | <ImportGroup Label="ExtensionTargets"> | ||
| 65 | <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" /> | ||
| 66 | </ImportGroup> | ||
| 65 | 67 | ||
| 66 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> | 68 | <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild"> |
| 67 | <PropertyGroup> | 69 | <PropertyGroup> |