summaryrefslogtreecommitdiff
path: root/src/setup/WixAdditionalTools
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-08-06 15:38:36 -0700
committerRob Mensching <rob@firegiant.com>2022-08-06 18:45:31 -0700
commit3b870b5493458ec6b2febc7dd7a154688a36152f (patch)
tree621693aba27819885bf9e0254e103ba69b6df9ff /src/setup/WixAdditionalTools
parent93df57931e0c260c413bd1036492354c0d8375de (diff)
downloadwix-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/WixAdditionalTools')
-rw-r--r--src/setup/WixAdditionalTools/WixAdditionalTools.wixproj17
-rw-r--r--src/setup/WixAdditionalTools/WixAdditionalTools.wxl12
-rw-r--r--src/setup/WixAdditionalTools/WixAdditionalTools.wxs27
-rw-r--r--src/setup/WixAdditionalTools/wix-logo-sq.pngbin0 -> 1810 bytes
4 files changed, 56 insertions, 0 deletions
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 @@
1<?xml version="1.0" encoding="utf-8"?>
2<Project Sdk="WixToolset.Sdk">
3 <PropertyGroup>
4 <OutputType>Bundle</OutputType>
5 <OutputPath>$(PackageOutputPath)</OutputPath>
6 </PropertyGroup>
7
8 <ItemGroup>
9 <ProjectReference Include="..\ThmViewerPackage\ThmViewerPackage.wixproj" />
10 </ItemGroup>
11
12 <ItemGroup>
13 <PackageReference Include="WixToolset.Bal.wixext" />
14 <PackageReference Include="GitInfo" PrivateAssets="All" />
15 </ItemGroup>
16
17</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 @@
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
3<WixLocalization xmlns="http://wixtoolset.org/schemas/v4/wxl">
4 <String Id="Company" Overridable="yes">.NET Foundation</String>
5 <String Id="Copyright" Overridable="yes">Copyright (c) .NET Foundation and contributors. All rights reserved.</String>
6 <String Id="Name" Overridable="yes">WiX Toolset Additional Tools</String>
7 <String Id="Regid" Overridable="yes">wixtoolset.org</String>
8 <String Id="AboutUrl" Overridable="yes">https://wixtoolset.org/</String>
9 <String Id="LicenseUrl" Overridable="yes">https://wixtoolset.org/about/license/</String>
10 <String Id="SupportUrl" Overridable="yes">https://wixtoolset.org/documentation/</String>
11 <String Id="UpdateUrl" Overridable="yes">https://wixtoolset.org/releases/feed/v$(SetupMajorMinorVersion)</String>
12</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 @@
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
3<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"
4 xmlns:bal="http://wixtoolset.org/schemas/v4/wxs/bal">
5 <Bundle Name="!(loc.Name)" Version="$(SetupVersion)" UpgradeCode="fc48131d-214a-439b-9a31-ef2ea5c69ea5"
6 AboutUrl="!(loc.AboutUrl)" HelpUrl="!(loc.SupportUrl)" UpdateUrl="!(loc.UpdateUrl)">
7 <BootstrapperApplication>
8 <bal:WixStandardBootstrapperApplication
9 LicenseUrl="!(loc.LicenseUrl)"
10 Theme="hyperlinkLicense"
11 ShowVersion="true"
12 LogoFile="wix-logo-sq.png" />
13 </BootstrapperApplication>
14
15 <SetVariable Variable="InstallFolder" Value="[ProgramFilesFolder]WiX Toolset v$(SetupMajorMinorVersion)\" />
16 <!-- TODO: bring back SoftwareTag when #6854 fixed -->
17 <!-- <SoftwareTag Regid="!(loc.Regid)" InstallPath="[InstallFolder]" /> -->
18
19 <Update Location="!(loc.UpdateUrl)" />
20
21 <Chain>
22 <MsiPackage SourceFile="ThmViewerPackage.msi">
23 <MsiProperty Name="INSTALLFOLDER" Value="[InstallFolder]" />
24 </MsiPackage>
25 </Chain>
26 </Bundle>
27</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
Binary files differ