Remove double spaces after periods in text
Rob Mensching committed
Dec 8, 2022 at 15:27 UTC
f7ff100a87f82b2a9b762d377cd5f0e6cd6cf86c
3 files changed
+10
-10
src/wix/WixToolset.Converters/WixConverter.cs
+5
-5
@@ -500,7 +500,7 @@ namespace WixToolset.Converters
500
}
501
catch (XmlException e)
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;
505
}
506
@@ -653,7 +653,7 @@ namespace WixToolset.Converters
653
654
if (WixConverter.OldToNewNamespaceMapping.TryGetValue(declaration.Value, out var ns))
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
{
658
deprecatedToUpdatedNamespaces.Add(declaration.Value, ns);
659
}
@@ -2096,7 +2096,7 @@ namespace WixToolset.Converters
2096
/// <returns>The converted element.</returns>
2097
private void ConvertElementWithoutNamespace(XElement element)
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
{
2101
element.Name = WixNamespace.GetName(element.Name.LocalName);
2102
@@ -2116,7 +2116,7 @@ namespace WixToolset.Converters
2116
/// <returns>The converted element.</returns>
2117
private void ConvertWixLocalizationElementWithoutNamespace(XElement element)
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
{
2121
element.Name = WxlNamespace.GetName(element.Name.LocalName);
2122
@@ -2847,7 +2847,7 @@ namespace WixToolset.Converters
2847
}
2848
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>
2852
private enum ConverterTestType
2853
{
src/wix/test/WixToolsetTest.Converters/ConverterFixture.cs
+1
-1
@@ -130,7 +130,7 @@ namespace WixToolsetTest.Converters
130
WixAssert.CompareLineByLine(new[]
131
{
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);
135
136
var actual = File.ReadAllLines(path);
src/wix/test/WixToolsetTest.Converters/FirewallExtensionFixture.cs
+4
-4
@@ -74,8 +74,8 @@ namespace WixToolsetTest.Converters
74
var errors = converter.ConvertDocument(document);
75
WixAssert.CompareLineByLine(new[]
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)",
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)",
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)",
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)"
81
}, messaging.Messages.Select(m => m.ToString()).ToArray());
@@ -115,8 +115,8 @@ namespace WixToolsetTest.Converters
115
var errors = converter.ConvertDocument(document);
116
WixAssert.CompareLineByLine(new[]
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)",
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)",
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)",
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)"
122
}, messaging.Messages.Select(m => m.ToString()).ToArray());