10 files changed, 224 insertions, 11 deletions

diff --git a/src/Directory.wixproj.props b/src/Directory.wixproj.props
index 73ac652f..1191bd66 100644
--- a/src/Directory.wixproj.props
+++ b/src/Directory.wixproj.props
@@ -3,7 +3,8 @@
 
 <Project>
   <PropertyGroup>
-    <!-- TODO: changing the .wixpdb folder does not actually work until issue #6857 is resolved -->
+    <!-- TODO: changing the .wixpdb folder does not actually work until issue #6857 is resolved
     <PdbOutputDir>$(PdbsFolder)</PdbOutputDir>
+    -->
   </PropertyGroup>
 </Project>
diff --git a/src/Directory.wixproj.targets b/src/Directory.wixproj.targets
index bac132ec..c9fb4f5c 100644
--- a/src/Directory.wixproj.targets
+++ b/src/Directory.wixproj.targets
@@ -8,7 +8,7 @@
     <PropertyGroup>
       <DefineConstants>
         $(DefineConstants);
-        SetupVersion=$(FileVersion);
+        SetupVersion=$(PackageVersion);
         SetupMajorMinorVersion=$(GitBaseVersionMajor).$(GitBaseVersionMinor);
       </DefineConstants>
     </PropertyGroup>
diff --git a/src/internal/SetBuildNumber/Directory.Packages.props.pp b/src/internal/SetBuildNumber/Directory.Packages.props.pp
index 91337de7..f910ba53 100644
--- a/src/internal/SetBuildNumber/Directory.Packages.props.pp
+++ b/src/internal/SetBuildNumber/Directory.Packages.props.pp
@@ -47,6 +47,7 @@
     <PackageVersion Include="System.Reflection.Metadata" Version="1.6.0" />
     <PackageVersion Include="System.Security.Principal.Windows" Version="4.7.0" />
     <PackageVersion Include="System.Text.Encoding.CodePages" Version="4.6.0" />
+    <PackageVersion Include="System.Text.Json" Version="4.6.0" />
 
     <PackageVersion Include="Microsoft.AspNetCore.Owin" Version="3.1.13" />
     <PackageVersion Include="Microsoft.CodeAnalysis.Analyzers" Version="3.3.3" />
diff --git a/src/setup/Directory.Build.props b/src/setup/Directory.Build.props
index cbf8ecc9..df00142d 100644
--- a/src/setup/Directory.Build.props
+++ b/src/setup/Directory.Build.props
@@ -7,8 +7,4 @@
   </PropertyGroup>
 
   <Import Project="..\Directory.Build.props" />
-
-  <PropertyGroup>
-    <PublishRoot>$(OutputPath)publish\</PublishRoot>
-  </PropertyGroup>
 </Project>
