diff options
| author | Rob Mensching <rob@firegiant.com> | 2022-11-04 14:25:12 -0700 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2022-11-04 15:30:47 -0700 |
| commit | 70457e88bc1c3942067a2fa7b51f241a5e976168 (patch) | |
| tree | b6bd71ef1d20a80ac07d7ad73b2f45efc6be09e3 | |
| parent | dd9a9271d49ab9b9231152e8b7f3128294fd342e (diff) | |
| download | wix-70457e88bc1c3942067a2fa7b51f241a5e976168.tar.gz wix-70457e88bc1c3942067a2fa7b51f241a5e976168.tar.bz2 wix-70457e88bc1c3942067a2fa7b51f241a5e976168.zip | |
Fix many error conversion messages that should be information
| -rw-r--r-- | src/wix/WixToolset.Converters/WixConverter.cs | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/src/wix/WixToolset.Converters/WixConverter.cs b/src/wix/WixToolset.Converters/WixConverter.cs index ac09dcd5..9c4cffbe 100644 --- a/src/wix/WixToolset.Converters/WixConverter.cs +++ b/src/wix/WixToolset.Converters/WixConverter.cs | |||
| @@ -538,7 +538,7 @@ namespace WixToolset.Converters | |||
| 538 | 538 | ||
| 539 | var message = testType == ConverterTestType.DeprecatedLocalizationVariablePrefixInTextValue ? "The prefix on the localization variable in the inner text is incorrect." : "The prefix on the localization variable in the attribute value is incorrect."; | 539 | var message = testType == ConverterTestType.DeprecatedLocalizationVariablePrefixInTextValue ? "The prefix on the localization variable in the inner text is incorrect." : "The prefix on the localization variable in the attribute value is incorrect."; |
| 540 | 540 | ||
| 541 | return this.OnError(testType, node, message); | 541 | return this.OnInformation(testType, node, message); |
| 542 | } | 542 | } |
| 543 | 543 | ||
| 544 | private void EnsurePrecedingWhitespaceCorrect(XText whitespace, XNode node, int level, ConverterTestType testType) | 544 | private void EnsurePrecedingWhitespaceCorrect(XText whitespace, XNode node, int level, ConverterTestType testType) |
| @@ -686,7 +686,7 @@ namespace WixToolset.Converters | |||
| 686 | } | 686 | } |
| 687 | } | 687 | } |
| 688 | else if (this.SourceVersion < 4 && xBADll != null && | 688 | else if (this.SourceVersion < 4 && xBADll != null && |
| 689 | this.OnError(ConverterTestType.AssignBootstrapperApplicationDpiAwareness, element, "The BootstrapperApplicationDll DpiAwareness attribute is being set to 'unaware' to ensure it remains the same as the v3 default")) | 689 | this.OnInformation(ConverterTestType.AssignBootstrapperApplicationDpiAwareness, element, "The BootstrapperApplicationDll DpiAwareness attribute is being set to 'unaware' to ensure it remains the same as the v3 default")) |
| 690 | { | 690 | { |
| 691 | xBADll.Add(new XAttribute("DpiAwareness", "unaware")); | 691 | xBADll.Add(new XAttribute("DpiAwareness", "unaware")); |
| 692 | } | 692 | } |
| @@ -770,7 +770,7 @@ namespace WixToolset.Converters | |||
| 770 | } | 770 | } |
| 771 | 771 | ||
| 772 | if (balBAName != null && theme != null && | 772 | if (balBAName != null && theme != null && |
| 773 | this.OnError(ConverterTestType.BalBootstrapperApplicationRefToElement, element, "Built-in bootstrapper applications must be referenced through their custom element")) | 773 | this.OnInformation(ConverterTestType.BalBootstrapperApplicationRefToElement, element, "Built-in bootstrapper applications must be referenced through their custom element")) |
| 774 | { | 774 | { |
| 775 | element.Name = BootstrapperApplicationElementName; | 775 | element.Name = BootstrapperApplicationElementName; |
| 776 | xId.Remove(); | 776 | xId.Remove(); |
| @@ -820,7 +820,7 @@ namespace WixToolset.Converters | |||
| 820 | { | 820 | { |
| 821 | var camelCaseValue = LowercaseFirstChar(category.Value); | 821 | var camelCaseValue = LowercaseFirstChar(category.Value); |
| 822 | if (category.Value != camelCaseValue && | 822 | if (category.Value != camelCaseValue && |
| 823 | this.OnError(ConverterTestType.ColumnCategoryCamelCase, element, "The CustomTable Category attribute contains an incorrectly cased '{0}' value. Lowercase the first character instead.", category.Name)) | 823 | this.OnInformation(ConverterTestType.ColumnCategoryCamelCase, element, "The CustomTable Category attribute contains an incorrectly cased '{0}' value. Lowercase the first character instead.", category.Name)) |
| 824 | { | 824 | { |
| 825 | category.Value = camelCaseValue; | 825 | category.Value = camelCaseValue; |
| 826 | } | 826 | } |
| @@ -831,7 +831,7 @@ namespace WixToolset.Converters | |||
| 831 | { | 831 | { |
| 832 | var camelCaseValue = LowercaseFirstChar(modularization.Value); | 832 | var camelCaseValue = LowercaseFirstChar(modularization.Value); |
| 833 | if (modularization.Value != camelCaseValue && | 833 | if (modularization.Value != camelCaseValue && |
| 834 | this.OnError(ConverterTestType.ColumnModularizeCamelCase, element, "The CustomTable Modularize attribute contains an incorrectly cased '{0}' value. Lowercase the first character instead.", modularization.Name)) | 834 | this.OnInformation(ConverterTestType.ColumnModularizeCamelCase, element, "The CustomTable Modularize attribute contains an incorrectly cased '{0}' value. Lowercase the first character instead.", modularization.Name)) |
| 835 | { | 835 | { |
| 836 | modularization.Value = camelCaseValue; | 836 | modularization.Value = camelCaseValue; |
| 837 | } | 837 | } |
| @@ -858,7 +858,7 @@ namespace WixToolset.Converters | |||
| 858 | switch (this.CustomTableSetting) | 858 | switch (this.CustomTableSetting) |
| 859 | { | 859 | { |
| 860 | case CustomTableTarget.Bundle: | 860 | case CustomTableTarget.Bundle: |
| 861 | if (this.OnError(ConverterTestType.BootstrapperApplicationDataDeprecated, element, "The CustomTable element contains deprecated '{0}' attribute. Use the 'BundleCustomData' element for Bundles.", bootstrapperApplicationData.Name)) | 861 | if (this.OnInformation(ConverterTestType.BootstrapperApplicationDataDeprecated, element, "The CustomTable element contains deprecated '{0}' attribute. Use the 'BundleCustomData' element for Bundles.", bootstrapperApplicationData.Name)) |
| 862 | { | 862 | { |
| 863 | element.Name = WixConverter.BundleCustomDataElementName; | 863 | element.Name = WixConverter.BundleCustomDataElementName; |
| 864 | bootstrapperApplicationData.Remove(); | 864 | bootstrapperApplicationData.Remove(); |
| @@ -866,7 +866,7 @@ namespace WixToolset.Converters | |||
| 866 | } | 866 | } |
| 867 | break; | 867 | break; |
| 868 | case CustomTableTarget.Msi: | 868 | case CustomTableTarget.Msi: |
| 869 | if (this.OnError(ConverterTestType.BootstrapperApplicationDataDeprecated, element, "The CustomTable element contains deprecated '{0}' attribute. Use the 'Unreal' attribute instead.", bootstrapperApplicationData.Name)) | 869 | if (this.OnInformation(ConverterTestType.BootstrapperApplicationDataDeprecated, element, "The CustomTable element contains deprecated '{0}' attribute. Use the 'Unreal' attribute instead.", bootstrapperApplicationData.Name)) |
| 870 | { | 870 | { |
| 871 | element.Add(new XAttribute("Unreal", bootstrapperApplicationData.Value)); | 871 | element.Add(new XAttribute("Unreal", bootstrapperApplicationData.Value)); |
| 872 | bootstrapperApplicationData.Remove(); | 872 | bootstrapperApplicationData.Remove(); |
| @@ -1303,7 +1303,7 @@ namespace WixToolset.Converters | |||
| 1303 | 1303 | ||
| 1304 | var xMediaTemplate = element.Element(MediaTemplateElementName); | 1304 | var xMediaTemplate = element.Element(MediaTemplateElementName); |
| 1305 | if (xMediaTemplate?.HasAttributes == false | 1305 | if (xMediaTemplate?.HasAttributes == false |
| 1306 | && this.OnError(ConverterTestType.DefaultMediaTemplate, element, "A MediaTemplate with no attributes set is now provided by default. Remove the element.")) | 1306 | && this.OnInformation(ConverterTestType.DefaultMediaTemplate, element, "A MediaTemplate with no attributes set is now provided by default. Remove the element.")) |
| 1307 | { | 1307 | { |
| 1308 | xMediaTemplate.Remove(); | 1308 | xMediaTemplate.Remove(); |
| 1309 | } | 1309 | } |
| @@ -1523,7 +1523,7 @@ namespace WixToolset.Converters | |||
| 1523 | } | 1523 | } |
| 1524 | 1524 | ||
| 1525 | if (!String.IsNullOrEmpty(newElementName) | 1525 | if (!String.IsNullOrEmpty(newElementName) |
| 1526 | && this.OnError(ConverterTestType.ReferencesReplaced, element, "UI, custom action, and property reference {0} has been replaced with strongly-typed element.", id)) | 1526 | && this.OnInformation(ConverterTestType.ReferencesReplaced, element, "UI, custom action, and property reference {0} has been replaced with strongly-typed element.", id)) |
| 1527 | { | 1527 | { |
| 1528 | this.XRoot.SetAttributeValue(XNamespace.Xmlns + newNamespaceName, newNamespace.NamespaceName); | 1528 | this.XRoot.SetAttributeValue(XNamespace.Xmlns + newNamespaceName, newNamespace.NamespaceName); |
| 1529 | 1529 | ||
| @@ -1541,7 +1541,7 @@ namespace WixToolset.Converters | |||
| 1541 | var id = element.Attribute("Id")?.Value; | 1541 | var id = element.Attribute("Id")?.Value; |
| 1542 | 1542 | ||
| 1543 | if (id?.StartsWith("WixUI_") == true | 1543 | if (id?.StartsWith("WixUI_") == true |
| 1544 | && this.OnError(ConverterTestType.ReferencesReplaced, element, "UI, custom action, and property reference {0} has been replaced with strongly-typed element.", id)) | 1544 | && this.OnInformation(ConverterTestType.ReferencesReplaced, element, "UI, custom action, and property reference {0} has been replaced with strongly-typed element.", id)) |
| 1545 | { | 1545 | { |
| 1546 | this.XRoot.SetAttributeValue(XNamespace.Xmlns + "ui", WixUiNamespace.NamespaceName); | 1546 | this.XRoot.SetAttributeValue(XNamespace.Xmlns + "ui", WixUiNamespace.NamespaceName); |
| 1547 | 1547 | ||
| @@ -1636,7 +1636,7 @@ namespace WixToolset.Converters | |||
| 1636 | element.Name = ExePackagePayloadElementName; | 1636 | element.Name = ExePackagePayloadElementName; |
| 1637 | } | 1637 | } |
| 1638 | else if (xParent.Name == MsuPackageElementName && | 1638 | else if (xParent.Name == MsuPackageElementName && |
| 1639 | this.OnError(ConverterTestType.RemotePayloadRenamed, element, "The RemotePayload element has been renamed. Use the 'MsuPackagePayload' instead.")) | 1639 | this.OnInformation(ConverterTestType.RemotePayloadRenamed, element, "The RemotePayload element has been renamed. Use the 'MsuPackagePayload' instead.")) |
| 1640 | { | 1640 | { |
| 1641 | element.Name = MsuPackagePayloadElementName; | 1641 | element.Name = MsuPackagePayloadElementName; |
| 1642 | } | 1642 | } |
| @@ -1715,7 +1715,7 @@ namespace WixToolset.Converters | |||
| 1715 | 1715 | ||
| 1716 | private void ConvertProvidesElement(XElement element) | 1716 | private void ConvertProvidesElement(XElement element) |
| 1717 | { | 1717 | { |
| 1718 | if (this.OnError(ConverterTestType.IntegratedDependencyNamespace, element, "The Provides element has been integrated into the WiX v4 namespace. Remove the namespace.")) | 1718 | if (this.OnInformation(ConverterTestType.IntegratedDependencyNamespace, element, "The Provides element has been integrated into the WiX v4 namespace. Remove the namespace.")) |
| 1719 | { | 1719 | { |
| 1720 | element.Name = ProvidesElementName; | 1720 | element.Name = ProvidesElementName; |
| 1721 | } | 1721 | } |
