Fix versioning of thmviewer and include MSI package in build

6 files changed, 10 insertions, 8 deletions

diff --git a/appveyor.cmd b/appveyor.cmd
index ec97f0b6..a41f8c19 100644
--- a/appveyor.cmd
+++ b/appveyor.cmd
@@ -18,8 +18,7 @@ dotnet publish -c Release -o %_P%\WixToolset.MSBuild\netcoreapp2.1\ -f netcoreap
 dotnet pack -c Release src\dotnet-wix
 dotnet pack -c Release src\WixToolset.MSBuild
 
-@rem Enable this build when WixToolset.Core is fixed to build the setup code correctly.
-@rem msbuild -p:Configuration=Release .\src\ThmViewerPackage\ThmViewerPackage.wixproj
+msbuild -p:Configuration=Release .\src\ThmViewerPackage\ThmViewerPackage.wixproj
 
 @popd
 @endlocal
diff --git a/nuget.config b/nuget.config
index 3fb7b617..d3a7e3d8 100644
--- a/nuget.config
+++ b/nuget.config
@@ -7,6 +7,7 @@
     <add key="wixtoolset-core-native" value="https://ci.appveyor.com/nuget/wixtoolset-core-native" />
     <add key="wixtoolset-data" value="https://ci.appveyor.com/nuget/wixtoolset-data" />
     <add key="wixtoolset-dtf" value="https://ci.appveyor.com/nuget/wixtoolset-dtf" />
+    <add key="wixtoolset-dutil" value="https://ci.appveyor.com/nuget/wixtoolset-dutil" />
     <add key="wixtoolset-extensibility" value="https://ci.appveyor.com/nuget/wixtoolset-extensibility" />
     <add key="wixbuildtools" value="https://ci.appveyor.com/nuget/wixbuildtools" />
     <add key="api.nuget.org" value="https://api.nuget.org/v3/index.json" protocolVersion="3" />
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>