diff --git a/src/setup/MetadataTask/GenerateMetadata.cs b/src/setup/MetadataTask/GenerateMetadata.cs
new file mode 100644
index 00000000..4071c271
--- /dev/null
+++ b/src/setup/MetadataTask/GenerateMetadata.cs
@@ -0,0 +1,113 @@
+// 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.
+
+namespace WixToolset.Tasks
+{
+    using System;
+    using System.Collections.Generic;
+    using System.IO;
+    using System.Linq;
+    using System.Security.Cryptography;
+    using System.Text.Json;
+    using System.Text.Json.Serialization;
+    using Microsoft.Build.Framework;
+    using Microsoft.Build.Utilities;
+    using WixToolset.Data;
+    using WixToolset.Data.Symbols;
+
+    public class GenerateMetadata : Task
+    {
+        private static readonly JsonSerializerOptions SerializerOptions = new JsonSerializerOptions
+        {
+            PropertyNamingPolicy = JsonNamingPolicy.CamelCase,
+            IgnoreNullValues = true,
+            WriteIndented = true,
+            Converters = { new JsonStringEnumConverter(JsonNamingPolicy.CamelCase) },
+        };
+
+        [Required]
+        public string TargetFile { get; set; }
+
+        [Required]
+        public string WixpdbFile { get; set; }
+
+        public override bool Execute()
+        {
+            var intermediate = Intermediate.Load(this.WixpdbFile);
+
+            var section = intermediate.Sections.Single();
+
+            if (section.Type != SectionType.Bundle)
+            {
+                return false;
+            }
+
+            (var metadata, var sourceLineNumber) = this.GetBundleMetadata(section);
+
+            if (metadata != null)
+            {
+                this.PopulateFileInfo(metadata);
+
+                this.SaveMetadata(metadata, sourceLineNumber);
+            }
+
+            return true;
+        }
+
+        private (Metadata, SourceLineNumber) GetBundleMetadata(IntermediateSection section)
+        {
+            var bundleSymbol = section.Symbols.OfType<WixBundleSymbol>().Single();
+
+            var metadata = new Metadata
+            {
+                Type = MetadataType.Burn,
+                Name = bundleSymbol.Name,
+                Version = bundleSymbol.Version,
+                Publisher = bundleSymbol.Manufacturer,
+                Description = "Installation for " + bundleSymbol.Name,
+                SupportUrl = bundleSymbol.HelpUrl,
+                BundleCode = bundleSymbol.BundleId,
+                UpgradeCode = bundleSymbol.UpgradeCode,
+                AboutUrl = bundleSymbol.AboutUrl,
+                Architecture = PlatformToArchitecture(bundleSymbol.Platform),
+            };
+
+            return (metadata, bundleSymbol.SourceLineNumbers);
+        }
+
+        private void PopulateFileInfo(Metadata metadata)
+        {
+            var fi = new FileInfo(this.TargetFile);
+
+            using (var sha256 = SHA256.Create())
+            using (var stream = fi.OpenRead())
+            {
+                var hash = sha256.ComputeHash(stream);
+
+                metadata.File = fi.Name;
+                metadata.Created = fi.CreationTimeUtc.ToString("O");
+                metadata.Size = fi.Length;
+                metadata.Sha256 = BitConverter.ToString(hash).Replace("-", String.Empty);
+            }
+        }
+
+        private void SaveMetadata(Metadata metadata, SourceLineNumber sourceLineNumber)
+        {
+            var metadataFilePath = Path.ChangeExtension(this.TargetFile, "metadata.json");
+
+            var json = JsonSerializer.Serialize(metadata, SerializerOptions);
+
+            File.WriteAllText(metadataFilePath, json);
+        }
+
+        private static ArchitectureType PlatformToArchitecture(Platform platform)
+        {
+            switch (platform)
+            {
+                case Platform.X86: return ArchitectureType.X86;
+                case Platform.X64: return ArchitectureType.X86;
+                case Platform.ARM64: return ArchitectureType.X86;
+                default: throw new ArgumentException($"Unknown platform {platform}");
+            }
+        }
+    }
+}
diff --git a/src/setup/MetadataTask/Metadata.cs b/src/setup/MetadataTask/Metadata.cs
new file mode 100644
index 00000000..139d9240
--- /dev/null
+++ b/src/setup/MetadataTask/Metadata.cs
@@ -0,0 +1,78 @@
+// 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.
+
+namespace WixToolset.Tasks
+{
+    public enum MetadataType
+    {
+        Unknown,
+        Burn,
+        Msi,
+    }
+
+    public enum ArchitectureType
+    {
+        Unknown,
+        Arm64,
+        X64,
+        X86,
+    }
+
+    //{
+    //  "id": [PackageSymbolId] | [BundleSymbolId],
+    //  "type": "msi" | "burn"
+    //  "name": [ProductName] | [BundleName]
+    //  "locale": [ProductLanguage] | [BundleLanguage]
+    //  "publisher": [Manufacturer]
+    //  "aboutUrl": [ARPURLINFOABOUT] | [AboutUrl]
+    //  "supportUrl": [ARPHELPLINK] | [SupportUrl]
+    //  "description": [ARPCOMMENTS] | "Installation for" + [BundleName]
+    //  "license": [ProductLicense] | [BundleLicense]
+    //  "architecture": "x86" | "x64" | "arm64"
+    //  "size": ####
+    //  "sha256": hex,
+    //  "file": <filename>
+    //  "created": <ISO timestamp>
+    //  "productCode": [ProductCode]
+    //  "bundleCode": [BundleId]
+    //  "upgradeCode": [UpgradeCode]
+    //}
+
+    public class Metadata
+    {
+        public string Id { get; set; }
+
+        public MetadataType Type { get; set; }
+
+        public string Name { get; set; }
+
+        public string Version { get; set; }
+
+        public string Locale { get; set; }
+
+        public string Publisher { get; set; }
+
+        public string AboutUrl { get; set; }
+
+        public string SupportUrl { get; set; }
+
+        public string Description { get; set; }
+
+        public string License { get; set; }
+
+        public ArchitectureType Architecture { get; set; }
+
+        public string File { get; set; }
+
+        public long Size { get; set; }
+
+        public string Sha256 { get; set; }
+
+        public string Created { get; set; }
+
+        public string ProductCode { get; set; }
+
+        public string BundleCode { get; set; }
+
+        public string UpgradeCode { get; set; }
+    }
+}
diff --git a/src/setup/MetadataTask/MetadataTask.csproj b/src/setup/MetadataTask/MetadataTask.csproj
new file mode 100644
index 00000000..2146a591
--- /dev/null
+++ b/src/setup/MetadataTask/MetadataTask.csproj
@@ -0,0 +1,14 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+    <DebugType>embedded</DebugType>
+    <!-- https://github.com/Microsoft/msbuild/issues/2360 -->
+    <PlatformTarget>AnyCPU</PlatformTarget>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Microsoft.Build.Tasks.Core" />
+    <PackageReference Include="System.Text.Json" />
+    <PackageReference Include="WixToolset.Data" />
+  </ItemGroup>
+</Project>
diff --git a/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj
index 2d2347b3..aca83108 100644
--- a/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj
+++ b/src/setup/WixAdditionalTools/WixAdditionalTools.wixproj
@@ -14,4 +14,9 @@
     <PackageReference Include="GitInfo" PrivateAssets="All" />
   </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/setup/setup.cmd b/src/setup/setup.cmd
