Absorb Dependency.wixext into Data

Partly resolves wixtoolset/issues#5949

6 files changed, 187 insertions, 4 deletions

diff --git a/src/WixToolset.Data/Symbols/SymbolDefinitions.cs b/src/WixToolset.Data/Symbols/SymbolDefinitions.cs
index cfee33b7..a224b742 100644
--- a/src/WixToolset.Data/Symbols/SymbolDefinitions.cs
+++ b/src/WixToolset.Data/Symbols/SymbolDefinitions.cs
@@ -154,6 +154,8 @@ namespace WixToolset.Data
         WixCustomTableColumn,
         WixDeltaPatchFile,
         WixDeltaPatchSymbolPaths,
+        WixDependency,
+        WixDependencyRef,
         WixDependencyProvider,
         WixEnsureTable,
         WixFeatureGroup,
@@ -650,6 +652,12 @@ namespace WixToolset.Data
                 case SymbolDefinitionType.WixDeltaPatchSymbolPaths:
                     return SymbolDefinitions.WixDeltaPatchSymbolPaths;
 
+                case SymbolDefinitionType.WixDependency:
+                    return SymbolDefinitions.WixDependency;
+
+                case SymbolDefinitionType.WixDependencyRef:
+                    return SymbolDefinitions.WixDependencyRef;
+
                 case SymbolDefinitionType.WixEnsureTable:
                     return SymbolDefinitions.WixEnsureTable;
 
diff --git a/src/WixToolset.Data/Symbols/WixDeltaPatchSymbolPathsSymbol.cs b/src/WixToolset.Data/Symbols/WixDeltaPatchSymbolPathsSymbol.cs
index 6e50d07f..20f30da4 100644
--- a/src/WixToolset.Data/Symbols/WixDeltaPatchSymbolPathsSymbol.cs
+++ b/src/WixToolset.Data/Symbols/WixDeltaPatchSymbolPathsSymbol.cs
@@ -1,7 +1,5 @@
 // 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.
 
-using System;
-
 namespace WixToolset.Data
 {
     using WixToolset.Data.Symbols;
@@ -72,4 +70,4 @@ namespace WixToolset.Data.Symbols
             set => this.Set((int)WixDeltaPatchSymbolPathsSymbolFields.SymbolPaths, value);
         }
     }
