21 files changed, 125 insertions, 70 deletions
diff --git a/src/api/wix/WixToolset.Data/ErrorMessages.cs b/src/api/wix/WixToolset.Data/ErrorMessages.cs
index 4052917c..f3add0a1 100644
--- a/src/api/wix/WixToolset.Data/ErrorMessages.cs
+++ b/src/api/wix/WixToolset.Data/ErrorMessages.cs
@@ -563,11 +563,6 @@ namespace WixToolset.Data
            return Message(null, Ids.ExpectedPatchIdInWixMsp, "The WixMsp is missing the patch ID.");
        }
-        public static Message ExpectedRowInPatchCreationPackage(string tableName)
-        {
-            return Message(null, Ids.ExpectedRowInPatchCreationPackage, "Could not find a row in the '{0}' table for this patch creation package. Patch creation packages must contain at least one row in the '{0}' table.", tableName);
-        }
        public static Message ExpectedSignedCabinetName(SourceLineNumber sourceLineNumbers)
        {
            return Message(sourceLineNumbers, Ids.ExpectedSignedCabinetName, "The Media/@Cabinet attribute was not found; it is required when this element contains a DigitalSignature child element. This is because Windows Installer can only verify the digital signatures of external cabinets. Please either remove the DigitalSignature element or specify a valid external cabinet name via the Cabinet attribute.");
@@ -1413,7 +1408,7 @@ namespace WixToolset.Data
        public static Message MissingEntrySection()
        {
-            return Message(null, Ids.MissingEntrySection, "Could not find entry section in provided list of intermediates. Supported entry section types are: Package, Bundle, Patch, PatchCreation, Module.");
+            return Message(null, Ids.MissingEntrySection, "Could not find entry section in provided list of intermediates. Supported entry section types are: Package, Bundle, Patch, Module.");
        }
        public static Message MissingEntrySection(string sectionType)
@@ -2056,11 +2051,6 @@ namespace WixToolset.Data
            return Message(sourceLineNumbers, Ids.UnexpectedTableInPatch, "An unexpected row in the '{0}' table was found in this patch. Patches cannot contain the '{0}' table.", tableName);
        }
