14 files changed, 184 insertions, 12 deletions

diff --git a/src/Directory.wixproj.props b/src/Directory.wixproj.props
new file mode 100644
index 00000000..73ac652f
--- /dev/null
+++ b/src/Directory.wixproj.props
@@ -0,0 +1,9 @@
+<?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. -->
+
+<Project>
+  <PropertyGroup>
+    <!-- TODO: changing the .wixpdb folder does not actually work until issue #6857 is resolved -->
+    <PdbOutputDir>$(PdbsFolder)</PdbOutputDir>
+  </PropertyGroup>
+</Project>
diff --git a/src/Directory.wixproj.targets b/src/Directory.wixproj.targets
new file mode 100644
index 00000000..bac132ec
--- /dev/null
+++ b/src/Directory.wixproj.targets
@@ -0,0 +1,16 @@
+<?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. -->
+
+<Project>
+  <Target Name="_SetWixVersion"
+          DependsOnTargets="__SetPropertiesFromGit"
+          AfterTargets="_CreateProjectDefineConstants">
+    <PropertyGroup>
+      <DefineConstants>
+        $(DefineConstants);
+        SetupVersion=$(FileVersion);
+        SetupMajorMinorVersion=$(GitBaseVersionMajor).$(GitBaseVersionMinor);
+      </DefineConstants>
+    </PropertyGroup>
+  </Target>
+</Project>
diff --git a/src/build_all.cmd b/src/build_all.cmd
index ce1c08f0..5f3ba14e 100644
--- a/src/build_all.cmd
+++ b/src/build_all.cmd
@@ -54,6 +54,11 @@ call tools\tools.cmd %_C% || exit /b
 call ext\ext.cmd %_C% || exit /b
 
 
+:: setup
+
+call setup\setup.cmd %_C% || exit /b
+
+
 :: integration tests
 
 call test\test.cmd %_C% || exit /b
diff --git a/src/setup/Directory.Build.props b/src/setup/Directory.Build.props
new file mode 100644
index 00000000..cbf8ecc9
--- /dev/null
+++ b/src/setup/Directory.Build.props
@@ -0,0 +1,14 @@
+<?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. -->
+
+<Project>
+  <PropertyGroup>
+    <SegmentName>setup</SegmentName>
+  </PropertyGroup>
+
+  <Import Project="..\Directory.Build.props" />
+
+  <PropertyGroup>
+    <PublishRoot>$(OutputPath)publish\</PublishRoot>
+  </PropertyGroup>
+</Project>
diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wixproj b/src/setup/ThmViewerPackage/ThmViewerPackage.wixproj
new file mode 100644
index 00000000..57aeac95
--- /dev/null
+++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wixproj
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="WixToolset.Sdk">
+  <ItemGroup>
+    <LinkerBindInputPaths Include="$(RootBuildFolder)tools\$(Configuration)\x86" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/tools/ThmViewerPackage/Package.wxs b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
index dae6a9d0..ff33ae7e 100644
--- a/src/tools/ThmViewerPackage/Package.wxs
+++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs
@@ -2,7 +2,7 @@
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
   <Package Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89">
     <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
-    <MediaTemplate EmbedCab="yes" />
+    <MediaTemplate />
 
     <Feature Id="Main">
       <ComponentGroupRef Id="Components" />
@@ -14,13 +14,14 @@
       <Component>
         <File Id="ThmViewerFile" Source="thmviewer.exe" />
         <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
+        <RemoveFolder Directory="ShortcutFolder" On="uninstall" />
       </Component>
     </ComponentGroup>
   </Fragment>
 
   <Fragment>
     <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="WiX Toolset v4.0" />
