diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/wixext/UtilErrors.cs | 54 | ||||
| -rw-r--r-- | src/wixext/UtilWarnings.cs | 35 |
2 files changed, 0 insertions, 89 deletions
diff --git a/src/wixext/UtilErrors.cs b/src/wixext/UtilErrors.cs index c04f0449..b9ce1688 100644 --- a/src/wixext/UtilErrors.cs +++ b/src/wixext/UtilErrors.cs | |||
| @@ -8,31 +8,6 @@ namespace WixToolset.Util | |||
| 8 | 8 | ||
| 9 | public static class UtilErrors | 9 | public static class UtilErrors |
| 10 | { | 10 | { |
| 11 | public static Message ArgumentRequiresValue(string argument) | ||
| 12 | { | ||
| 13 | return Message(null, Ids.ArgumentRequiresValue, "The argument '{0}' does not have a value specified and it is required.", argument); | ||
| 14 | } | ||
| 15 | |||
| 16 | public static Message DirectoryNotFound(string directory) | ||
| 17 | { | ||
| 18 | return Message(null, Ids.DirectoryNotFound, "The directory '{0}' could not be found.", directory); | ||
| 19 | } | ||
| 20 | |||
| 21 | public static Message EmptyDirectory(string directory) | ||
| 22 | { | ||
| 23 | return Message(null, Ids.EmptyDirectory, "The directory '{0}' did not contain any files or sub-directories and since empty directories are not being kept, there was nothing to harvest.", directory); | ||
| 24 | } | ||
| 25 | |||
| 26 | public static Message ErrorTransformingHarvestedWiX(string transform, string message) | ||
| 27 | { | ||
| 28 | return Message(null, Ids.ErrorTransformingHarvestedWiX, "Error applying transform {0} to harvested WiX: {1}", transform, message); | ||
| 29 | } | ||
| 30 | |||
| 31 | public static Message FileNotFound(string file) | ||
| 32 | { | ||
| 33 | return Message(null, Ids.FileNotFound, "The file '{0}' cannot be found.", file); | ||
| 34 | } | ||
| 35 | |||
| 36 | public static Message IllegalAttributeWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) | 11 | public static Message IllegalAttributeWithoutComponent(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) |
| 37 | { | 12 | { |
| 38 | return Message(sourceLineNumbers, Ids.IllegalAttributeWithoutComponent, "The {0}/@{1} attribute cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName, attributeName); | 13 | return Message(sourceLineNumbers, Ids.IllegalAttributeWithoutComponent, "The {0}/@{1} attribute cannot be specified unless the element has a Component as an ancestor. A {0} that does not have a Component ancestor is not installed.", elementName, attributeName); |
| @@ -53,26 +28,6 @@ namespace WixToolset.Util | |||
| 53 | return Message(sourceLineNumbers, Ids.InvalidRegistryObject, "The {0} element has no id and cannot have its permissions set. If you want to set permissions on a 'placeholder' registry key, force its creation by setting the ForceCreateOnInstall attribute to yes.", registryElementName); | 28 | return Message(sourceLineNumbers, Ids.InvalidRegistryObject, "The {0} element has no id and cannot have its permissions set. If you want to set permissions on a 'placeholder' registry key, force its creation by setting the ForceCreateOnInstall attribute to yes.", registryElementName); |
| 54 | } | 29 | } |
| 55 | 30 | ||
| 56 | public static Message PerformanceCategoryNotFound(string key) | ||
| 57 | { | ||
| 58 | return Message(null, Ids.PerformanceCategoryNotFound, "Performance category '{0}' not found.", key); | ||
| 59 | } | ||
| 60 | |||
| 61 | public static Message SpacesNotAllowedInArgumentValue(string arg, string value) | ||
| 62 | { | ||
| 63 | return Message(null, Ids.SpacesNotAllowedInArgumentValue, "The switch '{0}' does not allow the spaces from the value. Please remove the spaces in from the value: {1}", arg, value); | ||
| 64 | } | ||
| 65 | |||
| 66 | public static Message UnableToOpenRegistryKey(string key) | ||
| 67 | { | ||
| 68 | return Message(null, Ids.UnableToOpenRegistryKey, "Unable to open registry key '{0}'.", key); | ||
| 69 | } | ||
| 70 | |||
| 71 | public static Message UnsupportedPerformanceCounterType(string key) | ||
| 72 | { | ||
| 73 | return Message(null, Ids.UnsupportedPerformanceCounterType, "Unsupported performance counter type '{0}'.", key); | ||
| 74 | } | ||
| 75 | |||
| 76 | private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) | 31 | private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) |
| 77 | { | 32 | { |
| 78 | return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); | 33 | return new Message(sourceLineNumber, MessageLevel.Error, (int)id, format, args); |
| @@ -87,16 +42,7 @@ namespace WixToolset.Util | |||
| 87 | { | 42 | { |
| 88 | IllegalAttributeWithoutComponent = 5050, | 43 | IllegalAttributeWithoutComponent = 5050, |
| 89 | IllegalElementWithoutComponent = 5051, | 44 | IllegalElementWithoutComponent = 5051, |
| 90 | DirectoryNotFound = 5052, | ||
| 91 | EmptyDirectory = 5053, | ||
| 92 | IllegalFileValueInPerfmonOrManifest = 5054, | 45 | IllegalFileValueInPerfmonOrManifest = 5054, |
| 93 | ErrorTransformingHarvestedWiX = 5055, | ||
| 94 | UnableToOpenRegistryKey = 5056, | ||
| 95 | SpacesNotAllowedInArgumentValue = 5057, | ||
| 96 | ArgumentRequiresValue = 5058, | ||
| 97 | FileNotFound = 5059, | ||
| 98 | PerformanceCategoryNotFound = 5060, | ||
| 99 | UnsupportedPerformanceCounterType = 5061, | ||
| 100 | InvalidRegistryObject = 5063, | 46 | InvalidRegistryObject = 5063, |
| 101 | } | 47 | } |
| 102 | } | 48 | } |
diff --git a/src/wixext/UtilWarnings.cs b/src/wixext/UtilWarnings.cs index 13dcea4e..b65abe45 100644 --- a/src/wixext/UtilWarnings.cs +++ b/src/wixext/UtilWarnings.cs | |||
| @@ -8,46 +8,16 @@ namespace WixToolset.Util | |||
| 8 | 8 | ||
| 9 | public static class UtilWarnings | 9 | public static class UtilWarnings |
| 10 | { | 10 | { |
| 11 | public static Message AssemblyHarvestFailed(string file, string message) | ||
| 12 | { | ||
| 13 | return Message(null, Ids.AssemblyHarvestFailed, "Could not harvest data from a file that was expected to be an assembly: {0}. If this file is not an assembly you can ignore this warning. Otherwise, this error detail may be helpful to diagnose the failure: {1}", file, message); | ||
| 14 | } | ||
| 15 | |||
| 16 | public static Message DeprecatedPerfCounterElement(SourceLineNumber sourceLineNumbers) | 11 | public static Message DeprecatedPerfCounterElement(SourceLineNumber sourceLineNumbers) |
| 17 | { | 12 | { |
| 18 | return Message(sourceLineNumbers, Ids.DeprecatedPerfCounterElement, "The PerfCounter element has been deprecated. Please use the PerformanceCounter element instead."); | 13 | return Message(sourceLineNumbers, Ids.DeprecatedPerfCounterElement, "The PerfCounter element has been deprecated. Please use the PerformanceCounter element instead."); |
| 19 | } | 14 | } |
| 20 | 15 | ||
| 21 | public static Message DuplicateDllRegistryEntry(string registryKey, string componentId) | ||
| 22 | { | ||
| 23 | return Message(null, Ids.DuplicateDllRegistryEntry, "Ignoring the registry key '{0}', it has already been added to the component '{1}'.", registryKey, componentId); | ||
| 24 | } | ||
| 25 | |||
| 26 | public static Message DuplicateDllRegistryEntry(string registryKey, string registryKeyValue, string componentId) | ||
| 27 | { | ||
| 28 | return Message(null, Ids.DuplicateDllRegistryEntry, "Ignoring the registry key '{0}', it has already been added to the component '{2}'. The registry key value '{1}' will not be harvested.", registryKey, registryKeyValue, componentId); | ||
| 29 | } | ||
| 30 | |||
| 31 | public static Message RequiredAttributeForWindowsXP(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) | 16 | public static Message RequiredAttributeForWindowsXP(SourceLineNumber sourceLineNumbers, string elementName, string attributeName) |
| 32 | { | 17 | { |
| 33 | return Message(sourceLineNumbers, Ids.RequiredAttributeForWindowsXP, "The {0}/@{1} attribute must be specified to successfully install on Windows XP. You can ignore this warning if this installation does not install on Windows XP.", elementName, attributeName); | 18 | return Message(sourceLineNumbers, Ids.RequiredAttributeForWindowsXP, "The {0}/@{1} attribute must be specified to successfully install on Windows XP. You can ignore this warning if this installation does not install on Windows XP.", elementName, attributeName); |
| 34 | } | 19 | } |
| 35 | 20 | ||
| 36 | public static Message SelfRegHarvestFailed(string file, string message) | ||
| 37 | { | ||
| 38 | return Message(null, Ids.SelfRegHarvestFailed, "Could not harvest data from a file that was expected to be a SelfReg DLL: {0}. If this file does not support SelfReg you can ignore this warning. Otherwise, this error detail may be helpful to diagnose the failure: {1}", file, message); | ||
| 39 | } | ||
| 40 | |||
| 41 | public static Message TypeLibLoadFailed(string file, string message) | ||
| 42 | { | ||
| 43 | return Message(null, Ids.TypeLibLoadFailed, "Could not load file that was expected to be a type library based off of file extension: {0}. If this file is not a type library you can ignore this warning. Otherwise, this error detail may be helpful to diagnose the load failure: {1}", file, message); | ||
| 44 | } | ||
| 45 | |||
| 46 | public static Message UnsupportedRegistryType(string registryValue, int regFileLineNumber, string unsupportedType) | ||
| 47 | { | ||
| 48 | return Message(null, Ids.UnsupportedRegistryType, "Ignoring the registry value '{0}' found on line {1}, because it is of a type unsupported by Windows Installer ({2}).", registryValue, regFileLineNumber, unsupportedType); | ||
| 49 | } | ||
| 50 | |||
| 51 | private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) | 21 | private static Message Message(SourceLineNumber sourceLineNumber, Ids id, string format, params object[] args) |
| 52 | { | 22 | { |
| 53 | return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); | 23 | return new Message(sourceLineNumber, MessageLevel.Warning, (int)id, format, args); |
| @@ -60,13 +30,8 @@ namespace WixToolset.Util | |||
| 60 | 30 | ||
| 61 | public enum Ids | 31 | public enum Ids |
| 62 | { | 32 | { |
| 63 | SelfRegHarvestFailed = 5150, | ||
| 64 | AssemblyHarvestFailed = 5151, | ||
| 65 | TypeLibLoadFailed = 5152, | ||
| 66 | DeprecatedPerfCounterElement = 5153, | 33 | DeprecatedPerfCounterElement = 5153, |
| 67 | RequiredAttributeForWindowsXP = 5154, | 34 | RequiredAttributeForWindowsXP = 5154, |
| 68 | DuplicateDllRegistryEntry = 5156, | ||
| 69 | UnsupportedRegistryType = 5157, | ||
| 70 | } | 35 | } |
| 71 | } | 36 | } |
| 72 | } | 37 | } |
