From c8c22de1957f8eeb2c9fc03df12db6af41613ca9 Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Thu, 23 May 2019 22:52:24 -0700
Subject: Fix versioning of thmviewer and include MSI package in build
---
src/ThmViewerPackage/Package.wxs | 2 +-
src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs | 6 +++---
src/thmviewer/thmviewer.vcxproj | 4 +++-
src/wix/wix.csproj | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
(limited to 'src')
diff --git a/src/ThmViewerPackage/Package.wxs b/src/ThmViewerPackage/Package.wxs
index cfa041ba..6609dbed 100644
--- a/src/ThmViewerPackage/Package.wxs
+++ b/src/ThmViewerPackage/Package.wxs
@@ -6,7 +6,7 @@
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
- <MediaTemplate />
+ <MediaTemplate EmbedCab="yes" />
<Feature Id="Main">
<ComponentGroupRef Id="Components" />
diff --git a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
index c4a69cdd..cb839011 100644
--- a/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
+++ b/src/test/WixToolsetTest.BuildTasks/WixBuildTaskFixture.cs
@@ -55,9 +55,9 @@ namespace WixToolsetTest.BuildTasks
var intermediate = Intermediate.Load(Path.Combine(intermediateFolder, @"test.wir"));
var section = intermediate.Sections.Single();
- var wixFile = section.Tuples.OfType<WixFileTuple>().Single();
- Assert.Equal(Path.Combine(folder, @"data\test.txt"), wixFile[WixFileTupleFields.Source].AsPath().Path);
- Assert.Equal(@"test.txt", wixFile[WixFileTupleFields.Source].PreviousValue.AsPath().Path);
+ var fileTuple = section.Tuples.OfType<FileTuple>().Single();
+ Assert.Equal(Path.Combine(folder, @"data\test.txt"), fileTuple[FileTupleFields.Source].AsPath().Path);
+ Assert.Equal(@"test.txt", fileTuple[FileTupleFields.Source].PreviousValue.AsPath().Path);
}
}
}
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 @@
</ImportGroup>
<ImportGroup Label="Shared">
- <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
</ImportGroup>
<PropertyGroup>
@@ -62,6 +61,9 @@
</ItemGroup>
<Import Project="$(VCTargetsPath)\Microsoft.Cpp.targets" />
+ <ImportGroup Label="ExtensionTargets">
+ <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
+ </ImportGroup>
<Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
<PropertyGroup>
diff --git a/src/wix/wix.csproj b/src/wix/wix.csproj
index 398952af..1f2c61e0 100644
--- a/src/wix/wix.csproj
+++ b/src/wix/wix.csproj
@@ -26,7 +26,7 @@
</ItemGroup>
<ItemGroup>
- <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All"/>
+ <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0-beta2-18618-05" PrivateAssets="All" />
<PackageReference Include="Nerdbank.GitVersioning" Version="2.1.65" PrivateAssets="All" />
</ItemGroup>
</Project>
--
cgit v1.2.3-55-g6feb