diff options
| author | Rob Mensching <rob@firegiant.com> | 2021-01-07 15:37:28 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2021-01-08 15:47:31 -0800 |
| commit | 458ff7ce24b33f6df46ae8ef728685c555d55ff7 (patch) | |
| tree | d4c238c6008caa8dd74d316112b82febae44c6a5 /src | |
| parent | a36c59a4911a7db525f6b03dc98fac5adde163b4 (diff) | |
| download | wix-458ff7ce24b33f6df46ae8ef728685c555d55ff7.tar.gz wix-458ff7ce24b33f6df46ae8ef728685c555d55ff7.tar.bz2 wix-458ff7ce24b33f6df46ae8ef728685c555d55ff7.zip | |
Remove unnecessary SuppressMessage attributes
Diffstat (limited to 'src')
| -rw-r--r-- | src/WixToolset.Core/Compiler.cs | 9 | ||||
| -rw-r--r-- | src/WixToolset.Core/CompilerCore.cs | 11 | ||||
| -rw-r--r-- | src/WixToolset.Core/Compiler_2.cs | 12 | ||||
| -rw-r--r-- | src/WixToolset.Core/Compiler_Patch.cs | 1 |
4 files changed, 0 insertions, 33 deletions
diff --git a/src/WixToolset.Core/Compiler.cs b/src/WixToolset.Core/Compiler.cs index 62ea8aaf..14b28034 100644 --- a/src/WixToolset.Core/Compiler.cs +++ b/src/WixToolset.Core/Compiler.cs | |||
| @@ -676,7 +676,6 @@ namespace WixToolset.Core | |||
| 676 | /// </summary> | 676 | /// </summary> |
| 677 | /// <param name="node">Element to parse.</param> | 677 | /// <param name="node">Element to parse.</param> |
| 678 | /// <returns>Identifier for the new row.</returns> | 678 | /// <returns>Identifier for the new row.</returns> |
| 679 | [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | ||
| 680 | private Identifier ParseBinaryElement(XElement node) | 679 | private Identifier ParseBinaryElement(XElement node) |
| 681 | { | 680 | { |
| 682 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 681 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -2102,7 +2101,6 @@ namespace WixToolset.Core | |||
| 2102 | /// <param name="diskId">Optional disk id inherited from parent directory.</param> | 2101 | /// <param name="diskId">Optional disk id inherited from parent directory.</param> |
| 2103 | /// <param name="directoryId">Optional identifier for component's directory.</param> | 2102 | /// <param name="directoryId">Optional identifier for component's directory.</param> |
| 2104 | /// <param name="srcPath">Optional source path for files up to this point.</param> | 2103 | /// <param name="srcPath">Optional source path for files up to this point.</param> |
| 2105 | [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | ||
| 2106 | private void ParseComponentElement(XElement node, ComplexReferenceParentType parentType, string parentId, string parentLanguage, int diskId, string directoryId, string srcPath) | 2104 | private void ParseComponentElement(XElement node, ComplexReferenceParentType parentType, string parentId, string parentLanguage, int diskId, string directoryId, string srcPath) |
| 2107 | { | 2105 | { |
| 2108 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 2106 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -2573,7 +2571,6 @@ namespace WixToolset.Core | |||
| 2573 | /// <param name="node">Element to parse.</param> | 2571 | /// <param name="node">Element to parse.</param> |
| 2574 | /// <param name="parentType"></param> | 2572 | /// <param name="parentType"></param> |
| 2575 | /// <param name="parentId"></param> | 2573 | /// <param name="parentId"></param> |
| 2576 | [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | ||
| 2577 | private void ParseComponentGroupElement(XElement node, ComplexReferenceParentType parentType, string parentId) | 2574 | private void ParseComponentGroupElement(XElement node, ComplexReferenceParentType parentType, string parentId) |
| 2578 | { | 2575 | { |
| 2579 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 2576 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -4135,7 +4132,6 @@ namespace WixToolset.Core | |||
| 4135 | /// <param name="parentId">Optional identifier of parent directory.</param> | 4132 | /// <param name="parentId">Optional identifier of parent directory.</param> |
| 4136 | /// <param name="diskId">Disk id inherited from parent directory.</param> | 4133 | /// <param name="diskId">Disk id inherited from parent directory.</param> |
| 4137 | /// <param name="fileSource">Path to source file as of yet.</param> | 4134 | /// <param name="fileSource">Path to source file as of yet.</param> |
| 4138 | [SuppressMessage("Microsoft.Performance", "CA1820:TestForEmptyStringsUsingStringLength")] | ||
| 4139 | private void ParseDirectoryElement(XElement node, string parentId, int diskId, string fileSource) | 4135 | private void ParseDirectoryElement(XElement node, string parentId, int diskId, string fileSource) |
| 4140 | { | 4136 | { |
| 4141 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 4137 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -4363,7 +4359,6 @@ namespace WixToolset.Core | |||
| 4363 | /// Parses a directory reference element. | 4359 | /// Parses a directory reference element. |
| 4364 | /// </summary> | 4360 | /// </summary> |
| 4365 | /// <param name="node">Element to parse.</param> | 4361 | /// <param name="node">Element to parse.</param> |
| 4366 | [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | ||
| 4367 | private void ParseDirectoryRefElement(XElement node) | 4362 | private void ParseDirectoryRefElement(XElement node) |
| 4368 | { | 4363 | { |
| 4369 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 4364 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -4711,7 +4706,6 @@ namespace WixToolset.Core | |||
| 4711 | /// <param name="parentId">Optional identifer for parent feature.</param> | 4706 | /// <param name="parentId">Optional identifer for parent feature.</param> |
| 4712 | /// <param name="lastDisplay">Display value for last feature used to get the features to display in the same order as specified | 4707 | /// <param name="lastDisplay">Display value for last feature used to get the features to display in the same order as specified |
| 4713 | /// in the source code.</param> | 4708 | /// in the source code.</param> |
| 4714 | [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | ||
| 4715 | private void ParseFeatureElement(XElement node, ComplexReferenceParentType parentType, string parentId, ref int lastDisplay) | 4709 | private void ParseFeatureElement(XElement node, ComplexReferenceParentType parentType, string parentId, ref int lastDisplay) |
| 4716 | { | 4710 | { |
| 4717 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 4711 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -4935,7 +4929,6 @@ namespace WixToolset.Core | |||
| 4935 | /// <param name="node">Element to parse.</param> | 4929 | /// <param name="node">Element to parse.</param> |
| 4936 | /// <param name="parentType">The type of parent.</param> | 4930 | /// <param name="parentType">The type of parent.</param> |
| 4937 | /// <param name="parentId">Optional identifier for parent feature.</param> | 4931 | /// <param name="parentId">Optional identifier for parent feature.</param> |
| 4938 | [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | ||
| 4939 | private void ParseFeatureRefElement(XElement node, ComplexReferenceParentType parentType, string parentId) | 4932 | private void ParseFeatureRefElement(XElement node, ComplexReferenceParentType parentType, string parentId) |
| 4940 | { | 4933 | { |
| 4941 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 4934 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -5029,7 +5022,6 @@ namespace WixToolset.Core | |||
| 5029 | /// <param name="node">Element to parse.</param> | 5022 | /// <param name="node">Element to parse.</param> |
| 5030 | /// <param name="parentType"></param> | 5023 | /// <param name="parentType"></param> |
| 5031 | /// <param name="parentId"></param> | 5024 | /// <param name="parentId"></param> |
| 5032 | [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | ||
| 5033 | private void ParseFeatureGroupElement(XElement node, ComplexReferenceParentType parentType, string parentId) | 5025 | private void ParseFeatureGroupElement(XElement node, ComplexReferenceParentType parentType, string parentId) |
| 5034 | { | 5026 | { |
| 5035 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 5027 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -5484,7 +5476,6 @@ namespace WixToolset.Core | |||
| 5484 | /// <param name="win64Component">true if the component is 64-bit.</param> | 5476 | /// <param name="win64Component">true if the component is 64-bit.</param> |
| 5485 | /// <param name="componentGuid"></param> | 5477 | /// <param name="componentGuid"></param> |
| 5486 | /// <returns>Yes if this element was marked as the parent component's key path, No if explicitly marked as not being a key path, or NotSet otherwise.</returns> | 5478 | /// <returns>Yes if this element was marked as the parent component's key path, No if explicitly marked as not being a key path, or NotSet otherwise.</returns> |
| 5487 | [SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | ||
| 5488 | private YesNoType ParseFileElement(XElement node, string componentId, string directoryId, int diskId, string sourcePath, out string possibleKeyPath, bool win64Component, string componentGuid) | 5479 | private YesNoType ParseFileElement(XElement node, string componentId, string directoryId, int diskId, string sourcePath, out string possibleKeyPath, bool win64Component, string componentGuid) |
| 5489 | { | 5480 | { |
| 5490 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 5481 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
diff --git a/src/WixToolset.Core/CompilerCore.cs b/src/WixToolset.Core/CompilerCore.cs index 50b88e51..1f6d6329 100644 --- a/src/WixToolset.Core/CompilerCore.cs +++ b/src/WixToolset.Core/CompilerCore.cs | |||
| @@ -493,7 +493,6 @@ namespace WixToolset.Core | |||
| 493 | /// <param name="attribute">The attribute containing the value to get.</param> | 493 | /// <param name="attribute">The attribute containing the value to get.</param> |
| 494 | /// <param name="emptyRule">A rule for the contents of the value. If the contents do not follow the rule, an error is thrown.</param> | 494 | /// <param name="emptyRule">A rule for the contents of the value. If the contents do not follow the rule, an error is thrown.</param> |
| 495 | /// <returns>The attribute's value.</returns> | 495 | /// <returns>The attribute's value.</returns> |
| 496 | [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes")] | ||
| 497 | public string GetAttributeValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, EmptyRule emptyRule = EmptyRule.CanBeWhitespaceOnly) | 496 | public string GetAttributeValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, EmptyRule emptyRule = EmptyRule.CanBeWhitespaceOnly) |
| 498 | { | 497 | { |
| 499 | return this.parseHelper.GetAttributeValue(sourceLineNumbers, attribute, emptyRule); | 498 | return this.parseHelper.GetAttributeValue(sourceLineNumbers, attribute, emptyRule); |
| @@ -505,7 +504,6 @@ namespace WixToolset.Core | |||
| 505 | /// <param name="sourceLineNumbers">Source line information about the owner element.</param> | 504 | /// <param name="sourceLineNumbers">Source line information about the owner element.</param> |
| 506 | /// <param name="attribute">The attribute containing the value to get.</param> | 505 | /// <param name="attribute">The attribute containing the value to get.</param> |
| 507 | /// <returns>A valid code page integer value.</returns> | 506 | /// <returns>A valid code page integer value.</returns> |
| 508 | [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes")] | ||
| 509 | public int GetAttributeCodePageValue(SourceLineNumber sourceLineNumbers, XAttribute attribute) | 507 | public int GetAttributeCodePageValue(SourceLineNumber sourceLineNumbers, XAttribute attribute) |
| 510 | { | 508 | { |
| 511 | if (null == attribute) | 509 | if (null == attribute) |
| @@ -535,7 +533,6 @@ namespace WixToolset.Core | |||
| 535 | /// <param name="attribute">The attribute containing the value to get.</param> | 533 | /// <param name="attribute">The attribute containing the value to get.</param> |
| 536 | /// <param name="onlyAnsi">Whether to allow Unicode (UCS) or UTF code pages.</param> | 534 | /// <param name="onlyAnsi">Whether to allow Unicode (UCS) or UTF code pages.</param> |
| 537 | /// <returns>A valid code page integer value or variable expression.</returns> | 535 | /// <returns>A valid code page integer value or variable expression.</returns> |
| 538 | [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes")] | ||
| 539 | public string GetAttributeLocalizableCodePageValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool onlyAnsi = false) | 536 | public string GetAttributeLocalizableCodePageValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool onlyAnsi = false) |
| 540 | { | 537 | { |
| 541 | if (null == attribute) | 538 | if (null == attribute) |
| @@ -577,7 +574,6 @@ namespace WixToolset.Core | |||
| 577 | /// <param name="minimum">The minimum legal value.</param> | 574 | /// <param name="minimum">The minimum legal value.</param> |
| 578 | /// <param name="maximum">The maximum legal value.</param> | 575 | /// <param name="maximum">The maximum legal value.</param> |
| 579 | /// <returns>The attribute's integer value or a special value if an error occurred during conversion.</returns> | 576 | /// <returns>The attribute's integer value or a special value if an error occurred during conversion.</returns> |
| 580 | [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes")] | ||
| 581 | public int GetAttributeIntegerValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, int minimum, int maximum) | 577 | public int GetAttributeIntegerValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, int minimum, int maximum) |
| 582 | { | 578 | { |
| 583 | return this.parseHelper.GetAttributeIntegerValue(sourceLineNumbers, attribute, minimum, maximum); | 579 | return this.parseHelper.GetAttributeIntegerValue(sourceLineNumbers, attribute, minimum, maximum); |
| @@ -602,7 +598,6 @@ namespace WixToolset.Core | |||
| 602 | /// <param name="sourceLineNumbers">Source line information about the owner element.</param> | 598 | /// <param name="sourceLineNumbers">Source line information about the owner element.</param> |
| 603 | /// <param name="attribute">The attribute containing the value to get.</param> | 599 | /// <param name="attribute">The attribute containing the value to get.</param> |
| 604 | /// <returns>Int representation of the date time.</returns> | 600 | /// <returns>Int representation of the date time.</returns> |
| 605 | [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes")] | ||
| 606 | public int GetAttributeDateTimeValue(SourceLineNumber sourceLineNumbers, XAttribute attribute) | 601 | public int GetAttributeDateTimeValue(SourceLineNumber sourceLineNumbers, XAttribute attribute) |
| 607 | { | 602 | { |
| 608 | if (null == attribute) | 603 | if (null == attribute) |
| @@ -748,7 +743,6 @@ namespace WixToolset.Core | |||
| 748 | /// <param name="sourceLineNumbers">Source line information about the owner element.</param> | 743 | /// <param name="sourceLineNumbers">Source line information about the owner element.</param> |
| 749 | /// <param name="attribute">The attribute containing the value to get.</param> | 744 | /// <param name="attribute">The attribute containing the value to get.</param> |
| 750 | /// <returns>The attribute's YesNoDefaultType value.</returns> | 745 | /// <returns>The attribute's YesNoDefaultType value.</returns> |
| 751 | [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes")] | ||
| 752 | public YesNoDefaultType GetAttributeYesNoDefaultValue(SourceLineNumber sourceLineNumbers, XAttribute attribute) | 746 | public YesNoDefaultType GetAttributeYesNoDefaultValue(SourceLineNumber sourceLineNumbers, XAttribute attribute) |
| 753 | { | 747 | { |
| 754 | return this.parseHelper.GetAttributeYesNoDefaultValue(sourceLineNumbers, attribute); | 748 | return this.parseHelper.GetAttributeYesNoDefaultValue(sourceLineNumbers, attribute); |
| @@ -793,7 +787,6 @@ namespace WixToolset.Core | |||
| 793 | /// <param name="allowWildcards">true if wildcards are allowed in the filename.</param> | 787 | /// <param name="allowWildcards">true if wildcards are allowed in the filename.</param> |
| 794 | /// <param name="allowRelative">true if relative paths are allowed in the filename.</param> | 788 | /// <param name="allowRelative">true if relative paths are allowed in the filename.</param> |
| 795 | /// <returns>The attribute's long filename value.</returns> | 789 | /// <returns>The attribute's long filename value.</returns> |
| 796 | [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes")] | ||
| 797 | public string GetAttributeLongFilename(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowWildcards = false, bool allowRelative = false) | 790 | public string GetAttributeLongFilename(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowWildcards = false, bool allowRelative = false) |
| 798 | { | 791 | { |
| 799 | return this.parseHelper.GetAttributeLongFilename(sourceLineNumbers, attribute, allowWildcards, allowRelative); | 792 | return this.parseHelper.GetAttributeLongFilename(sourceLineNumbers, attribute, allowWildcards, allowRelative); |
| @@ -817,7 +810,6 @@ namespace WixToolset.Core | |||
| 817 | /// <param name="attribute">The attribute containing the value to get.</param> | 810 | /// <param name="attribute">The attribute containing the value to get.</param> |
| 818 | /// <param name="allowHkmu">Whether HKMU is returned as -1 (true), or treated as an error (false).</param> | 811 | /// <param name="allowHkmu">Whether HKMU is returned as -1 (true), or treated as an error (false).</param> |
| 819 | /// <returns>The attribute's RegisitryRootType value.</returns> | 812 | /// <returns>The attribute's RegisitryRootType value.</returns> |
| 820 | [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes")] | ||
| 821 | public RegistryRootType? GetAttributeRegistryRootValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowHkmu) | 813 | public RegistryRootType? GetAttributeRegistryRootValue(SourceLineNumber sourceLineNumbers, XAttribute attribute, bool allowHkmu) |
| 822 | { | 814 | { |
| 823 | return this.parseHelper.GetAttributeRegistryRootValue(sourceLineNumbers, attribute, allowHkmu); | 815 | return this.parseHelper.GetAttributeRegistryRootValue(sourceLineNumbers, attribute, allowHkmu); |
| @@ -829,7 +821,6 @@ namespace WixToolset.Core | |||
| 829 | /// <param name="sourceLineNumbers">Source line information about the owner element.</param> | 821 | /// <param name="sourceLineNumbers">Source line information about the owner element.</param> |
| 830 | /// <param name="attribute">The attribute containing the value to get.</param> | 822 | /// <param name="attribute">The attribute containing the value to get.</param> |
| 831 | /// <returns>The attribute's value.</returns> | 823 | /// <returns>The attribute's value.</returns> |
| 832 | [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes")] | ||
| 833 | public string GetAttributeBundleVariableValue(SourceLineNumber sourceLineNumbers, XAttribute attribute) | 824 | public string GetAttributeBundleVariableValue(SourceLineNumber sourceLineNumbers, XAttribute attribute) |
| 834 | { | 825 | { |
| 835 | string value = this.GetAttributeValue(sourceLineNumbers, attribute); | 826 | string value = this.GetAttributeValue(sourceLineNumbers, attribute); |
| @@ -852,7 +843,6 @@ namespace WixToolset.Core | |||
| 852 | /// <param name="sourceLineNumbers">Source line information about the owner element.</param> | 843 | /// <param name="sourceLineNumbers">Source line information about the owner element.</param> |
| 853 | /// <param name="attribute">The attribute containing the value to get.</param> | 844 | /// <param name="attribute">The attribute containing the value to get.</param> |
| 854 | /// <returns>The attribute's value.</returns> | 845 | /// <returns>The attribute's value.</returns> |
| 855 | [SuppressMessage("Microsoft.Design", "CA1059:MembersShouldNotExposeCertainConcreteTypes")] | ||
| 856 | public string GetAttributeMsiPropertyNameValue(SourceLineNumber sourceLineNumbers, XAttribute attribute) | 846 | public string GetAttributeMsiPropertyNameValue(SourceLineNumber sourceLineNumbers, XAttribute attribute) |
| 857 | { | 847 | { |
| 858 | string value = this.GetAttributeValue(sourceLineNumbers, attribute); | 848 | string value = this.GetAttributeValue(sourceLineNumbers, attribute); |
| @@ -885,7 +875,6 @@ namespace WixToolset.Core | |||
| 885 | /// <param name="prefix">Three letter or less prefix for generated row identifier.</param> | 875 | /// <param name="prefix">Three letter or less prefix for generated row identifier.</param> |
| 886 | /// <param name="args">Information to hash.</param> | 876 | /// <param name="args">Information to hash.</param> |
| 887 | /// <returns>The generated identifier.</returns> | 877 | /// <returns>The generated identifier.</returns> |
| 888 | [SuppressMessage("Microsoft.Globalization", "CA1303:DoNotPassLiteralsAsLocalizedParameters", MessageId = "System.InvalidOperationException.#ctor(System.String)")] | ||
| 889 | public Identifier CreateIdentifier(string prefix, params string[] args) | 878 | public Identifier CreateIdentifier(string prefix, params string[] args) |
| 890 | { | 879 | { |
| 891 | return this.parseHelper.CreateIdentifier(prefix, args); | 880 | return this.parseHelper.CreateIdentifier(prefix, args); |
diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs index d2a6bb83..af56f0ef 100644 --- a/src/WixToolset.Core/Compiler_2.cs +++ b/src/WixToolset.Core/Compiler_2.cs | |||
| @@ -1523,9 +1523,6 @@ namespace WixToolset.Core | |||
| 1523 | /// <param name="win64Component">true if the component is 64-bit.</param> | 1523 | /// <param name="win64Component">true if the component is 64-bit.</param> |
| 1524 | /// <param name="possibleKeyPath">Identifier of this registry key since it could be the component's keypath.</param> | 1524 | /// <param name="possibleKeyPath">Identifier of this registry key since it could be the component's keypath.</param> |
| 1525 | /// <returns>Yes if this element was marked as the parent component's key path, No if explicitly marked as not being a key path, or NotSet otherwise.</returns> | 1525 | /// <returns>Yes if this element was marked as the parent component's key path, No if explicitly marked as not being a key path, or NotSet otherwise.</returns> |
| 1526 | [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "Changing the way this string normalizes would result " + | ||
| 1527 | "in a change to the way the Registry table is generated, potentially causing extra churn in patches on an MSI built from an older version of WiX. " + | ||
| 1528 | "Furthermore, there is no security hole here, as the strings won't need to make a round trip")] | ||
| 1529 | private YesNoType ParseRegistryKeyElement(XElement node, string componentId, RegistryRootType? root, string parentKey, bool win64Component, out string possibleKeyPath) | 1526 | private YesNoType ParseRegistryKeyElement(XElement node, string componentId, RegistryRootType? root, string parentKey, bool win64Component, out string possibleKeyPath) |
| 1530 | { | 1527 | { |
| 1531 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 1528 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -1718,9 +1715,6 @@ namespace WixToolset.Core | |||
| 1718 | /// <param name="win64Component">true if the component is 64-bit.</param> | 1715 | /// <param name="win64Component">true if the component is 64-bit.</param> |
| 1719 | /// <param name="possibleKeyPath">Identifier of this registry key since it could be the component's keypath.</param> | 1716 | /// <param name="possibleKeyPath">Identifier of this registry key since it could be the component's keypath.</param> |
| 1720 | /// <returns>Yes if this element was marked as the parent component's key path, No if explicitly marked as not being a key path, or NotSet otherwise.</returns> | 1717 | /// <returns>Yes if this element was marked as the parent component's key path, No if explicitly marked as not being a key path, or NotSet otherwise.</returns> |
| 1721 | [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "Changing the way this string normalizes would result " + | ||
| 1722 | "in a change to the way the Registry table is generated, potentially causing extra churn in patches on an MSI built from an older version of WiX. " + | ||
| 1723 | "Furthermore, there is no security hole here, as the strings won't need to make a round trip")] | ||
| 1724 | private YesNoType ParseRegistryValueElement(XElement node, string componentId, RegistryRootType? root, string parentKey, bool win64Component, out string possibleKeyPath) | 1718 | private YesNoType ParseRegistryValueElement(XElement node, string componentId, RegistryRootType? root, string parentKey, bool win64Component, out string possibleKeyPath) |
| 1725 | { | 1719 | { |
| 1726 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 1720 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -1994,9 +1988,6 @@ namespace WixToolset.Core | |||
| 1994 | /// </summary> | 1988 | /// </summary> |
| 1995 | /// <param name="node">The element to parse.</param> | 1989 | /// <param name="node">The element to parse.</param> |
| 1996 | /// <param name="componentId">The component identifier of the parent element.</param> | 1990 | /// <param name="componentId">The component identifier of the parent element.</param> |
| 1997 | [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "Changing the way this string normalizes would result " + | ||
| 1998 | "in a change to the way the Registry table is generated, potentially causing extra churn in patches on an MSI built from an older version of WiX. " + | ||
| 1999 | "Furthermore, there is no security hole here, as the strings won't need to make a round trip")] | ||
| 2000 | private void ParseRemoveRegistryKeyElement(XElement node, string componentId) | 1991 | private void ParseRemoveRegistryKeyElement(XElement node, string componentId) |
| 2001 | { | 1992 | { |
| 2002 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 1993 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
| @@ -2097,9 +2088,6 @@ namespace WixToolset.Core | |||
| 2097 | /// </summary> | 2088 | /// </summary> |
| 2098 | /// <param name="node">The element to parse.</param> | 2089 | /// <param name="node">The element to parse.</param> |
| 2099 | /// <param name="componentId">The component identifier of the parent element.</param> | 2090 | /// <param name="componentId">The component identifier of the parent element.</param> |
| 2100 | [SuppressMessage("Microsoft.Globalization", "CA1308:NormalizeStringsToUppercase", Justification = "Changing the way this string normalizes would result " + | ||
| 2101 | "in a change to the way the Registry table is generated, potentially causing extra churn in patches on an MSI built from an older version of WiX. " + | ||
| 2102 | "Furthermore, there is no security hole here, as the strings won't need to make a round trip")] | ||
| 2103 | private void ParseRemoveRegistryValueElement(XElement node, string componentId) | 2091 | private void ParseRemoveRegistryValueElement(XElement node, string componentId) |
| 2104 | { | 2092 | { |
| 2105 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 2093 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
diff --git a/src/WixToolset.Core/Compiler_Patch.cs b/src/WixToolset.Core/Compiler_Patch.cs index eb99d5c4..2fb1affb 100644 --- a/src/WixToolset.Core/Compiler_Patch.cs +++ b/src/WixToolset.Core/Compiler_Patch.cs | |||
| @@ -448,7 +448,6 @@ namespace WixToolset.Core | |||
| 448 | /// <param name="node">Element to parse.</param> | 448 | /// <param name="node">Element to parse.</param> |
| 449 | /// <param name="parentType"></param> | 449 | /// <param name="parentType"></param> |
| 450 | /// <param name="parentId"></param> | 450 | /// <param name="parentId"></param> |
| 451 | [System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Performance", "CA1800:DoNotCastUnnecessarily")] | ||
| 452 | private void ParsePatchFamilyGroupElement(XElement node, ComplexReferenceParentType parentType, string parentId) | 451 | private void ParsePatchFamilyGroupElement(XElement node, ComplexReferenceParentType parentType, string parentId) |
| 453 | { | 452 | { |
| 454 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); | 453 | var sourceLineNumbers = Preprocessor.GetSourceLineNumbers(node); |
