Skip v3 conversions when re-converting v4 code
Rename Wix3Converter to WixConverter as the class is used for all conversions.
Rob Mensching committed
Jun 26, 2020 at 13:52 UTC
0eec58b87b3aeb73758f8bb581244e291631d767
9 files changed
+107
-82
src/WixToolset.Converters/ConvertCommand.cs
+2
-2
@@ -133,7 +133,7 @@ namespace WixToolset.Converters
133
}
134
}
135
136
- var converter = new Wix3Converter(this.Messaging, this.IndentationAmount, this.ErrorsAsWarnings, this.IgnoreErrors);
136
+ var converter = new WixConverter(this.Messaging, this.IndentationAmount, this.ErrorsAsWarnings, this.IgnoreErrors);
137
138
var errors = this.InspectSubDirectories(converter, Path.GetFullPath("."), cancellationToken);
139
@@ -204,7 +204,7 @@ namespace WixToolset.Converters
204
/// </summary>
205
/// <param name="directory">The directory whose sub-directories will be inspected.</param>
206
/// <returns>The number of errors that were found.</returns>
207
- private int InspectSubDirectories(Wix3Converter converter, string directory, CancellationToken cancellationToken)
207
+ private int InspectSubDirectories(WixConverter converter, string directory, CancellationToken cancellationToken)
208
{
209
var errors = 0;
210
src/WixToolset.Converters/WixConverter.cs
renamed
+72
-47
@@ -17,7 +17,7 @@ namespace WixToolset.Converters
17
/// <summary>
18
/// WiX source code converter.
19
/// </summary>
20
- public class Wix3Converter
20
+ public class WixConverter
21
{
22
private static readonly Regex AddPrefix = new Regex(@"^[^a-zA-Z_]", RegexOptions.Compiled);
23
private static readonly Regex IllegalIdentifierCharacters = new Regex(@"[^A-Za-z0-9_\.]|\.{2,}", RegexOptions.Compiled); // non 'words' and assorted valid characters
@@ -98,6 +98,18 @@ namespace WixToolset.Converters
98
{ "http://schemas.microsoft.com/wix/2006/WixUnit", "http://wixtoolset.org/schemas/v4/wixunit" },
99
};
100
101
+ private readonly static SortedSet<string> Wix3Namespaces = new SortedSet<string>
102
+ {
103
+ "http://schemas.microsoft.com/wix/2006/wi",
104
+ "http://schemas.microsoft.com/wix/2006/localization",
105
+ };
106
+
107
+ private readonly static SortedSet<string> Wix4Namespaces = new SortedSet<string>
108
+ {
109
+ "http://wixtoolset.org/schemas/v4/wxs",
110
+ "http://wixtoolset.org/schemas/v4/wxl",
111
+ };
112
+
113
private readonly Dictionary<XName, Action<XElement>> ConvertElementMapping;
114
115
/// <summary>
@@ -106,48 +118,48 @@ namespace WixToolset.Converters
118
/// <param name="indentationAmount">Indentation value to use when validating leading whitespace.</param>
119
/// <param name="errorsAsWarnings">Test errors to display as warnings.</param>
120
/// <param name="ignoreErrors">Test errors to ignore.</param>
109
- public Wix3Converter(IMessaging messaging, int indentationAmount, IEnumerable<string> errorsAsWarnings = null, IEnumerable<string> ignoreErrors = null)
121
+ public WixConverter(IMessaging messaging, int indentationAmount, IEnumerable<string> errorsAsWarnings = null, IEnumerable<string> ignoreErrors = null)
122
{
123
this.ConvertElementMapping = new Dictionary<XName, Action<XElement>>
124
{
113
- { Wix3Converter.AdminExecuteSequenceElementName, this.ConvertSequenceElement },
114
- { Wix3Converter.AdminUISequenceSequenceElementName, this.ConvertSequenceElement },
115
- { Wix3Converter.AdvertiseExecuteSequenceElementName, this.ConvertSequenceElement },
116
- { Wix3Converter.InstallUISequenceSequenceElementName, this.ConvertSequenceElement },
117
- { Wix3Converter.InstallExecuteSequenceElementName, this.ConvertSequenceElement },
118
- { Wix3Converter.ColumnElementName, this.ConvertColumnElement },
119
- { Wix3Converter.CustomTableElementName, this.ConvertCustomTableElement },
120
- { Wix3Converter.ControlElementName, this.ConvertControlElement },
121
- { Wix3Converter.ComponentElementName, this.ConvertComponentElement },
122
- { Wix3Converter.DirectoryElementName, this.ConvertDirectoryElement },
123
- { Wix3Converter.FeatureElementName, this.ConvertFeatureElement },
124
- { Wix3Converter.FileElementName, this.ConvertFileElement },
125
- { Wix3Converter.FragmentElementName, this.ConvertFragmentElement },
126
- { Wix3Converter.EmbeddedChainerElementName, this.ConvertEmbeddedChainerElement },
127
- { Wix3Converter.ErrorElementName, this.ConvertErrorElement },
128
- { Wix3Converter.ExePackageElementName, this.ConvertSuppressSignatureValidation },
129
- { Wix3Converter.MsiPackageElementName, this.ConvertSuppressSignatureValidation },
130
- { Wix3Converter.MspPackageElementName, this.ConvertSuppressSignatureValidation },
131
- { Wix3Converter.MsuPackageElementName, this.ConvertSuppressSignatureValidation },
132
- { Wix3Converter.PayloadElementName, this.ConvertSuppressSignatureValidation },
133
- { Wix3Converter.PermissionExElementName, this.ConvertPermissionExElement },
134
- { Wix3Converter.ProductElementName, this.ConvertProductElement },
135
- { Wix3Converter.ProgressTextElementName, this.ConvertProgressTextElement },
136
- { Wix3Converter.PublishElementName, this.ConvertPublishElement },
137
- { Wix3Converter.MultiStringValueElementName, this.ConvertMultiStringValueElement },
138
- { Wix3Converter.RequiredPrivilegeElementName, this.ConvertRequiredPrivilegeElement },
139
- { Wix3Converter.RowElementName, this.ConvertRowElement },
140
- { Wix3Converter.CustomActionElementName, this.ConvertCustomActionElement },
141
- { Wix3Converter.ServiceArgumentElementName, this.ConvertServiceArgumentElement },
142
- { Wix3Converter.SetDirectoryElementName, this.ConvertSetDirectoryElement },
143
- { Wix3Converter.SetPropertyElementName, this.ConvertSetPropertyElement },
144
- { Wix3Converter.ShortcutPropertyElementName, this.ConvertShortcutPropertyElement },
145
- { Wix3Converter.TextElementName, this.ConvertTextElement },
146
- { Wix3Converter.UITextElementName, this.ConvertUITextElement },
147
- { Wix3Converter.UtilPermissionExElementName, this.ConvertUtilPermissionExElement },
148
- { Wix3Converter.PropertyElementName, this.ConvertPropertyElement },
149
- { Wix3Converter.WixElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
150
- { Wix3Converter.IncludeElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
125
+ { WixConverter.AdminExecuteSequenceElementName, this.ConvertSequenceElement },
126
+ { WixConverter.AdminUISequenceSequenceElementName, this.ConvertSequenceElement },
127
+ { WixConverter.AdvertiseExecuteSequenceElementName, this.ConvertSequenceElement },
128
+ { WixConverter.InstallUISequenceSequenceElementName, this.ConvertSequenceElement },
129
+ { WixConverter.InstallExecuteSequenceElementName, this.ConvertSequenceElement },
130
+ { WixConverter.ColumnElementName, this.ConvertColumnElement },
131
+ { WixConverter.CustomTableElementName, this.ConvertCustomTableElement },
132
+ { WixConverter.ControlElementName, this.ConvertControlElement },
133
+ { WixConverter.ComponentElementName, this.ConvertComponentElement },
134
+ { WixConverter.DirectoryElementName, this.ConvertDirectoryElement },
135
+ { WixConverter.FeatureElementName, this.ConvertFeatureElement },
136
+ { WixConverter.FileElementName, this.ConvertFileElement },
137
+ { WixConverter.FragmentElementName, this.ConvertFragmentElement },
138
+ { WixConverter.EmbeddedChainerElementName, this.ConvertEmbeddedChainerElement },
139
+ { WixConverter.ErrorElementName, this.ConvertErrorElement },
140
+ { WixConverter.ExePackageElementName, this.ConvertSuppressSignatureValidation },
141
+ { WixConverter.MsiPackageElementName, this.ConvertSuppressSignatureValidation },
142
+ { WixConverter.MspPackageElementName, this.ConvertSuppressSignatureValidation },
143
+ { WixConverter.MsuPackageElementName, this.ConvertSuppressSignatureValidation },
144
+ { WixConverter.PayloadElementName, this.ConvertSuppressSignatureValidation },
145
+ { WixConverter.PermissionExElementName, this.ConvertPermissionExElement },
146
+ { WixConverter.ProductElementName, this.ConvertProductElement },
147
+ { WixConverter.ProgressTextElementName, this.ConvertProgressTextElement },
148
+ { WixConverter.PublishElementName, this.ConvertPublishElement },
149
+ { WixConverter.MultiStringValueElementName, this.ConvertMultiStringValueElement },
150
+ { WixConverter.RequiredPrivilegeElementName, this.ConvertRequiredPrivilegeElement },
151
+ { WixConverter.RowElementName, this.ConvertRowElement },
152
+ { WixConverter.CustomActionElementName, this.ConvertCustomActionElement },
153
+ { WixConverter.ServiceArgumentElementName, this.ConvertServiceArgumentElement },
154
+ { WixConverter.SetDirectoryElementName, this.ConvertSetDirectoryElement },
155
+ { WixConverter.SetPropertyElementName, this.ConvertSetPropertyElement },
156
+ { WixConverter.ShortcutPropertyElementName, this.ConvertShortcutPropertyElement },
157
+ { WixConverter.TextElementName, this.ConvertTextElement },
158
+ { WixConverter.UITextElementName, this.ConvertUITextElement },
159
+ { WixConverter.UtilPermissionExElementName, this.ConvertUtilPermissionExElement },
160
+ { WixConverter.PropertyElementName, this.ConvertPropertyElement },
161
+ { WixConverter.WixElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
162
+ { WixConverter.IncludeElementWithoutNamespaceName, this.ConvertElementWithoutNamespace },
163
};
164
165
this.Messaging = messaging;
@@ -171,6 +183,8 @@ namespace WixToolset.Converters
183
184
private string SourceFile { get; set; }
185
186
+ private int SourceVersion { get; set; }
187
+
188
/// <summary>
189
/// Convert a file.
190
/// </summary>
@@ -184,6 +198,7 @@ namespace WixToolset.Converters
198
// Set the instance info.
199
this.Errors = 0;
200
this.SourceFile = sourceFile;
201
+ this.SourceVersion = 0;
202
203
try
204
{
@@ -225,6 +240,7 @@ namespace WixToolset.Converters
240
public int ConvertDocument(XDocument document)
241
{
242
this.Errors = 0;
243
+ this.SourceVersion = 0;
244
245
var declaration = document.Declaration;
246
@@ -292,13 +308,13 @@ namespace WixToolset.Converters
308
309
private void EnsurePrecedingWhitespaceCorrect(XText whitespace, XNode node, int level, ConverterTestType testType)
310
{
295
- if (!Wix3Converter.LeadingWhitespaceValid(this.IndentationAmount, level, whitespace.Value))
311
+ if (!WixConverter.LeadingWhitespaceValid(this.IndentationAmount, level, whitespace.Value))
312
{
313
var message = testType == ConverterTestType.WhitespacePrecedingEndElementWrong ? "The whitespace preceding this end element is incorrect." : "The whitespace preceding this node is incorrect.";
314
315
if (this.OnError(testType, node, message))
316
{
301
- Wix3Converter.FixupWhitespace(this.IndentationAmount, level, whitespace);
317
+ WixConverter.FixupWhitespace(this.IndentationAmount, level, whitespace);
318
}
319
}
320
}
@@ -323,8 +339,17 @@ namespace WixToolset.Converters
339
340
foreach (var declaration in element.Attributes().Where(a => a.IsNamespaceDeclaration))
341
{
326
- if (Wix3Converter.OldToNewNamespaceMapping.TryGetValue(declaration.Value, out var ns))
342
+ if (WixConverter.OldToNewNamespaceMapping.TryGetValue(declaration.Value, out var ns))
343
{
344
+ if (Wix3Namespaces.Contains(declaration.Value))
345
+ {
346
+ this.SourceVersion = 3;
347
+ }
348
+ else if (Wix4Namespaces.Contains(declaration.Value))
349
+ {
350
+ this.SourceVersion = 4;
351
+ }
352
+
353
if (this.OnError(ConverterTestType.XmlnsValueWrong, declaration, "The namespace '{0}' is out of date. It must be '{1}'.", declaration.Value, ns.NamespaceName))
354
{
355
deprecatedToUpdatedNamespaces.Add(declaration.Value, ns);
@@ -334,7 +359,7 @@ namespace WixToolset.Converters
359
360
if (deprecatedToUpdatedNamespaces.Any())
361
{
337
- Wix3Converter.UpdateElementsWithDeprecatedNamespaces(element.DescendantsAndSelf(), deprecatedToUpdatedNamespaces);
362
+ WixConverter.UpdateElementsWithDeprecatedNamespaces(element.DescendantsAndSelf(), deprecatedToUpdatedNamespaces);
363
}
364
365
// Apply any specialized conversion actions.
@@ -457,7 +482,7 @@ namespace WixToolset.Converters
482
483
private void ConvertFileElement(XElement element)
484
{
460
- if (null == element.Attribute("Id"))
485
+ if (this.SourceVersion < 4 && null == element.Attribute("Id"))
486
{
487
var attribute = element.Attribute("Name");
488
@@ -470,7 +495,7 @@ namespace WixToolset.Converters
495
{
496
var name = Path.GetFileName(attribute.Value);
497
473
- if (this.OnError(ConverterTestType.AssignAnonymousFileId, element, "The file id is being updated to '{0}' to ensure it remains the same as the default", name))
498
+ if (this.OnError(ConverterTestType.AssignAnonymousFileId, element, "The file id is being updated to '{0}' to ensure it remains the same as the v3 default", name))
499
{
500
IEnumerable<XAttribute> attributes = element.Attributes().ToList();
501
element.RemoveAttributes();
@@ -669,7 +694,7 @@ namespace WixToolset.Converters
694
695
private void ConvertUtilPermissionExElement(XElement element)
696
{
672
- if (null == element.Attribute("Inheritable"))
697
+ if (this.SourceVersion < 4 && null == element.Attribute("Inheritable"))
698
{
699
var inheritable = element.Parent.Name == CreateFolderElementName;
700
if (!inheritable)
src/test/WixToolsetTest.Converters/ConditionFixture.cs
+5
-5
@@ -45,7 +45,7 @@ namespace WixToolsetTest.Converters
45
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
46
47
var messaging = new MockMessaging();
48
- var converter = new Wix3Converter(messaging, 2, null, null);
48
+ var converter = new WixConverter(messaging, 2, null, null);
49
50
var errors = converter.ConvertDocument(document);
51
Assert.Equal(3, errors);
@@ -81,7 +81,7 @@ namespace WixToolsetTest.Converters
81
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
82
83
var messaging = new MockMessaging();
84
- var converter = new Wix3Converter(messaging, 2, null, null);
84
+ var converter = new WixConverter(messaging, 2, null, null);
85
86
var errors = converter.ConvertDocument(document);
87
Assert.Equal(3, errors);
@@ -117,7 +117,7 @@ namespace WixToolsetTest.Converters
117
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
118
119
var messaging = new MockMessaging();
120
- var converter = new Wix3Converter(messaging, 2, null, null);
120
+ var converter = new WixConverter(messaging, 2, null, null);
121
122
var errors = converter.ConvertDocument(document);
123
Assert.Equal(3, errors);
@@ -151,7 +151,7 @@ namespace WixToolsetTest.Converters
151
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
152
153
var messaging = new MockMessaging();
154
- var converter = new Wix3Converter(messaging, 2, null, null);
154
+ var converter = new WixConverter(messaging, 2, null, null);
155
156
var errors = converter.ConvertDocument(document);
157
Assert.Equal(3, errors);
@@ -192,7 +192,7 @@ namespace WixToolsetTest.Converters
192
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
193
194
var messaging = new MockMessaging();
195
- var converter = new Wix3Converter(messaging, 2, null, null);
195
+ var converter = new WixConverter(messaging, 2, null, null);
196
197
var errors = converter.ConvertDocument(document);
198
Assert.Equal(3, errors);
src/test/WixToolsetTest.Converters/ConverterFixture.cs
+14
-14
@@ -29,7 +29,7 @@ namespace WixToolsetTest.Converters
29
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
30
31
var messaging = new MockMessaging();
32
- var converter = new Wix3Converter(messaging, 2, null, null);
32
+ var converter = new WixConverter(messaging, 2, null, null);
33
34
var errors = converter.ConvertDocument(document);
35
@@ -62,7 +62,7 @@ namespace WixToolsetTest.Converters
62
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
63
64
var messaging = new MockMessaging();
65
- var converter = new Wix3Converter(messaging, 4, null, null);
65
+ var converter = new WixConverter(messaging, 4, null, null);
66
67
var errors = converter.ConvertDocument(document);
68
@@ -97,7 +97,7 @@ namespace WixToolsetTest.Converters
97
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
98
99
var messaging = new MockMessaging();
100
- var converter = new Wix3Converter(messaging, 4, null, null);
100
+ var converter = new WixConverter(messaging, 4, null, null);
101
102
var conversions = converter.ConvertDocument(document);
103
@@ -133,7 +133,7 @@ namespace WixToolsetTest.Converters
133
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
134
135
var messaging = new MockMessaging();
136
- var converter = new Wix3Converter(messaging, 4, null, null);
136
+ var converter = new WixConverter(messaging, 4, null, null);
137
138
var conversions = converter.ConvertDocument(document);
139
@@ -160,7 +160,7 @@ namespace WixToolsetTest.Converters
160
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
161
162
var messaging = new MockMessaging();
163
- var converter = new Wix3Converter(messaging, 2, null, null);
163
+ var converter = new WixConverter(messaging, 2, null, null);
164
165
var errors = converter.ConvertDocument(document);
166
@@ -188,7 +188,7 @@ namespace WixToolsetTest.Converters
188
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
189
190
var messaging = new MockMessaging();
191
- var converter = new Wix3Converter(messaging, 2, null, null);
191
+ var converter = new WixConverter(messaging, 2, null, null);
192
193
var errors = converter.ConvertDocument(document);
194
@@ -220,7 +220,7 @@ namespace WixToolsetTest.Converters
220
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
221
222
var messaging = new MockMessaging();
223
- var converter = new Wix3Converter(messaging, 2, null, null);
223
+ var converter = new WixConverter(messaging, 2, null, null);
224
225
var errors = converter.ConvertDocument(document);
226
@@ -249,7 +249,7 @@ namespace WixToolsetTest.Converters
249
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
250
251
var messaging = new MockMessaging();
252
- var converter = new Wix3Converter(messaging, 2, null, null);
252
+ var converter = new WixConverter(messaging, 2, null, null);
253
254
var errors = converter.ConvertDocument(document);
255
@@ -277,7 +277,7 @@ namespace WixToolsetTest.Converters
277
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
278
279
var messaging = new MockMessaging();
280
- var converter = new Wix3Converter(messaging, 2, null, null);
280
+ var converter = new WixConverter(messaging, 2, null, null);
281
282
var errors = converter.ConvertDocument(document);
283
@@ -315,7 +315,7 @@ namespace WixToolsetTest.Converters
315
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
316
317
var messaging = new MockMessaging();
318
- var converter = new Wix3Converter(messaging, 2, null, null);
318
+ var converter = new WixConverter(messaging, 2, null, null);
319
320
var errors = converter.ConvertDocument(document);
321
@@ -343,7 +343,7 @@ namespace WixToolsetTest.Converters
343
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
344
345
var messaging = new MockMessaging();
346
- var converter = new Wix3Converter(messaging, 2, null, null);
346
+ var converter = new WixConverter(messaging, 2, null, null);
347
348
var errors = converter.ConvertDocument(document);
349
@@ -370,7 +370,7 @@ namespace WixToolsetTest.Converters
370
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
371
372
var messaging = new MockMessaging();
373
- var converter = new Wix3Converter(messaging, 2, null, null);
373
+ var converter = new WixConverter(messaging, 2, null, null);
374
375
var errors = converter.ConvertDocument(document);
376
@@ -396,7 +396,7 @@ namespace WixToolsetTest.Converters
396
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
397
398
var messaging = new MockMessaging();
399
- var converter = new Wix3Converter(messaging, 2, null, null);
399
+ var converter = new WixConverter(messaging, 2, null, null);
400
401
var errors = converter.ConvertDocument(document);
402
@@ -422,7 +422,7 @@ namespace WixToolsetTest.Converters
422
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
423
424
var messaging = new MockMessaging();
425
- var converter = new Wix3Converter(messaging, 2, null, null);
425
+ var converter = new WixConverter(messaging, 2, null, null);
426
427
var errors = converter.ConvertDocument(document);
428
src/test/WixToolsetTest.Converters/ConverterIntegrationFixture.cs
+3
-3
@@ -28,7 +28,7 @@ namespace WixToolsetTest.Converters
28
File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName));
29
30
var messaging = new MockMessaging();
31
- var converter = new Wix3Converter(messaging, 4);
31
+ var converter = new WixConverter(messaging, 4);
32
var errors = converter.ConvertFile(targetFile, true);
33
34
Assert.Equal(8, errors);
@@ -55,7 +55,7 @@ namespace WixToolsetTest.Converters
55
File.Copy(Path.Combine(folder, beforeFileName), Path.Combine(baseFolder, beforeFileName));
56
57
var messaging = new MockMessaging();
58
- var converter = new Wix3Converter(messaging, 4);
58
+ var converter = new WixConverter(messaging, 4);
59
var errors = converter.ConvertFile(targetFile, true);
60
61
Assert.Equal(7, errors);
@@ -164,7 +164,7 @@ namespace WixToolsetTest.Converters
164
private static void EnsureFixed(string targetFile)
165
{
166
var messaging2 = new MockMessaging();
167
- var converter2 = new Wix3Converter(messaging2, 4);
167
+ var converter2 = new WixConverter(messaging2, 4);
168
var errors2 = converter2.ConvertFile(targetFile, true);
169
Assert.Equal(0, errors2);
170
}
src/test/WixToolsetTest.Converters/CustomActionFixture.cs
+2
-2
@@ -34,7 +34,7 @@ namespace WixToolsetTest.Converters
34
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
35
36
var messaging = new MockMessaging();
37
- var converter = new Wix3Converter(messaging, 2, null, null);
37
+ var converter = new WixConverter(messaging, 2, null, null);
38
39
var errors = converter.ConvertDocument(document);
40
@@ -72,7 +72,7 @@ namespace WixToolsetTest.Converters
72
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
73
74
var messaging = new MockMessaging();
75
- var converter = new Wix3Converter(messaging, 2, null, null);
75
+ var converter = new WixConverter(messaging, 2, null, null);
76
77
var errors = converter.ConvertDocument(document);
78
src/test/WixToolsetTest.Converters/CustomTableFixture.cs
+5
-5
@@ -37,7 +37,7 @@ namespace WixToolsetTest.Converters
37
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
38
39
var messaging = new MockMessaging();
40
- var converter = new Wix3Converter(messaging, 2, null, null);
40
+ var converter = new WixConverter(messaging, 2, null, null);
41
42
var errors = converter.ConvertDocument(document);
43
Assert.Equal(4, errors);
@@ -75,7 +75,7 @@ namespace WixToolsetTest.Converters
75
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
76
77
var messaging = new MockMessaging();
78
- var converter = new Wix3Converter(messaging, 2, null, null);
78
+ var converter = new WixConverter(messaging, 2, null, null);
79
80
var errors = converter.ConvertDocument(document);
81
Assert.Equal(3, errors);
@@ -114,7 +114,7 @@ namespace WixToolsetTest.Converters
114
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
115
116
var messaging = new MockMessaging();
117
- var converter = new Wix3Converter(messaging, 2, null, null);
117
+ var converter = new WixConverter(messaging, 2, null, null);
118
119
var errors = converter.ConvertDocument(document);
120
Assert.Equal(2, errors);
@@ -150,7 +150,7 @@ namespace WixToolsetTest.Converters
150
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
151
152
var messaging = new MockMessaging();
153
- var converter = new Wix3Converter(messaging, 2, null, null);
153
+ var converter = new WixConverter(messaging, 2, null, null);
154
155
var errors = converter.ConvertDocument(document);
156
Assert.Equal(2, errors);
@@ -175,7 +175,7 @@ namespace WixToolsetTest.Converters
175
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
176
177
var messaging = new MockMessaging();
178
- var converter = new Wix3Converter(messaging, 2, null, null);
178
+ var converter = new WixConverter(messaging, 2, null, null);
179
180
var errors = converter.ConvertDocument(document);
181
src/test/WixToolsetTest.Converters/PropertyFixture.cs
+3
-3
@@ -32,7 +32,7 @@ namespace WixToolsetTest.Converters
32
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
33
34
var messaging = new MockMessaging();
35
- var converter = new Wix3Converter(messaging, 2, null, null);
35
+ var converter = new WixConverter(messaging, 2, null, null);
36
37
var errors = converter.ConvertDocument(document);
38
@@ -66,7 +66,7 @@ namespace WixToolsetTest.Converters
66
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
67
68
var messaging = new MockMessaging();
69
- var converter = new Wix3Converter(messaging, 2, null, null);
69
+ var converter = new WixConverter(messaging, 2, null, null);
70
71
var errors = converter.ConvertDocument(document);
72
@@ -96,7 +96,7 @@ namespace WixToolsetTest.Converters
96
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
97
98
var messaging = new MockMessaging();
99
- var converter = new Wix3Converter(messaging, 2, null, null);
99
+ var converter = new WixConverter(messaging, 2, null, null);
100
var errors = converter.ConvertDocument(document);
101
102
var actual = UnformattedDocumentString(document);
src/test/WixToolsetTest.Converters/SequenceFixture.cs
+1
-1
@@ -36,7 +36,7 @@ namespace WixToolsetTest.Converters
36
var document = XDocument.Parse(parse, LoadOptions.PreserveWhitespace | LoadOptions.SetLineInfo);
37
38
var messaging = new MockMessaging();
39
- var converter = new Wix3Converter(messaging, 2, null, null);
39
+ var converter = new WixConverter(messaging, 2, null, null);
40
41
var errors = converter.ConvertDocument(document);
42
Assert.Equal(2, errors);