+      <Directory Id="INSTALLFOLDER" Name="WiX Toolset v$(SetupMajorMinorVersion)" />
     </StandardDirectory>
     <StandardDirectory Id="ProgramMenuFolder">
       <Directory Id="ShortcutFolder" Name="WiX Toolset" />
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj
new file mode 100644
index 00000000..2d2347b3
--- /dev/null
+++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <OutputType>Bundle</OutputType>
+    <OutputPath>$(PackageOutputPath)</OutputPath>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\ThmViewerPackage\ThmViewerPackage.wixproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <PackageReference Include="WixToolset.Bal.wixext" />
+    <PackageReference Include="GitInfo" PrivateAssets="All" />
+  </ItemGroup>
+
+</Project>
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxl b/src/setup/WixAdditionalTools/WixAdditionalTools.wxl
new file mode 100644
index 00000000..ca3183ab
--- /dev/null
+++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxl
@@ -0,0 +1,12 @@
+<!-- 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. -->
+
+<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl">
+    <String Id="Company" Overridable="yes">.NET Foundation</String>
+    <String Id="Copyright" Overridable="yes">Copyright (c) .NET Foundation and contributors. All rights reserved.</String>
+    <String Id="Name" Overridable="yes">WiX Toolset Additional Tools</String>
+    <String Id="Regid" Overridable="yes">wixtoolset.org</String>
+    <String Id="AboutUrl" Overridable="yes">https://wixtoolset.org/</String>
+    <String Id="LicenseUrl" Overridable="yes">https://wixtoolset.org/about/license/</String>
+    <String Id="SupportUrl" Overridable="yes">https://wixtoolset.org/documentation/</String>
+    <String Id="UpdateUrl" Overridable="yes">https://wixtoolset.org/releases/feed/v$(SetupMajorMinorVersion)</String>
+</WixLocalization>
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wxs b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs
new file mode 100644
index 00000000..a53db9d3
--- /dev/null
+++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wxs
@@ -0,0 +1,27 @@
+<!-- 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"
+     xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
+  <Bundle Name="!(loc.Name)" Version="$(SetupVersion)" UpgradeCode="fc48131d-214a-439b-9a31-ef2ea5c69ea5"
+          AboutUrl="!(loc.AboutUrl)" HelpUrl="!(loc.SupportUrl)" UpdateUrl="!(loc.UpdateUrl)">
+    <BootstrapperApplication>
+      <bal:WixStandardBootstrapperApplication
+        LicenseUrl="!(loc.LicenseUrl)"
+        Theme="hyperlinkLicense"
+        ShowVersion="true"
+        LogoFile="wix-logo-sq.png" />
+    </BootstrapperApplication>
+
+    <SetVariable Variable="InstallFolder" Value="[ProgramFilesFolder]WiX Toolset v$(SetupMajorMinorVersion)\" />
+    <!-- TODO: bring back SoftwareTag when #6854 fixed -->
+    <!-- <SoftwareTag Regid="!(loc.Regid)" InstallPath="[InstallFolder]" /> -->
+
+    <Update Location="!(loc.UpdateUrl)" />
+
+    <Chain>
+      <MsiPackage SourceFile="ThmViewerPackage.msi">
+        <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
+      </MsiPackage>
+    </Chain>
+  </Bundle>
+</Wix>
diff --git a/src/setup/WixAdditionalTools/wix-logo-sq.png b/src/setup/WixAdditionalTools/wix-logo-sq.png
new file mode 100644
index 00000000..373fc718
--- /dev/null
+++ b/src/setup/WixAdditionalTools/wix-logo-sq.png
diff --git a/src/setup/setup.cmd b/src/setup/setup.cmd
new file mode 100644
index 00000000..8096792b
--- /dev/null
+++ b/src/setup/setup.cmd
@@ -0,0 +1,41 @@
+@setlocal
+@pushd %~dp0
+
+@set _C=Debug
+@set _L=%~dp0..\..\build\logs
+
+:parse_args
+@if /i "%1"=="release" set _C=Release
+@if /i "%1"=="inc" set _INCREMENTAL=1
+@if /i "%1"=="clean" set _INCREMENTAL= & set _CLEAN=1
+@if not "%1"=="" shift & goto parse_args
+
+:: Clean
+@if NOT "%_INCREMENTAL%"=="" call :clean
+@if NOT "%_CLEAN%"=="" goto :end
+
+@echo Building setup %_C%
+
+:: Build
+msbuild -Restore setup.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\setup_build.binlog || exit /b
+
+:: Publish
+
+
+:: Test
+
+
+:: Pack
+
+
+@goto :end
+
+:clean
+@rd /s/q "..\..\build\setup" 2> nul
+@del "..\..\build\artifacts\WixAdditionalTools.*" 2> nul
+@del "..\..\build\logs\pdbs\%_C%\WixAdditionalTools.*" 2> nul
+@exit /b
+
+:end
+@popd
+@endlocal
diff --git a/src/setup/setup.sln b/src/setup/setup.sln
new file mode 100644
index 00000000..3998623e
--- /dev/null
+++ b/src/setup/setup.sln
@@ -0,0 +1,28 @@
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.30114.105
+MinimumVisualStudioVersion = 10.0.40219.1
+Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "ThmViewerPackage", "ThmViewerPackage\ThmViewerPackage.wixproj", "{F8C12838-DEC5-4CA5-97A8-DFE2247564C5}"
+EndProject
+Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "WixAdditionalTools", "WixAdditionalTools\WixAdditionalTools.wixproj", "{59FF3AD3-339A-4048-9F0B-504EE74BC4AF}"
+EndProject
+Global
+        GlobalSection(SolutionConfigurationPlatforms) = preSolution
+                Debug|Any CPU = Debug|Any CPU
+                Release|Any CPU = Release|Any CPU
+        EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+        GlobalSection(ProjectConfigurationPlatforms) = postSolution
+                {F8C12838-DEC5-4CA5-97A8-DFE2247564C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {F8C12838-DEC5-4CA5-97A8-DFE2247564C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {F8C12838-DEC5-4CA5-97A8-DFE2247564C5}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {F8C12838-DEC5-4CA5-97A8-DFE2247564C5}.Release|Any CPU.Build.0 = Release|Any CPU
+                {59FF3AD3-339A-4048-9F0B-504EE74BC4AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+                {59FF3AD3-339A-4048-9F0B-504EE74BC4AF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+                {59FF3AD3-339A-4048-9F0B-504EE74BC4AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+                {59FF3AD3-339A-4048-9F0B-504EE74BC4AF}.Release|Any CPU.Build.0 = Release|Any CPU
+        EndGlobalSection
+EndGlobal
diff --git a/src/tools/ThmViewerPackage/ThmViewerPackage.wixproj b/src/tools/ThmViewerPackage/ThmViewerPackage.wixproj
deleted file mode 100644
index 9b2a2b02..00000000
--- a/src/tools/ThmViewerPackage/ThmViewerPackage.wixproj
+++ /dev/null
@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project Sdk="WixToolset.Sdk">
-  <PropertyGroup>
-    <OutputPath>$(PackageOutputPath)</OutputPath>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <ProjectReference Include="..\thmviewer\thmviewer.vcxproj" />
-  </ItemGroup>
-</Project>
diff --git a/src/tools/tools.sln b/src/tools/tools.sln
index 4df8367e..a51983b3 100644
--- a/src/tools/tools.sln
+++ b/src/tools/tools.sln
@@ -29,6 +29,7 @@ Global
                 {95228C13-97F5-484A-B4A2-ECF4618B0881}.Debug|x86.ActiveCfg = Debug|Win32
                 {95228C13-97F5-484A-B4A2-ECF4618B0881}.Debug|x86.Build.0 = Debug|Win32
                 {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|Any CPU.ActiveCfg = Release|Win32
+                {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|Any CPU.Build.0 = Release|Win32
                 {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|x86.ActiveCfg = Release|Win32
                 {95228C13-97F5-484A-B4A2-ECF4618B0881}.Release|x86.Build.0 = Release|Win32
                 {D1385232-CA10-4092-BAB5-4E5499FE144C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU