diff options
-rw-r--r-- | src/WixToolset.Converters/FixupCommandBase.cs | 3 | ||||
-rw-r--r-- | src/WixToolset.Converters/WixConverter.cs | 15 |
2 files changed, 16 insertions, 2 deletions
diff --git a/src/WixToolset.Converters/FixupCommandBase.cs b/src/WixToolset.Converters/FixupCommandBase.cs index 0f58fbdb..14edf97b 100644 --- a/src/WixToolset.Converters/FixupCommandBase.cs +++ b/src/WixToolset.Converters/FixupCommandBase.cs | |||
@@ -69,7 +69,7 @@ namespace WixToolset.Converters | |||
69 | return true; | 69 | return true; |
70 | 70 | ||
71 | case "n": | 71 | case "n": |
72 | case "--dry-run": | 72 | case "-dry-run": |
73 | this.DryRun = true; | 73 | this.DryRun = true; |
74 | return true; | 74 | return true; |
75 | 75 | ||
@@ -81,6 +81,7 @@ namespace WixToolset.Converters | |||
81 | case "s": | 81 | case "s": |
82 | case "r": | 82 | case "r": |
83 | case "-recurse": | 83 | case "-recurse": |
84 | case "-recursive": | ||
84 | this.Recurse = true; | 85 | this.Recurse = true; |
85 | return true; | 86 | return true; |
86 | 87 | ||
diff --git a/src/WixToolset.Converters/WixConverter.cs b/src/WixToolset.Converters/WixConverter.cs index bfdaa31b..ac63f26b 100644 --- a/src/WixToolset.Converters/WixConverter.cs +++ b/src/WixToolset.Converters/WixConverter.cs | |||
@@ -88,6 +88,7 @@ namespace WixToolset.Converters | |||
88 | private static readonly XName Include3ElementName = Wix3Namespace + "Include"; | 88 | private static readonly XName Include3ElementName = Wix3Namespace + "Include"; |
89 | private static readonly XName IncludeElementWithoutNamespaceName = XNamespace.None + "Include"; | 89 | private static readonly XName IncludeElementWithoutNamespaceName = XNamespace.None + "Include"; |
90 | private static readonly XName SummaryInformationElementName = WixNamespace + "SummaryInformation"; | 90 | private static readonly XName SummaryInformationElementName = WixNamespace + "SummaryInformation"; |
91 | private static readonly XName MediaTemplateElementName = WixNamespace + "MediaTemplate"; | ||
91 | 92 | ||
92 | private static readonly Dictionary<string, XNamespace> OldToNewNamespaceMapping = new Dictionary<string, XNamespace>() | 93 | private static readonly Dictionary<string, XNamespace> OldToNewNamespaceMapping = new Dictionary<string, XNamespace>() |
93 | { | 94 | { |
@@ -730,6 +731,13 @@ namespace WixToolset.Converters | |||
730 | } | 731 | } |
731 | } | 732 | } |
732 | 733 | ||
734 | var xMediaTemplate = element.Element(MediaTemplateElementName); | ||
735 | if (xMediaTemplate?.HasAttributes == false | ||
736 | && this.OnError(ConverterTestType.DefaultMediaTemplate, element, "A MediaTemplate with no attributes set is now provided by default. Remove the element.")) | ||
737 | { | ||
738 | xMediaTemplate.Remove(); | ||
739 | } | ||
740 | |||
733 | if (this.OnError(ConverterTestType.ProductAndPackageRenamed, element, "The Product and Package elements have been renamed and reorganized for simplicity.")) | 741 | if (this.OnError(ConverterTestType.ProductAndPackageRenamed, element, "The Product and Package elements have been renamed and reorganized for simplicity.")) |
734 | { | 742 | { |
735 | var xPackage = element; | 743 | var xPackage = element; |
@@ -742,7 +750,7 @@ namespace WixToolset.Converters | |||
742 | 750 | ||
743 | RemoveAttribute(xSummaryInformation, "AdminImage"); | 751 | RemoveAttribute(xSummaryInformation, "AdminImage"); |
744 | RemoveAttribute(xSummaryInformation, "Comments"); | 752 | RemoveAttribute(xSummaryInformation, "Comments"); |
745 | MoveAttribute(xSummaryInformation, "Compressed", xPackage); | 753 | MoveAttribute(xSummaryInformation, "Compressed", xPackage, defaultValue: "no"); |
746 | RemoveAttribute(xSummaryInformation, "Id"); | 754 | RemoveAttribute(xSummaryInformation, "Id"); |
747 | MoveAttribute(xSummaryInformation, "InstallerVersion", xPackage, defaultValue: "500"); | 755 | MoveAttribute(xSummaryInformation, "InstallerVersion", xPackage, defaultValue: "500"); |
748 | MoveAttribute(xSummaryInformation, "InstallScope", xPackage, "Scope", defaultValue: "perMachine"); | 756 | MoveAttribute(xSummaryInformation, "InstallScope", xPackage, "Scope", defaultValue: "perMachine"); |
@@ -1409,6 +1417,11 @@ namespace WixToolset.Converters | |||
1409 | /// The Module and Package elements have been renamed and reorganized. | 1417 | /// The Module and Package elements have been renamed and reorganized. |
1410 | /// </summary> | 1418 | /// </summary> |
1411 | ModuleAndPackageRenamed, | 1419 | ModuleAndPackageRenamed, |
1420 | |||
1421 | /// <summary> | ||
1422 | /// A MediaTemplate with no attributes set is now provided by default. | ||
1423 | /// </summary> | ||
1424 | DefaultMediaTemplate, | ||
1412 | } | 1425 | } |
1413 | } | 1426 | } |
1414 | } | 1427 | } |