-}
\ No newline at end of file
+}
diff --git a/src/WixToolset.Data/Symbols/WixDependencyProviderSymbol.cs b/src/WixToolset.Data/Symbols/WixDependencyProviderSymbol.cs
index 3ede1097..a4604a9c 100644
--- a/src/WixToolset.Data/Symbols/WixDependencyProviderSymbol.cs
+++ b/src/WixToolset.Data/Symbols/WixDependencyProviderSymbol.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Data
     public static partial class SymbolDefinitions
     {
         public static readonly IntermediateSymbolDefinition WixDependencyProvider = new IntermediateSymbolDefinition(
-            SymbolDefinitionType.WixDependencyProvider.ToString(),
+            SymbolDefinitionType.WixDependencyProvider,
             new[]
             {
                 new IntermediateFieldDefinition(nameof(WixDependencyProviderSymbolFields.ComponentRef), IntermediateFieldType.String),
diff --git a/src/WixToolset.Data/Symbols/WixDependencyRefSymbol.cs b/src/WixToolset.Data/Symbols/WixDependencyRefSymbol.cs
new file mode 100644
index 00000000..d6076d57
--- /dev/null
+++ b/src/WixToolset.Data/Symbols/WixDependencyRefSymbol.cs
@@ -0,0 +1,52 @@
+// 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.Data
+{
+    using WixToolset.Data.Symbols;
+
+    public static partial class SymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition WixDependencyRef = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixDependencyRef,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixDependencyRefSymbolFields.WixDependencyProviderRef), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDependencyRefSymbolFields.WixDependencyRef), IntermediateFieldType.String),
+            },
+            typeof(WixDependencyRefSymbol));
+    }
+}
+
+namespace WixToolset.Data.Symbols
+{
+    public enum WixDependencyRefSymbolFields
+    {
+        WixDependencyProviderRef,
+        WixDependencyRef,
+    }
+
+    public class WixDependencyRefSymbol : IntermediateSymbol
+    {
+        public WixDependencyRefSymbol() : base(SymbolDefinitions.WixDependencyRef, null, null)
+        {
+        }
+
+        public WixDependencyRefSymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixDependencyRef, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixDependencyRefSymbolFields index] => this.Fields[(int)index];
+
+        public string WixDependencyProviderRef
+        {
+            get => this.Fields[(int)WixDependencyRefSymbolFields.WixDependencyProviderRef].AsString();
+            set => this.Set((int)WixDependencyRefSymbolFields.WixDependencyProviderRef, value);
+        }
+
+        public string WixDependencyRef
+        {
+            get => this.Fields[(int)WixDependencyRefSymbolFields.WixDependencyRef].AsString();
+            set => this.Set((int)WixDependencyRefSymbolFields.WixDependencyRef, value);
+        }
+    }
+}
diff --git a/src/WixToolset.Data/Symbols/WixDependencySymbol.cs b/src/WixToolset.Data/Symbols/WixDependencySymbol.cs
new file mode 100644
index 00000000..840331bb
--- /dev/null
+++ b/src/WixToolset.Data/Symbols/WixDependencySymbol.cs
@@ -0,0 +1,82 @@
+// 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.Data
+{
+    using WixToolset.Data.Symbols;
+
+    public static partial class SymbolDefinitions
+    {
+        public static readonly IntermediateSymbolDefinition WixDependency = new IntermediateSymbolDefinition(
+            SymbolDefinitionType.WixDependency,
+            new[]
+            {
+                new IntermediateFieldDefinition(nameof(WixDependencySymbolFields.ProviderKey), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDependencySymbolFields.MinVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDependencySymbolFields.MaxVersion), IntermediateFieldType.String),
+                new IntermediateFieldDefinition(nameof(WixDependencySymbolFields.Attributes), IntermediateFieldType.Number),
+            },
+            typeof(WixDependencySymbol));
+    }
+}
+
+namespace WixToolset.Data.Symbols
+{
+    using System;
+
+    public enum WixDependencySymbolFields
+    {
+        ProviderKey,
+        MinVersion,
+        MaxVersion,
+        Attributes,
+    }
+
+    [Flags]
+    public enum WixDependencySymbolAttributes : int
+    {
+        None = 0x0,
+        RequiresAttributesMinVersionInclusive = 0x100,
+        RequiresAttributesMaxVersionInclusive = 0x200,
+    }
+
+    public class WixDependencySymbol : IntermediateSymbol
+    {
+        public WixDependencySymbol() : base(SymbolDefinitions.WixDependency, null, null)
+        {
+        }
+
+        public WixDependencySymbol(SourceLineNumber sourceLineNumber, Identifier id = null) : base(SymbolDefinitions.WixDependency, sourceLineNumber, id)
+        {
+        }
+
+        public IntermediateField this[WixDependencySymbolFields index] => this.Fields[(int)index];
+
+        public string ProviderKey
+        {
+            get => this.Fields[(int)WixDependencySymbolFields.ProviderKey].AsString();
+            set => this.Set((int)WixDependencySymbolFields.ProviderKey, value);
+        }
+
+        public string MinVersion
+        {
+            get => this.Fields[(int)WixDependencySymbolFields.MinVersion].AsString();
+            set => this.Set((int)WixDependencySymbolFields.MinVersion, value);
+        }
+
+        public string MaxVersion
+        {
+            get => this.Fields[(int)WixDependencySymbolFields.MaxVersion].AsString();
+            set => this.Set((int)WixDependencySymbolFields.MaxVersion, value);
+        }
+
+        public WixDependencySymbolAttributes Attributes
+        {
+            get => (WixDependencySymbolAttributes)this.Fields[(int)WixDependencySymbolFields.Attributes].AsNumber();
+            set => this.Set((int)WixDependencySymbolFields.Attributes, (int)value);
+        }
+
+        public bool RequiresAttributesMinVersionInclusive => (this.Attributes & WixDependencySymbolAttributes.RequiresAttributesMinVersionInclusive) == WixDependencySymbolAttributes.RequiresAttributesMinVersionInclusive;
+
+        public bool RequiresAttributesMaxVersionInclusive => (this.Attributes & WixDependencySymbolAttributes.RequiresAttributesMaxVersionInclusive) == WixDependencySymbolAttributes.RequiresAttributesMaxVersionInclusive;
+    }
+}
diff --git a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
index c0075a27..dab5ed02 100644
--- a/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
+++ b/src/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
@@ -1732,6 +1732,46 @@ namespace WixToolset.Data.WindowsInstaller
             symbolIdIsPrimaryKey: false
         );
 
