diff options
| author | Rob Mensching <rob@firegiant.com> | 2023-03-09 05:41:49 -0800 |
|---|---|---|
| committer | Rob Mensching <rob@firegiant.com> | 2023-03-09 07:50:49 -0700 |
| commit | 5abe137e6f563ea76a97c55f468d2d7620861937 (patch) | |
| tree | df5d25c831ea2ed143bd9b090f8e44da3a692a17 /src | |
| parent | a14cb82fcca0b5522dfefe862493ad2e51240a84 (diff) | |
| download | wix-5abe137e6f563ea76a97c55f468d2d7620861937.tar.gz wix-5abe137e6f563ea76a97c55f468d2d7620861937.tar.bz2 wix-5abe137e6f563ea76a97c55f468d2d7620861937.zip | |
Remove now redundant code due to updated LaunchCondition converter
Diffstat (limited to 'src')
| -rw-r--r-- | src/wix/WixToolset.Converters/WixConverter.cs | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/src/wix/WixToolset.Converters/WixConverter.cs b/src/wix/WixToolset.Converters/WixConverter.cs index 93e1692d..f2711300 100644 --- a/src/wix/WixToolset.Converters/WixConverter.cs +++ b/src/wix/WixToolset.Converters/WixConverter.cs | |||
| @@ -1355,25 +1355,6 @@ namespace WixToolset.Converters | |||
| 1355 | } | 1355 | } |
| 1356 | } | 1356 | } |
| 1357 | 1357 | ||
| 1358 | var xConditions = element.Elements(ConditionElementName).ToList(); | ||
| 1359 | foreach (var xCondition in xConditions) | ||
| 1360 | { | ||
| 1361 | var message = xCondition.Attribute("Message")?.Value; | ||
| 1362 | |||
| 1363 | if (!String.IsNullOrEmpty(message) && | ||
| 1364 | TryGetInnerText(xCondition, out var text, out var comments) && | ||
| 1365 | this.OnInformation(ConverterTestType.InnerTextDeprecated, element, "Using {0} element text is deprecated. Use the 'Launch' element instead.", xCondition.Name.LocalName)) | ||
| 1366 | { | ||
| 1367 | using (var lab = new ConversionLab(xCondition)) | ||
| 1368 | { | ||
| 1369 | lab.ReplaceTargetElement(new XElement(LaunchElementName, | ||
| 1370 | new XAttribute("Condition", text), | ||
| 1371 | new XAttribute("Message", message))); | ||
| 1372 | lab.AddCommentsAsSiblings(comments); | ||
| 1373 | } | ||
| 1374 | } | ||
| 1375 | } | ||
| 1376 | |||
| 1377 | var xMediaTemplate = element.Element(MediaTemplateElementName); | 1358 | var xMediaTemplate = element.Element(MediaTemplateElementName); |
| 1378 | if (xMediaTemplate?.HasAttributes == false | 1359 | if (xMediaTemplate?.HasAttributes == false |
| 1379 | && this.OnInformation(ConverterTestType.DefaultMediaTemplate, element, "A MediaTemplate with no attributes set is now provided by default. Remove the element.")) | 1360 | && this.OnInformation(ConverterTestType.DefaultMediaTemplate, element, "A MediaTemplate with no attributes set is now provided by default. Remove the element.")) |