Introducing wix-cli.msi

Fixes 8623
author: Rob Mensching <rob@firegiant.com> 2024-07-12 11:24:37 -0700
committer: Rob Mensching <rob@firegiant.com> 2024-07-12 14:37:05 -0700
commit: 40df304afe43fcd546b5b817bcad63168ee31813 (patch)
tree: 0bfa8b9b7f2b340b5c7d69632af15f385996f988 /src/setup/wix-cli
parent: 24d9e661a9613b3a52c37d00e4e44171b9afd998 (diff)
download: wix-40df304afe43fcd546b5b817bcad63168ee31813.tar.gz
wix-40df304afe43fcd546b5b817bcad63168ee31813.tar.bz2
wix-40df304afe43fcd546b5b817bcad63168ee31813.zip
2 files changed, 117 insertions, 0 deletions
diff --git a/src/setup/wix-cli/Package.wxs b/src/setup/wix-cli/Package.wxs
new file mode 100644
index 00000000..9c193130
--- /dev/null
+++ b/src/setup/wix-cli/Package.wxs
@@ -0,0 +1,81 @@
+<!-- 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 Command-Line Tools" Manufacturer="WiX Toolset" Version="!(bind.fileVersion.WixExe)" UpgradeCode="2e85dc76-769f-46d2-82a7-46cb3a0c9d50">
+    <MediaTemplate EmbedCab="yes" />
+    <ComponentGroupRef Id="BinaryFiles" />
+    <ComponentGroupRef Id="ExtensionFiles" />
+    <Property Id="ARPURLINFOABOUT" Value="https://wixtoolset.org/" />
+    <Property Id="ARPHELPLINK" Value="https://wixtoolset.org/docs/gethelp/" />
+    <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
+  </Package>
+  <Fragment>
+    <ComponentGroup Id="BinaryFiles" Directory="BinFolder">
+      <Component>
+        <File Id="WixExe" Source="!(bindpath.Files)\wix.exe" />
+        <File Source="!(bindpath.Files)\wix.exe.config" />
+        <Environment Name="PATH" Value="[BinFolder]" Action="set" Part ="last" System="yes" />
+        <Environment Name="WIX$(SetupMajorVersion)" Value="[BinFolder]" Action="set" System="yes" />
+      </Component>
+      <Files Include="!(bindpath.Files)\**">
+        <Exclude Files="!(bindpath.Files)\wix.exe*" />
+        <Exclude Files="!(bindpath.Files)\**\*.xml" />
+        <Exclude Files="!(bindpath.Files)\**\*.targets" />
+      </Files>
+      <Files Include="!(bindpath.Heat_x64)\**" Subdirectory="x64" />
+      <Files Include="!(bindpath.Heat_x86)\**" Subdirectory="x86" />
+    </ComponentGroup>
+  </Fragment>
+  <Fragment>
+    <ComponentGroup Id="ExtensionFiles" Directory="ExtensionFolder">
+      <File Subdirectory="WixToolset.BootstrapperApplications.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.BootstrapperApplications.wixext.dll" />
+      <File Subdirectory="WixToolset.ComPlus.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.ComPlus.wixext.dll" />
+      <File Subdirectory="WixToolset.Dependency.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.Dependency.wixext.dll" />
+      <File Subdirectory="WixToolset.DirectX.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.DirectX.wixext.dll" />
+      <File Subdirectory="WixToolset.Firewall.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.Firewall.wixext.dll" />
+      <File Subdirectory="WixToolset.Http.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.Http.wixext.dll" />
+      <File Subdirectory="WixToolset.Iis.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.Iis.wixext.dll" />
+      <File Subdirectory="WixToolset.Msmq.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.Msmq.wixext.dll" />
+      <File Subdirectory="WixToolset.NetFx.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.NetFx.wixext.dll" />
+      <File Subdirectory="WixToolset.PowerShell.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.PowerShell.wixext.dll" />
+      <File Subdirectory="WixToolset.Sql.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.Sql.wixext.dll" />
+      <File Subdirectory="WixToolset.UI.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.UI.wixext.dll" />
+      <File Subdirectory="WixToolset.Util.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.Util.wixext.dll" />
+      <File Subdirectory="WixToolset.VisualStudio.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
+            Source="WixToolset.VisualStudio.wixext.dll" />
+    </ComponentGroup>
+  </Fragment>
+  <Fragment>
+    <StandardDirectory Id="ProgramFiles64Folder">
+      <Directory Id="INSTALLFOLDER" Name="WiX Toolset v$(SetupMajorMinorVersion)">
+        <Directory Id="BinFolder" Name="bin" />
+      </Directory>
+    </StandardDirectory>
+  </Fragment>
+  <Fragment>
+    <StandardDirectory Id="CommonFiles64Folder">
+      <Directory Id="ExtensionFolder" Name="WixToolset\extensions" />
+    </StandardDirectory>
+  </Fragment>
+</Wix>
diff --git a/src/setup/wix-cli/wix-cli.wixproj b/src/setup/wix-cli/wix-cli.wixproj
new file mode 100644
index 00000000..35457460
--- /dev/null
+++ b/src/setup/wix-cli/wix-cli.wixproj
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project Sdk="WixToolset.Sdk">
+  <PropertyGroup>
+    <Platform>x64</Platform>
+    <OutputName>wix-cli-$(Platform)</OutputName>
+    <OutputPath>$(PackageOutputPath)</OutputPath>
+    <SignOutput>true</SignOutput>
+  </PropertyGroup>
+  <ItemGroup>
+    <BindPath BindName="Files" Include="$(RootBuildFolder)wix\$(Configuration)\net472\win-$(Platform)" />
+    <BindPath BindName="Heat_x64" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x64\" />
+    <BindPath BindName="Heat_x86" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x86\" />
+    <BindPath Include="$(RootBuildFolder)Bal.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)ComPlus.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)Dependency.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)DirectX.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)Firewall.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)Http.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)Iis.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)Msmq.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)NetFx.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)PowerShell.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)Sql.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)UI.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)Util.wixext\$(Configuration)\netstandard2.0\" />
+    <BindPath Include="$(RootBuildFolder)VisualStudio.wixext\$(Configuration)\netstandard2.0\" />
+  </ItemGroup>
+  <UsingTask TaskName="GenerateMetadata" AssemblyFile="$(BaseOutputPath)$(Configuration)\net472\MetadataTask.dll" />
+  <Target Name="GenerateMetadata" AfterTargets="AfterBuild">
+    <GenerateMetadata TargetFile="$(TargetPath)" WixpdbFile="$(TargetPdbPath)" />
+  </Target>
+</Project>
author	Rob Mensching <rob@firegiant.com>	2024-07-12 11:24:37 -0700
committer	Rob Mensching <rob@firegiant.com>	2024-07-12 14:37:05 -0700
commit	40df304afe43fcd546b5b817bcad63168ee31813 (patch)
tree	0bfa8b9b7f2b340b5c7d69632af15f385996f988 /src/setup/wix-cli
parent	24d9e661a9613b3a52c37d00e4e44171b9afd998 (diff)
download	wix-40df304afe43fcd546b5b817bcad63168ee31813.tar.gz wix-40df304afe43fcd546b5b817bcad63168ee31813.tar.bz2 wix-40df304afe43fcd546b5b817bcad63168ee31813.zip

