From 50fe3d149a101b2569647689673fa01d67ff5267 Mon Sep 17 00:00:00 2001 From: Bob Arnson Date: Thu, 24 Apr 2025 21:32:49 -0400 Subject: Remove deprecated Heat. Fixes https://github.com/wixtoolset/issues/issues/9039 --- src/api/wix/WixToolset.Data/ErrorMessages.cs | 17 ----------------- src/api/wix/WixToolset.Data/WarningMessages.cs | 6 ------ 2 files changed, 23 deletions(-) (limited to 'src/api') diff --git a/src/api/wix/WixToolset.Data/ErrorMessages.cs b/src/api/wix/WixToolset.Data/ErrorMessages.cs index ef70ebc4..4d986b7a 100644 --- a/src/api/wix/WixToolset.Data/ErrorMessages.cs +++ b/src/api/wix/WixToolset.Data/ErrorMessages.cs @@ -248,11 +248,6 @@ namespace WixToolset.Data return Message(sourceLineNumbers, Ids.DuplicateCabinetName2, "Duplicate cabinet name '{0}' error related to previous error.", cabinetName); } - public static Message DuplicateCommandLineOptionInExtension(string arg) - { - return Message(null, Ids.DuplicateCommandLineOptionInExtension, "The command line option '{0}' has already been loaded by another Heat extension.", arg); - } - public static Message DuplicateComponentGuids(SourceLineNumber sourceLineNumbers, string componentId, string guid, string type, string keyPath) { return Message(sourceLineNumbers, Ids.DuplicateComponentGuids, "Component/@Id='{0}' with {2} '{3}' has a @Guid value '{1}' that duplicates another component in this package. It is recommended to give each component its own unique GUID.", componentId, guid, type, keyPath); @@ -705,16 +700,6 @@ namespace WixToolset.Data return Message(null, Ids.HarvestSourceNotSpecified, "A harvest source must be specified after the harvest type and can be followed by harvester arguments."); } - public static Message HarvestTypeNotFound() - { - return Message(null, Ids.HarvestTypeNotFound, "The harvest type was not found in the list of loaded Heat extensions."); - } - - public static Message HarvestTypeNotFound(string harvestType) - { - return Message(null, Ids.HarvestTypeNotFound, "The harvest type '{0}' was specified. Harvest types cannot start with a '-'. Remove the '-' to specify a valid harvest type.", harvestType); - } - public static Message IdentifierNotFound(string type, string identifier) { return Message(null, Ids.IdentifierNotFound, "An expected identifier ('{1}', of type '{0}') was not found.", type, identifier); @@ -2588,8 +2573,6 @@ namespace WixToolset.Data SameFileIdDifferentSource = 317, HarvestSourceNotSpecified = 318, OutputTargetNotSpecified = 319, - DuplicateCommandLineOptionInExtension = 320, - HarvestTypeNotFound = 321, BothUpgradeCodesRequired = 322, IllegalBinderClassName = 323, SpecifiedBinderNotFound = 324, diff --git a/src/api/wix/WixToolset.Data/WarningMessages.cs b/src/api/wix/WixToolset.Data/WarningMessages.cs index 15068a90..83d9dc51 100644 --- a/src/api/wix/WixToolset.Data/WarningMessages.cs +++ b/src/api/wix/WixToolset.Data/WarningMessages.cs @@ -357,11 +357,6 @@ namespace WixToolset.Data return Message(null, Ids.ImplicitMergeModulePrimaryFeature, "The merge module '{0}' does not have an explicit primary feature parent specified. If the source files are linked in a different order, the primary parent feature may change. To prevent accidental changes, the primary feature parent should be set to 'yes' in one of the MergeRef/@Primary or FeatureGroupRef/@Primary locations for this component.", componentId); } - public static Message InsufficientPermissionHarvestTypeLib() - { - return Message(null, Ids.InsufficientPermissionHarvestTypeLib, "Not enough permissions to harvest type library. On Windows Vista, you must either run Heat elevated, or install Windows Vista SP1 (or higher)."); - } - public static Message InvalidAttributeCombination(SourceLineNumber sourceLineNumbers, string attrib1, string attrib2, string name, string value) { return Message(sourceLineNumbers, Ids.InvalidAttributeCombination, "It is invalid to combine attributes {0} and {1}. The decompiled output will set attribute {2} to {3}.", attrib1, attrib2, name, value); @@ -813,7 +808,6 @@ namespace WixToolset.Data UnexpectedEntrySection = 1109, NewComponentAddedToExistingFeature = 1110, DeprecatedAttributeValue = 1111, - InsufficientPermissionHarvestTypeLib = 1112, UnclearShortcut = 1113, TooManyProgIds = 1114, BadColumnDataIgnored = 1115, -- cgit v1.2.3-55-g6feb