From 5d8b88e2ece982a54a81b9b5a1000db57d6e1ac5 Mon Sep 17 00:00:00 2001
From: Akinwale Alagbe <akalagbe@microsoft.com>
Date: Wed, 11 Oct 2023 13:01:59 -0700
Subject: [PATCH] Add missing manifest fields

---
 .../V1/InstallerInstallationMetadata.cs       | 25 +++++++++++
 .../V1/InstallerNestedInstallerFile.cs        | 19 ++++++++
 src/WinGetUtilInterop/Manifest/V1/Manifest.cs | 31 +++++++++++++
 .../Manifest/V1/ManifestInstaller.cs          | 30 +++++++++++++
 .../Manifest/V1/ManifestInstallerFile.cs      | 43 +++++++++++++++++++
 5 files changed, 148 insertions(+)
 create mode 100644 src/WinGetUtilInterop/Manifest/V1/InstallerInstallationMetadata.cs
 create mode 100644 src/WinGetUtilInterop/Manifest/V1/InstallerNestedInstallerFile.cs
 create mode 100644 src/WinGetUtilInterop/Manifest/V1/ManifestInstallerFile.cs

diff --git a/src/WinGetUtilInterop/Manifest/V1/InstallerInstallationMetadata.cs b/src/WinGetUtilInterop/Manifest/V1/InstallerInstallationMetadata.cs
new file mode 100644
index 0000000000..68b017e845
--- /dev/null
+++ b/src/WinGetUtilInterop/Manifest/V1/InstallerInstallationMetadata.cs
@@ -0,0 +1,25 @@
+// -----------------------------------------------------------------------
+// <copyright file="InstallerInstallationMetadata.cs" company="Microsoft Corporation">
+//     Copyright (c) Microsoft Corporation. All rights reserved.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Microsoft.WinGetUtil.Models.V1
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Text;
+
+    public class InstallerInstallationMetadata
+    {
+        /// <summary>
+        /// Gets or sets the default install location.
+        /// </summary>
+        public string DefaultInstallLocation { get; set; }
+
+        /// <summary>
+        /// Gets or sets the manifest installer files.
+        /// </summary>
+        public List<ManifestInstallerFile> Files { get; set; }
+    }
+}
diff --git a/src/WinGetUtilInterop/Manifest/V1/InstallerNestedInstallerFile.cs b/src/WinGetUtilInterop/Manifest/V1/InstallerNestedInstallerFile.cs
new file mode 100644
index 0000000000..89842ac75f
--- /dev/null
+++ b/src/WinGetUtilInterop/Manifest/V1/InstallerNestedInstallerFile.cs
@@ -0,0 +1,19 @@
+using System;
+using System.Collections.Generic;
+using System.Text;
+
+namespace Microsoft.WinGetUtil.Models.V1
+{
+    public class InstallerNestedInstallerFile
+    {
+        /// <summary>
+        /// Gets or sets relative file part.
+        /// </summary>
+        public string RelativeFilePath { get; set; }
+
+        /// <summary>
+        /// Gets or set portable command alias.
+        /// </summary>
+        public string PortableCommandAlias { get; set; }
+    }
+}
diff --git a/src/WinGetUtilInterop/Manifest/V1/Manifest.cs b/src/WinGetUtilInterop/Manifest/V1/Manifest.cs
index e319438420..dd7e7066a7 100644
--- a/src/WinGetUtilInterop/Manifest/V1/Manifest.cs
+++ b/src/WinGetUtilInterop/Manifest/V1/Manifest.cs
@@ -210,6 +210,7 @@ public class Manifest
         /// </summary>
         public string ProductCode { get; set; }
 
+        /// <summary>
         /// <summary>
         /// Gets or sets the default list of capabilities. For msix only.
         /// </summary>
@@ -236,6 +237,31 @@ public class Manifest
         /// </summary>
         public InstallerMarkets Markets { get; set; }
 
