7 files changed, 195 insertions, 6 deletions

diff --git a/src/Directory.wixproj.targets b/src/Directory.wixproj.targets
index 4b95db87..b36bca75 100644
--- a/src/Directory.wixproj.targets
+++ b/src/Directory.wixproj.targets
@@ -10,7 +10,9 @@
       <DefineConstants>
         $(DefineConstants);
         SetupVersion=$(PackageVersion);
+        SetupMajorVersion=$(SomeVerInfoMajor);
         SetupMajorMinorVersion=$(SomeVerInfoMajor).$(SomeVerInfoMinor);
+        SetupMajorMinorPatchVersion=$(SomeVerInfoMajor).$(SomeVerInfoMinor).$(SomeVerInfoPatch);
         SetupDashedMajorMinorVersion=$(SomeVerInfoMajor)-$(SomeVerInfoMinor);
         SetupDashedPrerelease=$(PrereleaseSuffix)
       </DefineConstants>
diff --git a/src/setup/MetadataTask/GenerateMetadata.cs b/src/setup/MetadataTask/GenerateMetadata.cs
index 65e6f7a4..645b7750 100644
--- a/src/setup/MetadataTask/GenerateMetadata.cs
+++ b/src/setup/MetadataTask/GenerateMetadata.cs
@@ -36,13 +36,22 @@ namespace WixToolset.Tasks
 
             var section = intermediate.Sections.Single();
 
-            if (section.Type != SectionType.Bundle)
+            Metadata metadata;
+            SourceLineNumber sourceLineNumber;
+
+            if (section.Type == SectionType.Bundle)
+            {
+                (metadata, sourceLineNumber) = this.GetBundleMetadata(section, "WixToolset.AdditionalTools");
+            }
+            else if (section.Type == SectionType.Package)
+            {
+                (metadata, sourceLineNumber) = this.GetPackageMetadata(section, "WixToolset.CommandLineTools");
+            }
+            else
             {
                 return false;
             }
 
-            (var metadata, var sourceLineNumber) = this.GetBundleMetadata(section);
-
             if (metadata != null)
             {
                 this.PopulateFileInfo(metadata);
@@ -53,13 +62,13 @@ namespace WixToolset.Tasks
             return true;
         }
 