diff --git a/src/setup/wix-cli/Package.wxs b/src/setup/wix-cli/Package.wxs new file mode 100644 index 00000000..9c193130 --- /dev/null +++ b/src/setup/wix-cli/Package.wxs
@@ -0,0 +1,81 @@
	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 Command-Line Tools" Manufacturer="WiX Toolset" Version="!(bind.fileVersion.WixExe)" UpgradeCode="2e85dc76-769f-46d2-82a7-46cb3a0c9d50">
	4	<MediaTemplate EmbedCab="yes" />
	5
	6	<ComponentGroupRef Id="BinaryFiles" />
	7	<ComponentGroupRef Id="ExtensionFiles" />
	8
	9	<Property Id="ARPURLINFOABOUT" Value="https://wixtoolset.org/" />
	10	<Property Id="ARPHELPLINK" Value="https://wixtoolset.org/docs/gethelp/" />
	11	<SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLFOLDER]" After="CostFinalize" />
	12	</Package>
	13
	14	<Fragment>
	15	<ComponentGroup Id="BinaryFiles" Directory="BinFolder">
	16	<Component>
	17	<File Id="WixExe" Source="!(bindpath.Files)\wix.exe" />
	18	<File Source="!(bindpath.Files)\wix.exe.config" />
	19
	20	<Environment Name="PATH" Value="[BinFolder]" Action="set" Part ="last" System="yes" />
	21	<Environment Name="WIX$(SetupMajorVersion)" Value="[BinFolder]" Action="set" System="yes" />
	22	</Component>
	23
	24	<Files Include="!(bindpath.Files)\**">
	25	<Exclude Files="!(bindpath.Files)\wix.exe*" />
	26	<Exclude Files="!(bindpath.Files)\*\.xml" />
	27	<Exclude Files="!(bindpath.Files)\*\.targets" />
	28	</Files>
	29
	30	<Files Include="!(bindpath.Heat_x64)\**" Subdirectory="x64" />
	31	<Files Include="!(bindpath.Heat_x86)\**" Subdirectory="x86" />
	32	</ComponentGroup>
	33	</Fragment>
	34
	35	<Fragment>
	36	<ComponentGroup Id="ExtensionFiles" Directory="ExtensionFolder">
	37	<File Subdirectory="WixToolset.BootstrapperApplications.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	38	Source="WixToolset.BootstrapperApplications.wixext.dll" />
	39	<File Subdirectory="WixToolset.ComPlus.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	40	Source="WixToolset.ComPlus.wixext.dll" />
	41	<File Subdirectory="WixToolset.Dependency.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	42	Source="WixToolset.Dependency.wixext.dll" />
	43	<File Subdirectory="WixToolset.DirectX.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	44	Source="WixToolset.DirectX.wixext.dll" />
	45	<File Subdirectory="WixToolset.Firewall.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	46	Source="WixToolset.Firewall.wixext.dll" />
	47	<File Subdirectory="WixToolset.Http.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	48	Source="WixToolset.Http.wixext.dll" />
	49	<File Subdirectory="WixToolset.Iis.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	50	Source="WixToolset.Iis.wixext.dll" />
	51	<File Subdirectory="WixToolset.Msmq.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	52	Source="WixToolset.Msmq.wixext.dll" />
	53	<File Subdirectory="WixToolset.NetFx.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	54	Source="WixToolset.NetFx.wixext.dll" />
	55	<File Subdirectory="WixToolset.PowerShell.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	56	Source="WixToolset.PowerShell.wixext.dll" />
	57	<File Subdirectory="WixToolset.Sql.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	58	Source="WixToolset.Sql.wixext.dll" />
	59	<File Subdirectory="WixToolset.UI.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	60	Source="WixToolset.UI.wixext.dll" />
	61	<File Subdirectory="WixToolset.Util.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	62	Source="WixToolset.Util.wixext.dll" />
	63	<File Subdirectory="WixToolset.VisualStudio.wixext\$(SetupMajorMinorPatchVersion)\wixext$(SetupMajorVersion)"
	64	Source="WixToolset.VisualStudio.wixext.dll" />
	65	</ComponentGroup>
	66	</Fragment>
	67
	68	<Fragment>
	69	<StandardDirectory Id="ProgramFiles64Folder">
	70	<Directory Id="INSTALLFOLDER" Name="WiX Toolset v$(SetupMajorMinorVersion)">
	71	<Directory Id="BinFolder" Name="bin" />
	72	</Directory>
	73	</StandardDirectory>
	74	</Fragment>
	75
	76	<Fragment>
	77	<StandardDirectory Id="CommonFiles64Folder">
	78	<Directory Id="ExtensionFolder" Name="WixToolset\extensions" />
	79	</StandardDirectory>
	80	</Fragment>
	81	</Wix>


