Integrate thmviewer.exe and thmviewer.msi

Cannot build MSI until a few fixes are made to WixToolset.Core. Will
enable this later.

3 files changed, 75 insertions, 0 deletions

diff --git a/src/ThmViewerPackage/Package.wxs b/src/ThmViewerPackage/Package.wxs
new file mode 100644
index 00000000..cfa041ba
--- /dev/null
+++ b/src/ThmViewerPackage/Package.wxs
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information. -->
+<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
+  <Product Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033"
+           Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89">
+    <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
+
+    <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
+    <MediaTemplate />
+
+    <Feature Id="Main">
+      <ComponentGroupRef Id="Components" />
+    </Feature>
+  </Product>
+
+  <Fragment>
+    <ComponentGroup Id="Components" Directory="INSTALLFOLDER:\bin\">
+      <Component>
+        <File Id="ThmViewerFile" Source="thmviewer.exe" />
+        <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
+      </Component>
+    </ComponentGroup>
+  </Fragment>
+
+  <Fragment>
+    <Directory Id="TARGETDIR" Name="SourceDir">
+      <Directory Id="ProgramFilesFolder">
+        <Directory Id="INSTALLFOLDER" Name="WiX Toolset v4.0\" />
+      </Directory>
+      <Directory Id="ProgramMenuFolder">
+        <Directory Id="ShortcutFolder" Name="WiX Toolset\" />
+      </Directory>
+    </Directory>
+  </Fragment>
+
+</Wix>
diff --git a/src/ThmViewerPackage/ThmViewerPackage.wixproj b/src/ThmViewerPackage/ThmViewerPackage.wixproj
new file mode 100644
index 00000000..ec2400bd
--- /dev/null
+++ b/src/ThmViewerPackage/ThmViewerPackage.wixproj
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <ProjectGuid>59c4b122-5167-445b-8fc4-09dcd4eced89</ProjectGuid>
+    <OutputName>thmviewer</OutputName>
+    <OutputType>Package</OutputType>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="Package.wxs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\thmviewer\thmviewer.vcxproj">
+      <Name>thmviewer</Name>
+      <Project>{95228C13-97F5-484A-B4A2-ECF4618B0881}</Project>
+    </ProjectReference>
+  </ItemGroup>
+
+  <Import Project="$(OutputPath)\net461\wix.targets" />
+
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets'))" />
+  </Target>
+  <Import Project="..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets" Condition="Exists('..\..\packages\Nerdbank.GitVersioning.2.1.65\build\Nerdbank.GitVersioning.targets')" />
+</Project>
diff --git a/src/ThmViewerPackage/packages.config b/src/ThmViewerPackage/packages.config
new file mode 100644
index 00000000..d69ed11e
--- /dev/null
+++ b/src/ThmViewerPackage/packages.config
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Nerdbank.GitVersioning" version="2.1.65" developmentDependency="true" targetFramework="net40" />
+</packages>