-        private (Metadata, SourceLineNumber) GetBundleMetadata(IntermediateSection section)
+        private (Metadata, SourceLineNumber) GetBundleMetadata(IntermediateSection section, string defaultId)
         {
             var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
 
             var metadata = new Metadata
             {
-                Id = "WixToolset.AdditionalTools",
+                Id = bundleSymbol.Id?.Id ?? defaultId,
                 Type = MetadataType.Burn,
                 Name = bundleSymbol.Name,
                 Version = bundleSymbol.Version,
@@ -76,6 +85,31 @@ namespace WixToolset.Tasks
             return (metadata, bundleSymbol.SourceLineNumbers);
         }
 
+        private (Metadata, SourceLineNumber) GetPackageMetadata(IntermediateSection section, string defaultId)
+        {
+            var packageSymbol = section.Symbols.OfType<WixPackageSymbol>().Single();
+            var propertySymbols = section.Symbols.OfType<PropertySymbol>().ToDictionary(p => p.Id.Id);
+            var platform = GetPlatformFromSummaryInformation(section.Symbols.OfType<SummaryInformationSymbol>());
+
+            var metadata = new Metadata
+            {
+                Id = packageSymbol.Id?.Id ?? defaultId,
+                Type = MetadataType.Msi,
+                Name = packageSymbol.Name,
+                Version = packageSymbol.Version,
+                Publisher = packageSymbol.Manufacturer,
+                Description = "Installation for " + packageSymbol.Name,
+                License = "MS-RL",
+                SupportUrl = propertySymbols["ARPHELPLINK"].Value,
+                ProductCode = propertySymbols["ProductCode"].Value,
+                UpgradeCode = propertySymbols["UpgradeCode"].Value,
+                AboutUrl = propertySymbols["ARPURLINFOABOUT"].Value,
+                Architecture = PlatformToArchitecture(platform),
+            };
+
+            return (metadata, packageSymbol.SourceLineNumbers);
+        }
+
         private void PopulateFileInfo(Metadata metadata)
         {
             var fi = new FileInfo(this.TargetFile);
@@ -101,6 +135,34 @@ namespace WixToolset.Tasks
             File.WriteAllText(metadataFilePath, json);
         }
 
+        private static Platform GetPlatformFromSummaryInformation(IEnumerable<SummaryInformationSymbol> symbols)
+        {
+            foreach (var symbol in symbols)
+            {
+                if (symbol.PropertyId == SummaryInformationType.PlatformAndLanguage)
+                {
+                    var value = symbol.Value;
+                    var separatorIndex = value.IndexOf(';');
+                    var platformValue = separatorIndex > 0 ? value.Substring(0, separatorIndex) : value;
+
+                    switch (platformValue)
+                    {
+                        case "x64":
+                            return Platform.X64;
+
+                        case "Arm64":
+                            return Platform.ARM64;
+
+                        case "Intel":
+                        default:
+                            return Platform.X86;
+                    }
+                }
+            }
+
+            return Platform.X86;
+        }
+
         private static ArchitectureType PlatformToArchitecture(Platform platform)
         {
             switch (platform)
diff --git a/src/setup/setup.cmd b/src/setup/setup.cmd
index 2bd82ebd..2b44b8db 100644
--- a/src/setup/setup.cmd
+++ b/src/setup/setup.cmd
@@ -35,7 +35,9 @@ msbuild -Restore setup.sln -p:Configuration=%_C% -tl -nologo -m -warnaserror -bl
 
 :clean
 @rd /s/q "..\..\build\setup" 2> nul
+@del "..\..\build\artifacts\wix-cli-x64.*" 2> nul
 @del "..\..\build\artifacts\WixAdditionalTools.*" 2> nul
+@del "..\..\build\logs\pdbs\%_C%\wix-cli-x64.*" 2> nul
 @del "..\..\build\logs\pdbs\%_C%\WixAdditionalTools.*" 2> nul
 @exit /b
 
diff --git a/src/setup/setup.sln b/src/setup/setup.sln
index 1f3c0cd5..3f6b1b43 100644
--- a/src/setup/setup.sln
+++ b/src/setup/setup.sln
@@ -5,6 +5,8 @@ VisualStudioVersion = 17.2.32630.192
 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}") = "wix-cli", "wix-cli\wix-cli.wixproj", "{69C043AF-F9D4-427D-A954-D0362DF25E6E}"
+EndProject
 Project("{B7DD6F7E-DEF8-4E67-B5B7-07EF123DB6F0}") = "WixAdditionalTools", "WixAdditionalTools\WixAdditionalTools.wixproj", "{59FF3AD3-339A-4048-9F0B-504EE74BC4AF}"
 EndProject
 Global
@@ -17,6 +19,10 @@ Global
                 {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
+                {69C043AF-F9D4-427D-A954-D0362DF25E6E}.Debug|Any CPU.ActiveCfg = Debug|x64
+                {69C043AF-F9D4-427D-A954-D0362DF25E6E}.Debug|Any CPU.Build.0 = Debug|x64
+                {69C043AF-F9D4-427D-A954-D0362DF25E6E}.Release|Any CPU.ActiveCfg = Release|x64
+                {69C043AF-F9D4-427D-A954-D0362DF25E6E}.Release|Any CPU.Build.0 = Release|x64
                 {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
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>
diff --git a/src/wix/WixToolset.Core/CommandLine/CommandLine.cs b/src/wix/WixToolset.Core/CommandLine/CommandLine.cs
index bbe985f8..d6e0e0ae 100644
--- a/src/wix/WixToolset.Core/CommandLine/CommandLine.cs
+++ b/src/wix/WixToolset.Core/CommandLine/CommandLine.cs
@@ -56,7 +56,7 @@ namespace WixToolset.Core.CommandLine
             if (!this.SuppressLogo && command?.ShowLogo == true)
             {
                 var branding = this.ServiceProvider.GetService<IWixBranding>();
-                Console.WriteLine(branding.ReplacePlaceholders("[AssemblyProduct] [AssemblyDescription] version [ProductVersion]"));
+                Console.WriteLine(branding.ReplacePlaceholders("[AssemblyProduct] version [ProductVersion]"));
                 Console.WriteLine(branding.ReplacePlaceholders("[AssemblyCopyright]"));
                 Console.WriteLine();
             }