+        /// <summary>
+        /// Gets or sets the installation metadata.
+        /// </summary>
+        public InstallerInstallationMetadata InstallationMetadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets the nested installer type.
+        /// </summary>
+        public string NestedInstallerType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the nested installer files.
+        /// </summary>
+        public List<InstallerNestedInstallerFile> NestedInstallerFiles { get; set; }
+
+        /// <summary>
+        /// Gets or sets the excluded markets.
+        /// </summary>
+        public string ExcludedMarkets { get; set; }
+
+        /// <summary>
+        /// Gets or sets the unsupported arguments.
+        /// </summary>
+        public List<string> UnsupportedArguments { get; set; }
+
         /// <summary>
         /// Gets or sets a value indicating whether the default installer behavior aborts terminal.
         /// </summary>
@@ -261,6 +287,11 @@ public class Manifest
         /// </summary>
         public List<string> UnsupportedOSArchitectures { get; set; }
 
+        /// <summary>
+        /// Gets or sets a value indicating whether to display install warnings.
+        /// </summary>
+        public bool DisplayInstallWarnings { get; set; }
+
         /// <summary>
         /// Gets or sets the default list of apps and features entries.
         /// </summary>
diff --git a/src/WinGetUtilInterop/Manifest/V1/ManifestInstaller.cs b/src/WinGetUtilInterop/Manifest/V1/ManifestInstaller.cs
index cbfefee9aa..d8ce4d1aa5 100644
--- a/src/WinGetUtilInterop/Manifest/V1/ManifestInstaller.cs
+++ b/src/WinGetUtilInterop/Manifest/V1/ManifestInstaller.cs
@@ -169,6 +169,36 @@ public class ManifestInstaller
         /// </summary>
         public List<InstallerExpectedReturnCode> ExpectedReturnCodes { get; set; }
 
+        /// <summary>
+        /// Gets or sets the installation metadata.
+        /// </summary>
+        public InstallerInstallationMetadata InstallationMetadata { get; set; }
+
+        /// <summary>
+        /// Gets or sets the nested installer type.
+        /// </summary>
+        public string NestedInstallerType { get; set; }
+
+        /// <summary>
+        /// Gets or sets the nested installer files.
+        /// </summary>
+        public List<InstallerNestedInstallerFile> NestedInstallerFiles { get; set; }
+
+        /// <summary>
+        /// Gets or sets the excluded markets.
+        /// </summary>
+        public string ExcludedMarkets { get; set; }
+
+        /// <summary>
+        /// Gets or sets the unsupported arguments.
+        /// </summary>
+        public List<string> UnsupportedArguments { get; set; }
+
+        /// <summary>
+        /// Gets or sets a value indicating whether to display install warnings.
+        /// </summary>
+        public bool DisplayInstallWarnings { get; set; }
+
         /// <summary>
         /// Returns a List of strings containing the URIs contained within this installer.
         /// </summary>
diff --git a/src/WinGetUtilInterop/Manifest/V1/ManifestInstallerFile.cs b/src/WinGetUtilInterop/Manifest/V1/ManifestInstallerFile.cs
new file mode 100644
index 0000000000..03f736f935
--- /dev/null
+++ b/src/WinGetUtilInterop/Manifest/V1/ManifestInstallerFile.cs
@@ -0,0 +1,43 @@
+// -----------------------------------------------------------------------
+// <copyright file="ManifestInstallationMetadata.cs" company="Microsoft Corporation">
+//     Copyright (c) Microsoft Corporation. All rights reserved.
+// </copyright>
+// -----------------------------------------------------------------------
+
+namespace Microsoft.WinGetUtil.Models.V1
+{
+    using System;
+    using System.Collections.Generic;
+    using System.Text;
+
+    /// <summary>
+    /// Represents an installer file.
+    /// </summary>
+    public class ManifestInstallerFile
+    {
+        /// <summary>
+        /// Gets or sets relative file path.
+        /// </summary>
+        public string RelativeFilePath { get; set; }
+
+        /// <summary>
+        /// Gets or sets file sha256.
+        /// </summary>
+        public string FileSha256 { get; set; }
+
+        /// <summary>
+        /// Gets or sets file type.
+        /// </summary>
+        public string FileType { get; set; }
+
+        /// <summary>
+        /// Gets or sets invocation parameter.
+        /// </summary>
+        public string InvocationParameter { get; set; }
+
+        /// <summary>
+        /// Gets or sets display name.
+        /// </summary>
+        public string DisplayName { get; set; }
+    }
+}