+        public static readonly TableDefinition WixDependencyProvider = new TableDefinition(
+            "WixDependencyProvider",
+            SymbolDefinitions.WixDependencyProvider,
+            new[]
+            {
+                        new ColumnDefinition("WixDependencyProvider", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
+                        new ColumnDefinition("Component_", ColumnType.String, 72, primaryKey: false, nullable: false, ColumnCategory.Identifier, keyTable: "Component", keyColumn: 1, description: "The foreign key into the Component table used to determine install state.", modularizeType: ColumnModularizeType.Column),
+                        new ColumnDefinition("ProviderKey", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "The name of the registry key that holds the provider identity."),
+                        new ColumnDefinition("Version", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Version, description: "The version of the package."),
+                        new ColumnDefinition("DisplayName", ColumnType.String, 255, primaryKey: false, nullable: true, ColumnCategory.Text, description: "The display name of the package."),
+                        new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied."),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition WixDependency = new TableDefinition(
+            "WixDependency",
+            SymbolDefinitions.WixDependency,
+            new[]
+            {
+                new ColumnDefinition("WixDependency", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, description: "The non-localized primary key for the table.", modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("ProviderKey", ColumnType.String, 255, primaryKey: false, nullable: false, ColumnCategory.Text, description: "The name of the registry key that holds the provider identity."),
+                new ColumnDefinition("MinVersion", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Version, description: "The minimum version of the provider supported."),
+                new ColumnDefinition("MaxVersion", ColumnType.String, 72, primaryKey: false, nullable: true, ColumnCategory.Version, description: "The maximum version of the provider supported."),
+                new ColumnDefinition("Attributes", ColumnType.Number, 4, primaryKey: false, nullable: true, ColumnCategory.Unknown, minValue: 0, maxValue: 2147483647, description: "A 32-bit word that specifies the attribute flags to be applied."),
+            },
+            symbolIdIsPrimaryKey: true
+        );
+
+        public static readonly TableDefinition WixDependencyRef = new TableDefinition(
+            "WixDependencyRef",
+            SymbolDefinitions.WixDependencyRef,
+            new[]
+            {
+                new ColumnDefinition("WixDependencyProvider_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixDependencyProvider", keyColumn: 1, description: "Foreign key into the Component table.", modularizeType: ColumnModularizeType.Column),
+                new ColumnDefinition("WixDependency_", ColumnType.String, 72, primaryKey: true, nullable: false, ColumnCategory.Identifier, keyTable: "WixDependency", keyColumn: 1, description: "Foreign key into the WixDependency table.", modularizeType: ColumnModularizeType.Column),
+            },
+            symbolIdIsPrimaryKey: false
+        );
+
         public static readonly TableDefinition[] All = new[]
         {
             ActionText,
@@ -1859,6 +1899,9 @@ namespace WixToolset.Data.WindowsInstaller
             SummaryInformation,
             TransformView,
             Validation,
+            WixDependency,
+            WixDependencyProvider,
+            WixDependencyRef,
         };
     }
 }