-        public static Message UnexpectedTableInPatchCreationPackage(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.UnexpectedTableInPatchCreationPackage, "An unexpected row in the '{0}' table was found in this patch creation package. Patch creation packages cannot contain the '{0}' table.", tableName);
-        }
        public static Message UnhandledExtensionAttribute(SourceLineNumber sourceLineNumbers, string elementName, string extensionAttributeName, string extensionNamespace)
        {
            return Message(sourceLineNumbers, Ids.UnhandledExtensionAttribute, "The {0} element contains an unhandled extension attribute '{1}'. Please ensure that the extension for attributes in the '{2}' namespace has been provided.", elementName, extensionAttributeName, extensionNamespace);
@@ -2435,9 +2425,7 @@ namespace WixToolset.Data
            NoUniqueActionSequenceNumber2 = 180,
            ActionScheduledRelativeToItself = 181,
            MissingTableDefinition = 182,
-            ExpectedRowInPatchCreationPackage = 183,
            UnexpectedTableInMergeModule = 184,
-            UnexpectedTableInPatchCreationPackage = 185,
            MergeExcludedModule = 186,
            MergeFeatureRequired = 187,
            MergeLanguageFailed = 188,
diff --git a/src/api/wix/WixToolset.Data/OutputType.cs b/src/api/wix/WixToolset.Data/OutputType.cs
index abe484bd..ceb1c011 100644
--- a/src/api/wix/WixToolset.Data/OutputType.cs
+++ b/src/api/wix/WixToolset.Data/OutputType.cs
@@ -25,6 +25,7 @@ namespace WixToolset.Data
        Patch,
        /// <summary>Patch Creation output type.</summary>
+        [Obsolete]
        PatchCreation,
        /// <summary>Package output type.</summary>
diff --git a/src/api/wix/WixToolset.Data/SectionType.cs b/src/api/wix/WixToolset.Data/SectionType.cs
index 21fb5eac..d58154dd 100644
--- a/src/api/wix/WixToolset.Data/SectionType.cs
+++ b/src/api/wix/WixToolset.Data/SectionType.cs
@@ -29,6 +29,7 @@ namespace WixToolset.Data
        Product = Package,
        /// <summary>Patch creation section type.</summary>
+        [Obsolete]
        PatchCreation,
        /// <summary>Patch section type.</summary>
diff --git a/src/api/wix/WixToolset.Data/Symbols/ExternalFilesSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/ExternalFilesSymbol.cs
index 87888f0b..4e91ec5b 100644
--- a/src/api/wix/WixToolset.Data/Symbols/ExternalFilesSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/ExternalFilesSymbol.cs
@@ -2,10 +2,12 @@
 namespace WixToolset.Data
 {
+    using System;
    using WixToolset.Data.Symbols;
    public static partial class SymbolDefinitions
    {
+        [Obsolete]
        public static readonly IntermediateSymbolDefinition ExternalFiles = new IntermediateSymbolDefinition(
            SymbolDefinitionType.ExternalFiles,
            new[]
@@ -25,6 +27,9 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Symbols
 {
+    using System;
+    [Obsolete]
    public enum ExternalFilesSymbolFields
    {
        Family,
@@ -37,6 +42,7 @@ namespace WixToolset.Data.Symbols
        Order,
    }
+    [Obsolete]
    public class ExternalFilesSymbol : IntermediateSymbol
    {
        public ExternalFilesSymbol() : base(SymbolDefinitions.ExternalFiles, null, null)
@@ -97,4 +103,4 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)ExternalFilesSymbolFields.Order, value);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/FamilyFileRangesSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/FamilyFileRangesSymbol.cs
index 84cd5b4b..f3400de0 100644
--- a/src/api/wix/WixToolset.Data/Symbols/FamilyFileRangesSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/FamilyFileRangesSymbol.cs
@@ -2,10 +2,12 @@
 namespace WixToolset.Data
 {
+    using System;
    using WixToolset.Data.Symbols;
    public static partial class SymbolDefinitions
    {
+        [Obsolete]
        public static readonly IntermediateSymbolDefinition FamilyFileRanges = new IntermediateSymbolDefinition(
            SymbolDefinitionType.FamilyFileRanges,
            new[]
@@ -21,6 +23,9 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Symbols
 {
+    using System;
+    [Obsolete]
    public enum FamilyFileRangesSymbolFields
    {
        Family,
@@ -29,6 +34,7 @@ namespace WixToolset.Data.Symbols
        RetainLengths,
    }
+    [Obsolete]
    public class FamilyFileRangesSymbol : IntermediateSymbol
    {
        public FamilyFileRangesSymbol() : base(SymbolDefinitions.FamilyFileRanges, null, null)
@@ -65,4 +71,4 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)FamilyFileRangesSymbolFields.RetainLengths, value);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/ImageFamiliesSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/ImageFamiliesSymbol.cs
index 090628ef..39ac8ea0 100644
--- a/src/api/wix/WixToolset.Data/Symbols/ImageFamiliesSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/ImageFamiliesSymbol.cs
@@ -2,10 +2,12 @@
 namespace WixToolset.Data
 {
+    using System;
    using WixToolset.Data.Symbols;
    public static partial class SymbolDefinitions
    {
+        [Obsolete]
        public static readonly IntermediateSymbolDefinition ImageFamilies = new IntermediateSymbolDefinition(
            SymbolDefinitionType.ImageFamilies,
            new[]
@@ -23,6 +25,9 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Symbols
 {
+    using System;
+    [Obsolete]
    public enum ImageFamiliesSymbolFields
    {
        Family,
@@ -33,6 +38,7 @@ namespace WixToolset.Data.Symbols
        VolumeLabel,
    }
+    [Obsolete]
    public class ImageFamiliesSymbol : IntermediateSymbol
    {
        public ImageFamiliesSymbol() : base(SymbolDefinitions.ImageFamilies, null, null)
@@ -81,4 +87,4 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)ImageFamiliesSymbolFields.VolumeLabel, value);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/MsiPatchMetadataSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/MsiPatchMetadataSymbol.cs
index 682adbca..599883dc 100644
--- a/src/api/wix/WixToolset.Data/Symbols/MsiPatchMetadataSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/MsiPatchMetadataSymbol.cs
@@ -20,6 +20,8 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Symbols
 {
+    using System;
    public enum MsiPatchMetadataSymbolFields
    {
        Company,
@@ -27,6 +29,33 @@ namespace WixToolset.Data.Symbols
        Value,
    }
+    /// <summary>
+    /// Values for the OptimizeCA MsiPatchMetdata property, which indicates whether custom actions can be skipped when applying the patch.
+    /// </summary>
+    [Flags]
+    public enum OptimizeCAFlags
+    {
+        /// <summary>
+        /// No custom actions are skipped.
+        /// </summary>
+        None = 0,
+        /// <summary>
+        /// Skip property (type 51) and directory (type 35) assignment custom actions.
+        /// </summary>
+        SkipAssignment = 1,
+        /// <summary>
+        /// Skip immediate custom actions that are not property or directory assignment custom actions.
+        /// </summary>
+        SkipImmediate = 2,
+        /// <summary>
+        /// Skip custom actions that run within the script.
+        /// </summary>
+        SkipDeferred = 4
+    }
    public class MsiPatchMetadataSymbol : IntermediateSymbol
    {
        public MsiPatchMetadataSymbol() : base(SymbolDefinitions.MsiPatchMetadata, null, null)
@@ -57,4 +86,4 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)MsiPatchMetadataSymbolFields.Value, value);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/PatchMetadataSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/PatchMetadataSymbol.cs
index 201b8444..ec8b9a5e 100644
--- a/src/api/wix/WixToolset.Data/Symbols/PatchMetadataSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/PatchMetadataSymbol.cs
@@ -2,10 +2,12 @@
 namespace WixToolset.Data
 {
+    using System;
    using WixToolset.Data.Symbols;
    public static partial class SymbolDefinitions
    {
+        [Obsolete]
        public static readonly IntermediateSymbolDefinition PatchMetadata = new IntermediateSymbolDefinition(
            SymbolDefinitionType.PatchMetadata,
            new[]
@@ -22,6 +24,7 @@ namespace WixToolset.Data.Symbols
 {
    using System;
+    [Obsolete]
    public enum PatchMetadataSymbolFields
    {
        Company,
@@ -29,33 +32,7 @@ namespace WixToolset.Data.Symbols
        Value,
    }
-    /// <summary>
+    [Obsolete]
-    /// Values for the OptimizeCA MsiPatchMetdata property, which indicates whether custom actions can be skipped when applying the patch.
-    /// </summary>
-    [Flags]
-    public enum OptimizeCAFlags
-    {
-        /// <summary>
-        /// No custom actions are skipped.
-        /// </summary>
-        None = 0,
-        /// <summary>
-        /// Skip property (type 51) and directory (type 35) assignment custom actions.
-        /// </summary>
-        SkipAssignment = 1,
-        /// <summary>
-        /// Skip immediate custom actions that are not property or directory assignment custom actions.
-        /// </summary>
-        SkipImmediate = 2,
-        /// <summary>
-        /// Skip custom actions that run within the script.
-        /// </summary>
-        SkipDeferred = 4
-    }
    public class PatchMetadataSymbol : IntermediateSymbol
    {
        public PatchMetadataSymbol() : base(SymbolDefinitions.PatchMetadata, null, null)
diff --git a/src/api/wix/WixToolset.Data/Symbols/PatchPackageSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/PatchPackageSymbol.cs
index 0efdfd25..2d8b3f81 100644
--- a/src/api/wix/WixToolset.Data/Symbols/PatchPackageSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/PatchPackageSymbol.cs
@@ -49,4 +49,4 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)PatchPackageSymbolFields.MediaDiskIdRef, value);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/PatchSequenceSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/PatchSequenceSymbol.cs
index a4cbca61..d769651f 100644
--- a/src/api/wix/WixToolset.Data/Symbols/PatchSequenceSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/PatchSequenceSymbol.cs
@@ -2,10 +2,12 @@
 namespace WixToolset.Data
 {
+    using System;
    using WixToolset.Data.Symbols;
    public static partial class SymbolDefinitions
    {
+        [Obsolete]
        public static readonly IntermediateSymbolDefinition PatchSequence = new IntermediateSymbolDefinition(
            SymbolDefinitionType.PatchSequence,
            new[]
@@ -21,6 +23,9 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Symbols
 {
+    using System;
+    [Obsolete]
    public enum PatchSequenceSymbolFields
    {
        PatchFamily,
@@ -29,6 +34,7 @@ namespace WixToolset.Data.Symbols
        Supersede,
    }
+    [Obsolete]
    public class PatchSequenceSymbol : IntermediateSymbol
    {
        public PatchSequenceSymbol() : base(SymbolDefinitions.PatchSequence, null, null)
@@ -65,4 +71,4 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)PatchSequenceSymbolFields.Supersede, value);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs b/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs
index 64c1a2a5..ad4b2e11 100644
--- a/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/SymbolDefinitions.cs
@@ -4,6 +4,7 @@ namespace WixToolset.Data
 {
    using System;
+#pragma warning disable CS0612 // includes some obsolete symbol definitions
    public enum SymbolDefinitionType
    {
        SummaryInformation,
@@ -34,7 +35,9 @@ namespace WixToolset.Data
        Error,
        EventMapping,
        Extension,
+        [Obsolete]
        ExternalFiles,
+        [Obsolete]
        FamilyFileRanges,
        Feature,
        FeatureComponents,
@@ -86,8 +89,10 @@ namespace WixToolset.Data
        ODBCSourceAttribute,
        ODBCTranslator,
        Patch,
+        [Obsolete]
        PatchMetadata,
        PatchPackage,
+        [Obsolete]
        PatchSequence,
        ProgId,
        Properties,
@@ -106,14 +111,19 @@ namespace WixToolset.Data
        Shortcut,
        Signature,
        SoftwareIdentificationTag,
+        [Obsolete]
        TargetFilesOptionalData,
+        [Obsolete]
        TargetImages,
        TextStyle,
        TypeLib,
        UIText,
        Upgrade,
+        [Obsolete]
        UpgradedFilesOptionalData,
+        [Obsolete]
        UpgradedFilesToIgnore,
+        [Obsolete]
        UpgradedImages,
        Verb,
        WixAction,
diff --git a/src/api/wix/WixToolset.Data/Symbols/TargetFilesOptionalDataSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/TargetFilesOptionalDataSymbol.cs
index 66fdc30c..fe3800ff 100644
--- a/src/api/wix/WixToolset.Data/Symbols/TargetFilesOptionalDataSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/TargetFilesOptionalDataSymbol.cs
@@ -2,10 +2,12 @@
 namespace WixToolset.Data
 {
+    using System;
    using WixToolset.Data.Symbols;
    public static partial class SymbolDefinitions
    {
+        [Obsolete]
        public static readonly IntermediateSymbolDefinition TargetFilesOptionalData = new IntermediateSymbolDefinition(
            SymbolDefinitionType.TargetFilesOptionalData,
            new[]
@@ -23,6 +25,9 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Symbols
 {
+    using System;
+    [Obsolete]
    public enum TargetFilesOptionalDataSymbolFields
    {
        Target,
@@ -33,6 +38,7 @@ namespace WixToolset.Data.Symbols
        RetainOffsets,
    }
+    [Obsolete]
    public class TargetFilesOptionalDataSymbol : IntermediateSymbol
    {
        public TargetFilesOptionalDataSymbol() : base(SymbolDefinitions.TargetFilesOptionalData, null, null)
@@ -81,4 +87,4 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)TargetFilesOptionalDataSymbolFields.RetainOffsets, value);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/TargetImagesSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/TargetImagesSymbol.cs
index 4748b1f3..20b3ec5d 100644
--- a/src/api/wix/WixToolset.Data/Symbols/TargetImagesSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/TargetImagesSymbol.cs
@@ -2,10 +2,12 @@
 namespace WixToolset.Data
 {
+    using System;
    using WixToolset.Data.Symbols;
    public static partial class SymbolDefinitions
    {
+        [Obsolete]
        public static readonly IntermediateSymbolDefinition TargetImages = new IntermediateSymbolDefinition(
            SymbolDefinitionType.TargetImages,
            new[]
@@ -24,6 +26,9 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Symbols
 {
+    using System;
+    [Obsolete]
    public enum TargetImagesSymbolFields
    {
        Target,
@@ -35,6 +40,7 @@ namespace WixToolset.Data.Symbols
        IgnoreMissingSrcFiles,
    }
+    [Obsolete]
    public class TargetImagesSymbol : IntermediateSymbol
    {
        public TargetImagesSymbol() : base(SymbolDefinitions.TargetImages, null, null)
@@ -89,4 +95,4 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)TargetImagesSymbolFields.IgnoreMissingSrcFiles, value);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/UpgradedFilesOptionalDataSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/UpgradedFilesOptionalDataSymbol.cs
index 9e669ec3..8f2ccf00 100644
--- a/src/api/wix/WixToolset.Data/Symbols/UpgradedFilesOptionalDataSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/UpgradedFilesOptionalDataSymbol.cs
@@ -2,10 +2,12 @@
 namespace WixToolset.Data
 {
+    using System;
    using WixToolset.Data.Symbols;
    public static partial class SymbolDefinitions
    {
+        [Obsolete]
        public static readonly IntermediateSymbolDefinition UpgradedFilesOptionalData = new IntermediateSymbolDefinition(
            SymbolDefinitionType.UpgradedFilesOptionalData,
            new[]
@@ -22,6 +24,9 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Symbols
 {
+    using System;
+    [Obsolete]
    public enum UpgradedFilesOptionalDataSymbolFields
    {
        Upgraded,
@@ -31,6 +36,7 @@ namespace WixToolset.Data.Symbols
        IncludeWholeFile,
    }
+    [Obsolete]
    public class UpgradedFilesOptionalDataSymbol : IntermediateSymbol
    {
        public UpgradedFilesOptionalDataSymbol() : base(SymbolDefinitions.UpgradedFilesOptionalData, null, null)
diff --git a/src/api/wix/WixToolset.Data/Symbols/UpgradedFilesToIgnoreSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/UpgradedFilesToIgnoreSymbol.cs
index e21af6a2..1afcb980 100644
--- a/src/api/wix/WixToolset.Data/Symbols/UpgradedFilesToIgnoreSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/UpgradedFilesToIgnoreSymbol.cs
@@ -2,10 +2,12 @@
 namespace WixToolset.Data
 {
+    using System;
    using WixToolset.Data.Symbols;
    public static partial class SymbolDefinitions
    {
+        [Obsolete]
        public static readonly IntermediateSymbolDefinition UpgradedFilesToIgnore = new IntermediateSymbolDefinition(
            SymbolDefinitionType.UpgradedFilesToIgnore,
            new[]
@@ -19,12 +21,16 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Symbols
 {
+    using System;
+    [Obsolete]
    public enum UpgradedFilesToIgnoreSymbolFields
    {
        Upgraded,
        FTK,
    }
+    [Obsolete]
    public class UpgradedFilesToIgnoreSymbol : IntermediateSymbol
    {
        public UpgradedFilesToIgnoreSymbol() : base(SymbolDefinitions.UpgradedFilesToIgnore, null, null)
@@ -49,4 +55,4 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)UpgradedFilesToIgnoreSymbolFields.FTK, value);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/api/wix/WixToolset.Data/Symbols/UpgradedImagesSymbol.cs b/src/api/wix/WixToolset.Data/Symbols/UpgradedImagesSymbol.cs
index 28eae08a..438ca493 100644
--- a/src/api/wix/WixToolset.Data/Symbols/UpgradedImagesSymbol.cs
+++ b/src/api/wix/WixToolset.Data/Symbols/UpgradedImagesSymbol.cs
@@ -2,10 +2,12 @@
 namespace WixToolset.Data
 {
+    using System;
    using WixToolset.Data.Symbols;
    public static partial class SymbolDefinitions
    {
+        [Obsolete]
        public static readonly IntermediateSymbolDefinition UpgradedImages = new IntermediateSymbolDefinition(
            SymbolDefinitionType.UpgradedImages,
            new[]
@@ -22,6 +24,9 @@ namespace WixToolset.Data
 namespace WixToolset.Data.Symbols
 {
+    using System;
+    [Obsolete]
    public enum UpgradedImagesSymbolFields
    {
        Upgraded,
@@ -31,6 +36,7 @@ namespace WixToolset.Data.Symbols
        Family,
    }
+    [Obsolete]
    public class UpgradedImagesSymbol : IntermediateSymbol
    {
        public UpgradedImagesSymbol() : base(SymbolDefinitions.UpgradedImages, null, null)
@@ -73,4 +79,4 @@ namespace WixToolset.Data.Symbols
            set => this.Set((int)UpgradedImagesSymbolFields.Family, value);
        }
    }
-}
-\ No newline at end of file
+}
diff --git a/src/api/wix/WixToolset.Data/WarningMessages.cs b/src/api/wix/WixToolset.Data/WarningMessages.cs
index 83d9dc51..67915620 100644
--- a/src/api/wix/WixToolset.Data/WarningMessages.cs
+++ b/src/api/wix/WixToolset.Data/WarningMessages.cs
@@ -167,11 +167,6 @@ namespace WixToolset.Data
            return Message(sourceLineNumbers, Ids.DeprecatedLongNameAttribute, "The {0}/@{1} attribute has been deprecated. Since WiX now has the ability to generate short file/directory names, the desired name should be specified in the {2} attribute instead. If the name specified in the {2} attribute is a short name, then WiX will not generate a short name. If the name specified in the {2} attribute is a long name and you want to manually specify the short name, please set the short name value in the {3} attribute.", elementName, longNameAttributeName, nameAttributeName, shortNameAttributeName);
        }
-        public static Message DeprecatedPatchSequenceTargetAttribute(SourceLineNumber sourceLineNumbers, string elementName, string attributeName)
-        {
-            return Message(sourceLineNumbers, Ids.DeprecatedPatchSequenceTargetAttribute, "The {0}/@{1} attribute has been deprecated in favor of the more strongly-typed ProductCode or TargetImage attributes. Please use the ProductCode attribute for indicating the ProductCode of a patch family directly, or the TargetImage attribute to specify the TargetImage which in turn will retrieve the ProductCode of the patch family.", elementName, attributeName);
-        }
        public static Message DeprecatedPreProcVariable(SourceLineNumber sourceLineNumbers, string oldName, string newName)
        {
            return Message(sourceLineNumbers, Ids.DeprecatedPreProcVariable, "The built-in preprocessor variable '{0}' is deprecated. Please correct your authoring to use the new '{1}' preprocessor variable instead.", oldName, newName);
@@ -332,11 +327,6 @@ namespace WixToolset.Data
            return Message(sourceLineNumbers, Ids.IllegalColumnValue, "The {0}.{1} column's value, '{2}', is not a recognized legal value. This information will be left out of the decompiled output.", tableName, columnName, value);
        }
-        public static Message IllegalPatchCreationTable(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.IllegalPatchCreationTable, "The {0} table is not legal in a patch creation file. The information in this table will be left out of the decompiled output.", tableName);
-        }
        public static Message IllegalRegistryKeyPath(SourceLineNumber sourceLineNumbers, string componentName, string registryId)
        {
            return Message(sourceLineNumbers, Ids.IllegalRegistryKeyPath, "Component '{0}' specifies an illegal registry keypath of '{1}'. Since this entry actually represents a registry key, not a registry value, it cannot be the keypath.", componentName, registryId);
@@ -542,11 +532,6 @@ namespace WixToolset.Data
            return Message(sourceLineNumbers, Ids.SkippingMergeModuleTable, "The {0} table can only be represented in WiX for merge modules. The information in this table will be left out of the decompiled output.", tableName);
        }
-        public static Message SkippingPatchCreationTable(SourceLineNumber sourceLineNumbers, string tableName)
-        {
-            return Message(sourceLineNumbers, Ids.SkippingPatchCreationTable, "The {0} table can only be represented in WiX for patch creation files. The information in this table will be left out of the decompiled output.", tableName);
-        }
        public static Message StandardDirectoryConflictInMergeModule(SourceLineNumber sourceLineNumbers, string directory, string standardDirectory)
        {
            return Message(sourceLineNumbers, Ids.StandardDirectoryConflictInMergeModule, "The Directory '{0}' starts with the same Id as the standard folder in Windows Installer '{1}'. A directory Id that begins with the same Id as a standard folder that is in an MSM may encounter a conflict when merging the MSM into an MSI. This may result in the contents of this merge module being installed to an unexpected location. To eliminate this warning, change your directory Id to not start with the same Id as any standard folders.", directory, standardDirectory);
@@ -762,9 +747,7 @@ namespace WixToolset.Data
            IllegalActionInSequence = 1058,
            ExpectedForeignRow = 1059,
            DecompilingAsCustomTable = 1060,
-            IllegalPatchCreationTable = 1061,
            SkippingMergeModuleTable = 1062,
-            SkippingPatchCreationTable = 1063,
            UnrepresentableColumnValue = 1064,
            DeprecatedTable = 1065,
            PatchTable = 1066,
@@ -782,7 +765,6 @@ namespace WixToolset.Data
            EmptyCabinet = 1079,
            DeprecatedRegistryElement = 1080,
            IllegalRegistryKeyPath = 1081,
-            DeprecatedPatchSequenceTargetAttribute = 1082,
            ProductIdAuthored = 1083,
            ImplicitMergeModulePrimaryFeature = 1084,
            DeprecatedIgnoreModularizationElement = 1085,
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
index fbb38501..2f27e45d 100644
--- a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
+++ b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerData.cs
@@ -214,9 +214,11 @@ namespace WixToolset.Data.WindowsInstaller
                            case "Patch":
                                output.Type = OutputType.Patch;
                                break;
+#pragma warning disable CS0612 // still supported backward compatiblity
                            case "PatchCreation":
                                output.Type = OutputType.PatchCreation;
                                break;
+#pragma warning restore CS0612
                            case "Package":
                            case "Product":
                                output.Type = OutputType.Package;
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
index 9f0cdd96..96ae929d 100644
--- a/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
+++ b/src/api/wix/WixToolset.Data/WindowsInstaller/WindowsInstallerTableDefinitions.cs
@@ -2,6 +2,7 @@
 namespace WixToolset.Data.WindowsInstaller
 {
+    using System;
    using WixToolset.Data.WindowsInstaller.Rows;
    public static class WindowsInstallerTableDefinitions
@@ -861,6 +862,7 @@ namespace WixToolset.Data.WindowsInstaller
            symbolIdIsPrimaryKey: false
        );
+        [Obsolete]
        public static readonly TableDefinition PatchMetadata = new TableDefinition(
            "PatchMetadata",
            SymbolDefinitions.PatchMetadata,
@@ -908,6 +910,7 @@ namespace WixToolset.Data.WindowsInstaller
            symbolIdIsPrimaryKey: false
        );
+        [Obsolete]
        public static readonly TableDefinition PatchSequence = new TableDefinition(
            "PatchSequence",
            SymbolDefinitions.PatchSequence,
@@ -1560,6 +1563,7 @@ namespace WixToolset.Data.WindowsInstaller
            symbolIdIsPrimaryKey: false
        );
+        [Obsolete]
        public static readonly TableDefinition ImageFamilies = new TableDefinition(
            "ImageFamilies",
            SymbolDefinitions.ImageFamilies,
@@ -1575,6 +1579,7 @@ namespace WixToolset.Data.WindowsInstaller
            symbolIdIsPrimaryKey: false
        );
+        [Obsolete]
        public static readonly TableDefinition UpgradedImages = new TableDefinition(
            "UpgradedImages",
            SymbolDefinitions.UpgradedImages,
@@ -1589,6 +1594,7 @@ namespace WixToolset.Data.WindowsInstaller
            symbolIdIsPrimaryKey: false
        );
+        [Obsolete]
        public static readonly TableDefinition UpgradedFilesToIgnore = new TableDefinition(
            "UpgradedFilesToIgnore",
            SymbolDefinitions.UpgradedFilesToIgnore,
@@ -1600,6 +1606,7 @@ namespace WixToolset.Data.WindowsInstaller
            symbolIdIsPrimaryKey: false
        );
+        [Obsolete]
        public static readonly TableDefinition UpgradedFilesOptionalData = new TableDefinition(
            "UpgradedFiles_OptionalData",
            SymbolDefinitions.UpgradedFilesOptionalData,
@@ -1614,6 +1621,7 @@ namespace WixToolset.Data.WindowsInstaller
            symbolIdIsPrimaryKey: false
        );
+        [Obsolete]
        public static readonly TableDefinition TargetImages = new TableDefinition(
            "TargetImages",
            SymbolDefinitions.TargetImages,
@@ -1630,6 +1638,7 @@ namespace WixToolset.Data.WindowsInstaller
            symbolIdIsPrimaryKey: false
        );
+        [Obsolete]
        public static readonly TableDefinition TargetFilesOptionalData = new TableDefinition(
            "TargetFiles_OptionalData",
            SymbolDefinitions.TargetFilesOptionalData,
@@ -1645,6 +1654,7 @@ namespace WixToolset.Data.WindowsInstaller
            symbolIdIsPrimaryKey: false
        );
+        [Obsolete]
        public static readonly TableDefinition FamilyFileRanges = new TableDefinition(
            "FamilyFileRanges",
            SymbolDefinitions.FamilyFileRanges,
@@ -1658,6 +1668,7 @@ namespace WixToolset.Data.WindowsInstaller
            symbolIdIsPrimaryKey: false
        );
+        [Obsolete]
        public static readonly TableDefinition ExternalFiles = new TableDefinition(
            "ExternalFiles",
            SymbolDefinitions.ExternalFiles,
@@ -1772,6 +1783,7 @@ namespace WixToolset.Data.WindowsInstaller
            symbolIdIsPrimaryKey: false
        );
+#pragma warning disable CS0612 // includes some obsolete table definitions
        public static readonly TableDefinition[] All = new[]
        {
            ActionText,
@@ -1903,5 +1915,6 @@ namespace WixToolset.Data.WindowsInstaller
            WixDependencyProvider,
            WixDependencyRef,
        };
+#pragma warning restore CS0618
    }
 }
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
index 2ee214d8..c4109dc1 100644
--- a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
+++ b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/data.xsd
@@ -37,7 +37,6 @@
                        <xs:enumeration value="Bundle" />
                        <xs:enumeration value="Module" />
                        <xs:enumeration value="Patch" />
-                        <xs:enumeration value="PatchCreation" />
                        <xs:enumeration value="Package" />
                        <xs:enumeration value="Product" />
                        <xs:enumeration value="Transform" />
diff --git a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
index 84b59321..404290f1 100644
--- a/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
+++ b/src/api/wix/WixToolset.Data/WindowsInstaller/Xsd/objects.xsd
@@ -121,7 +121,6 @@
            <xs:enumeration value="module" />
            <xs:enumeration value="package" />
            <xs:enumeration value="product" />
-            <xs:enumeration value="patchCreation" />
            <xs:enumeration value="patch" />
        </xs:restriction>
    </xs:simpleType>