aboutsummaryrefslogtreecommitdiff
path: root/src/WixToolset.Converters/ConvertCommand.cs
diff options
context:
space:
mode:
authorRob Mensching <rob@firegiant.com>2020-06-26 13:52:38 -0700
committerRob Mensching <rob@firegiant.com>2020-06-26 14:06:56 -0700
commit0eec58b87b3aeb73758f8bb581244e291631d767 (patch)
tree0378090af0f08bb075c3e62751159b5d214e6caa /src/WixToolset.Converters/ConvertCommand.cs
parent026c2fdb94a0333bfb840decee9464ba2f839705 (diff)
downloadwix-0eec58b87b3aeb73758f8bb581244e291631d767.tar.gz
wix-0eec58b87b3aeb73758f8bb581244e291631d767.tar.bz2
wix-0eec58b87b3aeb73758f8bb581244e291631d767.zip
Skip v3 conversions when re-converting v4 code
Rename Wix3Converter to WixConverter as the class is used for all conversions.
Diffstat (limited to 'src/WixToolset.Converters/ConvertCommand.cs')
-rw-r--r--src/WixToolset.Converters/ConvertCommand.cs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/WixToolset.Converters/ConvertCommand.cs b/src/WixToolset.Converters/ConvertCommand.cs
index 139b5813..51e7b997 100644
--- a/src/WixToolset.Converters/ConvertCommand.cs
+++ b/src/WixToolset.Converters/ConvertCommand.cs
@@ -133,7 +133,7 @@ namespace WixToolset.Converters
133 } 133 }
134 } 134 }
135 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 137
138 var errors = this.InspectSubDirectories(converter, Path.GetFullPath("."), cancellationToken); 138 var errors = this.InspectSubDirectories(converter, Path.GetFullPath("."), cancellationToken);
139 139
@@ -204,7 +204,7 @@ namespace WixToolset.Converters
204 /// </summary> 204 /// </summary>
205 /// <param name="directory">The directory whose sub-directories will be inspected.</param> 205 /// <param name="directory">The directory whose sub-directories will be inspected.</param>
206 /// <returns>The number of errors that were found.</returns> 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 { 208 {
209 var errors = 0; 209 var errors = 0;
210 210