diff --git a/src/setup/wix-cli/wix-cli.wixproj b/src/setup/wix-cli/wix-cli.wixproj new file mode 100644 index 00000000..35457460 --- /dev/null +++ b/src/setup/wix-cli/wix-cli.wixproj
@@ -0,0 +1,36 @@
	1	<?xml version="1.0" encoding="utf-8"?>
	2	<Project Sdk="WixToolset.Sdk">
	3	<PropertyGroup>
	4	<Platform>x64</Platform>
	5	<OutputName>wix-cli-$(Platform)</OutputName>
	6	<OutputPath>$(PackageOutputPath)</OutputPath>
	7	<SignOutput>true</SignOutput>
	8	</PropertyGroup>
	9
	10	<ItemGroup>
	11	<BindPath BindName="Files" Include="$(RootBuildFolder)wix\$(Configuration)\net472\win-$(Platform)" />
	12	<BindPath BindName="Heat_x64" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x64\" />
	13	<BindPath BindName="Heat_x86" Include="$(RootBuildFolder)tools\$(Configuration)\net472\win-x86\" />
	14
	15	<BindPath Include="$(RootBuildFolder)Bal.wixext\$(Configuration)\netstandard2.0\" />
	16	<BindPath Include="$(RootBuildFolder)ComPlus.wixext\$(Configuration)\netstandard2.0\" />
	17	<BindPath Include="$(RootBuildFolder)Dependency.wixext\$(Configuration)\netstandard2.0\" />
	18	<BindPath Include="$(RootBuildFolder)DirectX.wixext\$(Configuration)\netstandard2.0\" />
	19	<BindPath Include="$(RootBuildFolder)Firewall.wixext\$(Configuration)\netstandard2.0\" />
	20	<BindPath Include="$(RootBuildFolder)Http.wixext\$(Configuration)\netstandard2.0\" />
	21	<BindPath Include="$(RootBuildFolder)Iis.wixext\$(Configuration)\netstandard2.0\" />
	22	<BindPath Include="$(RootBuildFolder)Msmq.wixext\$(Configuration)\netstandard2.0\" />
	23	<BindPath Include="$(RootBuildFolder)NetFx.wixext\$(Configuration)\netstandard2.0\" />
	24	<BindPath Include="$(RootBuildFolder)PowerShell.wixext\$(Configuration)\netstandard2.0\" />
	25	<BindPath Include="$(RootBuildFolder)Sql.wixext\$(Configuration)\netstandard2.0\" />
	26	<BindPath Include="$(RootBuildFolder)UI.wixext\$(Configuration)\netstandard2.0\" />
	27	<BindPath Include="$(RootBuildFolder)Util.wixext\$(Configuration)\netstandard2.0\" />
	28	<BindPath Include="$(RootBuildFolder)VisualStudio.wixext\$(Configuration)\netstandard2.0\" />
	29	</ItemGroup>
	30
	31	<UsingTask TaskName="GenerateMetadata" AssemblyFile="$(BaseOutputPath)$(Configuration)\net472\MetadataTask.dll" />
	32
	33	<Target Name="GenerateMetadata" AfterTargets="AfterBuild">
	34	<GenerateMetadata TargetFile="$(TargetPath)" WixpdbFile="$(TargetPdbPath)" />
	35	</Target>
	36	</Project>