index 8096792b..8a7b01c9 100644
--- a/src/setup/setup.cmd
+++ b/src/setup/setup.cmd
@@ -17,6 +17,8 @@
 @echo Building setup %_C%
 
 :: Build
+msbuild -Restore MetadataTask\MetadataTask.csproj -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\setup_task.binlog || exit /b
+
 msbuild -Restore setup.sln -p:Configuration=%_C% -nologo -m -warnaserror -bl:%_L%\setup_build.binlog || exit /b
 
 :: Publish
diff --git a/src/setup/setup.sln b/src/setup/setup.sln
index 3998623e..1f3c0cd5 100644
--- a/src/setup/setup.sln
+++ b/src/setup/setup.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.30114.105
+# Visual Studio Version 17
+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
@@ -12,9 +12,6 @@ Global
                 Debug|Any CPU = Debug|Any CPU
                 Release|Any CPU = Release|Any CPU
         EndGlobalSection
-        GlobalSection(SolutionProperties) = preSolution
-                HideSolutionNode = FALSE
-        EndGlobalSection
         GlobalSection(ProjectConfigurationPlatforms) = postSolution
                 {F8C12838-DEC5-4CA5-97A8-DFE2247564C5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
                 {F8C12838-DEC5-4CA5-97A8-DFE2247564C5}.Debug|Any CPU.Build.0 = Debug|Any CPU
@@ -25,4 +22,10 @@ Global
                 {59FF3AD3-339A-4048-9F0B-504EE74BC4AF}.Release|Any CPU.ActiveCfg = Release|Any CPU
                 {59FF3AD3-339A-4048-9F0B-504EE74BC4AF}.Release|Any CPU.Build.0 = Release|Any CPU
         EndGlobalSection
+        GlobalSection(SolutionProperties) = preSolution
+                HideSolutionNode = FALSE
+        EndGlobalSection
+        GlobalSection(ExtensibilityGlobals) = postSolution
+                SolutionGuid = {1E2BB345-987B-4108-8EB9-10D703F02EFC}
+        EndGlobalSection
 EndGlobal