aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2022-12-08 15:27:27 -0800
committerRob Mensching <rob@firegiant.com>2022-12-11 00:26:50 -0800
commitf7ff100a87f82b2a9b762d377cd5f0e6cd6cf86c (patch)
tree6dc76a8da609bacf1ac9ecfaa4877b485bf9b1c1
parentfb0a8b74b598331dcf037d97a3adf89f5fe5ba92 (diff)
downloadwix-f7ff100a87f82b2a9b762d377cd5f0e6cd6cf86c.tar.gz
wix-f7ff100a87f82b2a9b762d377cd5f0e6cd6cf86c.tar.bz2
wix-f7ff100a87f82b2a9b762d377cd5f0e6cd6cf86c.zip
Remove double spaces after periods in text
-rw-r--r--src/wix/WixToolset.Converters/WixConverter.cs10
-rw-r--r--src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs2
-rw-r--r--src/wix/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs8
3 files changed, 10 insertions, 10 deletions
diff --git a/src/wix/WixToolset.Converters/WixConverter.cs b/src/wix/WixToolset.Converters/WixConverter.cs
index 59bbb7c4..c7069e5f 100644
--- a/src/wix/WixToolset.Converters/WixConverter.cs
+++ b/src/wix/WixToolset.Converters/WixConverter.cs
@@ -500,7 +500,7 @@ namespace WixToolset.Converters
500 } 500 }
501 catch (XmlException e) 501 catch (XmlException e)
502 { 502 {
503 this.OnError(ConverterTestType.XmlException, null, "The xml is invalid. Detail: '{0}'", e.Message); 503 this.OnError(ConverterTestType.XmlException, null, "The xml is invalid. Detail: '{0}'", e.Message);
504 document = null; 504 document = null;
505 } 505 }
506 506
@@ -653,7 +653,7 @@ namespace WixToolset.Converters
653 653
654 if (WixConverter.OldToNewNamespaceMapping.TryGetValue(declaration.Value, out var ns)) 654 if (WixConverter.OldToNewNamespaceMapping.TryGetValue(declaration.Value, out var ns))
655 { 655 {
656 if (this.OnInformation(ConverterTestType.XmlnsValueWrong, declaration, "The namespace '{0}' is out of date. It must be '{1}'.", declaration.Value, ns.NamespaceName)) 656 if (this.OnInformation(ConverterTestType.XmlnsValueWrong, declaration, "The namespace '{0}' is out of date. It must be '{1}'.", declaration.Value, ns.NamespaceName))
657 { 657 {
658 deprecatedToUpdatedNamespaces.Add(declaration.Value, ns); 658 deprecatedToUpdatedNamespaces.Add(declaration.Value, ns);
659 } 659 }
@@ -2096,7 +2096,7 @@ namespace WixToolset.Converters
2096 /// <returns>The converted element.</returns> 2096 /// <returns>The converted element.</returns>
2097 private void ConvertElementWithoutNamespace(XElement element) 2097 private void ConvertElementWithoutNamespace(XElement element)
2098 { 2098 {
2099 if (this.OnInformation(ConverterTestType.XmlnsMissing, element, "The xmlns attribute is missing. It must be present with a value of '{0}'.", WixNamespace.NamespaceName)) 2099 if (this.OnInformation(ConverterTestType.XmlnsMissing, element, "The xmlns attribute is missing. It must be present with a value of '{0}'.", WixNamespace.NamespaceName))
2100 { 2100 {
2101 element.Name = WixNamespace.GetName(element.Name.LocalName); 2101 element.Name = WixNamespace.GetName(element.Name.LocalName);
2102 2102
@@ -2116,7 +2116,7 @@ namespace WixToolset.Converters
2116 /// <returns>The converted element.</returns> 2116 /// <returns>The converted element.</returns>
2117 private void ConvertWixLocalizationElementWithoutNamespace(XElement element) 2117 private void ConvertWixLocalizationElementWithoutNamespace(XElement element)
2118 { 2118 {
2119 if (this.OnInformation(ConverterTestType.XmlnsMissing, element, "The xmlns attribute is missing. It must be present with a value of '{0}'.", WxlNamespace.NamespaceName)) 2119 if (this.OnInformation(ConverterTestType.XmlnsMissing, element, "The xmlns attribute is missing. It must be present with a value of '{0}'.", WxlNamespace.NamespaceName))
2120 { 2120 {
2121 element.Name = WxlNamespace.GetName(element.Name.LocalName); 2121 element.Name = WxlNamespace.GetName(element.Name.LocalName);
2122 2122
@@ -2847,7 +2847,7 @@ namespace WixToolset.Converters
2847 } 2847 }
2848 2848
2849 /// <summary> 2849 /// <summary>
2850 /// Converter test types. These are used to condition error messages down to warnings. 2850 /// Converter test types. These are used to condition error messages down to warnings.
2851 /// </summary> 2851 /// </summary>
2852 private enum ConverterTestType 2852 private enum ConverterTestType
2853 { 2853 {
diff --git a/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs b/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs
index f580e516..b88d89d1 100644
--- a/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs
@@ -130,7 +130,7 @@ namespace WixToolsetTest.Converters
130 WixAssert.CompareLineByLine(new[] 130 WixAssert.CompareLineByLine(new[]
131 { 131 {
132 "FixDeclarationAndNamespace.wxs() [Converted] This file contains an XML declaration on the first line. (DeclarationPresent)", 132 "FixDeclarationAndNamespace.wxs() [Converted] This file contains an XML declaration on the first line. (DeclarationPresent)",
133 "FixDeclarationAndNamespace.wxs(1) [Converted] The namespace 'http://schemas.microsoft.com/wix/2006/wi' is out of date. It must be 'http://wixtoolset.org/schemas/v4/wxs'. (XmlnsValueWrong)" 133 "FixDeclarationAndNamespace.wxs(1) [Converted] The namespace 'http://schemas.microsoft.com/wix/2006/wi' is out of date. It must be 'http://wixtoolset.org/schemas/v4/wxs'. (XmlnsValueWrong)"
134 }, messages); 134 }, messages);
135 135
136 var actual = File.ReadAllLines(path); 136 var actual = File.ReadAllLines(path);
diff --git a/src/wix/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs b/src/wix/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs
index 2c1179d7..7f2a467a 100644
--- a/src/wix/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs
+++ b/src/wix/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs
@@ -74,8 +74,8 @@ namespace WixToolsetTest.Converters
74 var errors = converter.ConvertDocument(document); 74 var errors = converter.ConvertDocument(document);
75 WixAssert.CompareLineByLine(new[] 75 WixAssert.CompareLineByLine(new[]
76 { 76 {
77 "[Converted] The namespace 'http://schemas.microsoft.com/wix/2006/wi' is out of date. It must be 'http://wixtoolset.org/schemas/v4/wxs'. (XmlnsValueWrong)", 77 "[Converted] The namespace 'http://schemas.microsoft.com/wix/2006/wi' is out of date. It must be 'http://wixtoolset.org/schemas/v4/wxs'. (XmlnsValueWrong)",
78 "[Converted] The namespace 'http://schemas.microsoft.com/wix/FirewallExtension' is out of date. It must be 'http://wixtoolset.org/schemas/v4/wxs/firewall'. (XmlnsValueWrong)", 78 "[Converted] The namespace 'http://schemas.microsoft.com/wix/FirewallExtension' is out of date. It must be 'http://wixtoolset.org/schemas/v4/wxs/firewall'. (XmlnsValueWrong)",
79 "[Converted] Using RemoteAddress element text is deprecated. Use the 'Value' attribute instead. (InnerTextDeprecated)", 79 "[Converted] Using RemoteAddress element text is deprecated. Use the 'Value' attribute instead. (InnerTextDeprecated)",
80 "[Converted] Namespace should be defined on the root. The 'http://wixtoolset.org/schemas/v4/wxs/firewall' namespace was move to the root element. (MoveNamespacesToRoot)" 80 "[Converted] Namespace should be defined on the root. The 'http://wixtoolset.org/schemas/v4/wxs/firewall' namespace was move to the root element. (MoveNamespacesToRoot)"
81 }, messaging.Messages.Select(m => m.ToString()).ToArray()); 81 }, messaging.Messages.Select(m => m.ToString()).ToArray());
@@ -115,8 +115,8 @@ namespace WixToolsetTest.Converters
115 var errors = converter.ConvertDocument(document); 115 var errors = converter.ConvertDocument(document);
116 WixAssert.CompareLineByLine(new[] 116 WixAssert.CompareLineByLine(new[]
117 { 117 {
118 "[Converted] The namespace 'http://schemas.microsoft.com/wix/2006/wi' is out of date. It must be 'http://wixtoolset.org/schemas/v4/wxs'. (XmlnsValueWrong)", 118 "[Converted] The namespace 'http://schemas.microsoft.com/wix/2006/wi' is out of date. It must be 'http://wixtoolset.org/schemas/v4/wxs'. (XmlnsValueWrong)",
119 "[Converted] The namespace 'http://schemas.microsoft.com/wix/FirewallExtension' is out of date. It must be 'http://wixtoolset.org/schemas/v4/wxs/firewall'. (XmlnsValueWrong)", 119 "[Converted] The namespace 'http://schemas.microsoft.com/wix/FirewallExtension' is out of date. It must be 'http://wixtoolset.org/schemas/v4/wxs/firewall'. (XmlnsValueWrong)",
120 "[Converted] Using RemoteAddress element text is deprecated. Use the 'Value' attribute instead. (InnerTextDeprecated)", 120 "[Converted] Using RemoteAddress element text is deprecated. Use the 'Value' attribute instead. (InnerTextDeprecated)",
121 "[Converted] Namespace should be defined on the root. The 'http://wixtoolset.org/schemas/v4/wxs/firewall' namespace was move to the root element. (MoveNamespacesToRoot)" 121 "[Converted] Namespace should be defined on the root. The 'http://wixtoolset.org/schemas/v4/wxs/firewall' namespace was move to the root element. (MoveNamespacesToRoot)"
122 }, messaging.Messages.Select(m => m.ToString()).ToArray()); 122 }, messaging.Messages.Select(m => m.ToString()).ToArray());