diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-08-06 15:38:36 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-08-06 18:45:31 -0700 |
| commit | 3b870b5493458ec6b2febc7dd7a154688a36152f (patch) | |
| tree | 621693aba27819885bf9e0254e103ba69b6df9ff /src/setup/ThmViewerPackage | |
| parent | 93df57931e0c260c413bd1036492354c0d8375de (diff) | |
| download | wix-3b870b5493458ec6b2febc7dd7a154688a36152f.tar.gz wix-3b870b5493458ec6b2febc7dd7a154688a36152f.tar.bz2 wix-3b870b5493458ec6b2febc7dd7a154688a36152f.zip | |
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
Diffstat (limited to 'src/setup/ThmViewerPackage')
| -rw-r--r-- | src/setup/ThmViewerPackage/ThmViewerPackage.wixproj | 11 | ||||
| -rw-r--r-- | src/setup/ThmViewerPackage/ThmViewerPackage.wxs | 31 |
2 files changed, 42 insertions, 0 deletions
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 @@ | |||
| 1 | <?xml version="1.0" encoding="utf-8"?> | ||
| 2 | <Project Sdk="WixToolset.Sdk"> | ||
| 3 | <ItemGroup> | ||
| 4 | <LinkerBindInputPaths Include="$(RootBuildFolder)tools\$(Configuration)\x86" /> | ||
| 5 | </ItemGroup> | ||
| 6 | |||
| 7 | <ItemGroup> | ||
| 8 | <PackageReference Include="GitInfo" PrivateAssets="All" /> | ||
| 9 | </ItemGroup> | ||
| 10 | |||
| 11 | </Project> | ||
diff --git a/src/setup/ThmViewerPackage/ThmViewerPackage.wxs b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs new file mode 100644 index 00000000..ff33ae7e --- /dev/null +++ b/src/setup/ThmViewerPackage/ThmViewerPackage.wxs | |||
| @@ -0,0 +1,31 @@ | |||
| 1 | <!-- 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. --> | ||
| 2 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | ||
| 3 | <Package Name="WiX Toolset Theme Viewer" Manufacturer="WiX Toolset" Language="1033" Version="!(bind.fileVersion.ThmViewerFile)" UpgradeCode="59c4b122-5167-445b-8fc4-09dcd4eced89"> | ||
| 4 | <MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." /> | ||
| 5 | <MediaTemplate /> | ||
| 6 | |||
| 7 | <Feature Id="Main"> | ||
| 8 | <ComponentGroupRef Id="Components" /> | ||
| 9 | </Feature> | ||
| 10 | </Package> | ||
| 11 | |||
| 12 | <Fragment> | ||
| 13 | <ComponentGroup Id="Components" Directory="INSTALLFOLDER" Subdirectory="bin"> | ||
| 14 | <Component> | ||
| 15 | <File Id="ThmViewerFile" Source="thmviewer.exe" /> | ||
| 16 | <Shortcut Name="!(bind.property.ProductName)" Directory="ShortcutFolder" Advertise="yes" /> | ||
| 17 | <RemoveFolder Directory="ShortcutFolder" On="uninstall" /> | ||
| 18 | </Component> | ||
| 19 | </ComponentGroup> | ||
| 20 | </Fragment> | ||
| 21 | |||
| 22 | <Fragment> | ||
| 23 | <StandardDirectory Id="ProgramFilesFolder"> | ||
| 24 | <Directory Id="INSTALLFOLDER" Name="WiX Toolset v$(SetupMajorMinorVersion)" /> | ||
| 25 | </StandardDirectory> | ||
| 26 | <StandardDirectory Id="ProgramMenuFolder"> | ||
| 27 | <Directory Id="ShortcutFolder" Name="WiX Toolset" /> | ||
| 28 | </StandardDirectory> | ||
| 29 | </Fragment> | ||
| 30 | |||
| 31 | </Wix> | ||