From 3b870b5493458ec6b2febc7dd7a154688a36152f Mon Sep 17 00:00:00 2001
From: Rob Mensching <rob@firegiant.com>
Date: Sat, 6 Aug 2022 15:38:36 -0700
Subject: Create setup segment and WixAdditionalTools bundle

The setup segment is scheduled after building the shipping WiX files
to use and include the current build's tooling. The
WixAdditionalTools bundle currently only contains the ThmViewer
package but may include additional tools in the future.

At this time, the primary purpose is to produce a shipping MSI and
bundle from the WiX v4 build process and dogfood the rest of the
tooling.

Closes 4919
---
 src/tools/ThmViewerPackage/Package.wxs             | 30 ----------------------
 .../ThmViewerPackage/ThmViewerPackage.wixproj      | 10 --------
 src/tools/tools.sln                                |  1 +
 3 files changed, 1 insertion(+), 40 deletions(-)
 delete mode 100644 src/tools/ThmViewerPackage/Package.wxs
 delete mode 100644 src/tools/ThmViewerPackage/ThmViewerPackage.wixproj

(limited to 'src/tools')

diff --git a/src/tools/ThmViewerPackage/Package.wxs b/src/tools/ThmViewerPackage/Package.wxs
deleted file mode 100644
index dae6a9d0..00000000
--- a/src/tools/ThmViewerPackage/Package.wxs
+++ /dev/null
@@ -1,30 +0,0 @@
-<!-- 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">
-  <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" />
-
-    <Feature Id="Main">
-      <ComponentGroupRef Id="Components" />
-    </Feature>
-  </Package>
-
-  <Fragment>
-    <ComponentGroup Id="Components" Directory="INSTALLFOLDER" Subdirectory="bin">
-      <Component>
-        <File Id="ThmViewerFile" Source="thmviewer.exe" />
-        <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" />
-      </Component>
-    </ComponentGroup>
-  </Fragment>
-
-  <Fragment>
-    <StandardDirectory Id="ProgramFilesFolder">
-      <Directory Id="INSTALLFOLDER" Name="WiX Toolset v4.0" />
-    </StandardDirectory>
-    <StandardDirectory Id="ProgramMenuFolder">
-      <Directory Id="ShortcutFolder" Name="WiX Toolset" />
-    </StandardDirectory>
-  </Fragment>
-
-</Wix>
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
-- 
cgit v1.2.3-55-g6feb