1 files changed, 4 insertions, 109 deletions

diff --git a/src/WixToolset.Core/Compiler_2.cs b/src/WixToolset.Core/Compiler_2.cs
index df4c037d..18a0366e 100644
--- a/src/WixToolset.Core/Compiler_2.cs
+++ b/src/WixToolset.Core/Compiler_2.cs
@@ -186,9 +186,6 @@ namespace WixToolset.Core
                         case "ComponentGroup":
                             this.ParseComponentGroupElement(child, ComplexReferenceParentType.Unknown, null);
                             break;
-                        case "Condition":
-                            this.ParseConditionElement(child, node.Name.LocalName, null, null);
-                            break;
                         case "CustomAction":
                             this.ParseCustomActionElement(child);
                             break;
@@ -228,6 +225,9 @@ namespace WixToolset.Core
                         case "InstanceTransforms":
                             this.ParseInstanceTransformsElement(child);
                             break;
+                        case "Launch":
+                            this.ParseLaunchElement(child);
+                            break;
                         case "MajorUpgrade":
                             this.ParseMajorUpgradeElement(child, contextValues);
                             break;
@@ -1235,31 +1235,7 @@ namespace WixToolset.Core
                 id = this.Core.CreateIdentifier("pme", objectId, tableName, sddl);
             }
 
-            foreach (var child in node.Elements())
-            {
-                if (CompilerCore.WixNamespace == child.Name.Namespace)
-                {
-                    switch (child.Name.LocalName)
-                    {
-                    case "Condition":
-                        if (null != condition)
-                        {
-                            var childSourceLineNumbers = Preprocessor.GetSourceLineNumbers(node);
-                            this.Core.Write(ErrorMessages.TooManyChildren(childSourceLineNumbers, node.Name.LocalName, child.Name.LocalName));
-                        }
-
-                        condition = this.ParseConditionElement(child, node.Name.LocalName, null, null);
-                        break;
-                    default:
-                        this.Core.UnexpectedElement(node, child);
-                        break;
-                    }
-                }
-                else
-                {
-                    this.Core.ParseExtensionElement(node, child);
-                }
-            }
+            this.Core.ParseForExtensionElements(node);
 
             if (!this.Core.EncounteredError)
             {
@@ -1537,20 +1513,6 @@ namespace WixToolset.Core
                 this.Core.Write(ErrorMessages.CannotAuthorSpecialProperties(sourceLineNumbers, id.Id));
             }
 
-            var innerText = this.Core.GetTrimmedInnerText(node);
-            if (null != value)
-            {
-                // cannot specify both the value attribute and inner text
-                if (!String.IsNullOrEmpty(innerText))
-                {
-                    this.Core.Write(ErrorMessages.IllegalAttributeWithInnerText(sourceLineNumbers, node.Name.LocalName, "Value"));
-                }
-            }
-            else // value attribute not specified, use inner text if any.
-            {
-                value = innerText;
-            }
-
             if ("ErrorDialog" == id.Id)
             {
                 this.Core.CreateSimpleReference(sourceLineNumbers, TupleDefinitions.Dialog, value);
@@ -2092,11 +2054,6 @@ namespace WixToolset.Core
 
             if (multiStringValue == null)
             {
-                multiStringValue = Common.GetInnerText(node);
-            }
-
-            if (multiStringValue == null)
-            {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Value"));
             }
 
@@ -2683,12 +2640,6 @@ namespace WixToolset.Core
                     }
                 }
 
-                // Get the condition from the inner text of the element.
-                if (condition == null)
-                {
-                    condition = this.Core.GetConditionInnerText(child);
-                }
-
                 if (customAction && "Custom" == actionName)
                 {
                     this.Core.Write(ErrorMessages.ExpectedAttribute(childSourceLineNumbers, child.Name.LocalName, "Action"));
@@ -3154,11 +3105,6 @@ namespace WixToolset.Core
 
             if (privilege == null)
             {
-                privilege = Common.GetInnerText(node);
-            }
-
-            if (privilege == null)
-            {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Name"));
             }
 
@@ -3520,11 +3466,6 @@ namespace WixToolset.Core
 
             if (argument == null)
             {
-                argument = this.Core.GetTrimmedInnerText(node);
-            }
-
-            if (argument == null)
-            {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Value"));
             }
 
@@ -3860,11 +3801,6 @@ namespace WixToolset.Core
                 }
             }
 
-            if (condition == null)
-            {
-                condition = this.Core.GetConditionInnerText(node);
-            }
-
             if (null == id)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
@@ -3957,29 +3893,6 @@ namespace WixToolset.Core
                             this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, sequenceValue, "execute", "ui", "both"));
                             break;
                         }
-                        //if (0 < sequenceValue.Length)
-                        //{
-                        //    var sequenceType = Wix.Enums.ParseSequenceType(sequenceValue);
-                        //    switch (sequenceType)
-                        //    {
-                        //    case Wix.SequenceType.execute:
-                        //        sequences = new string[] { "InstallExecuteSequence" };
-                        //        break;
-                        //    case Wix.SequenceType.ui:
-                        //        sequences = new string[] { "InstallUISequence" };
-                        //        break;
-                        //    case Wix.SequenceType.first:
-                        //        firstSequence = true;
-                        //        // default puts it in both sequence which is what we want
-                        //        break;
-                        //    case Wix.SequenceType.both:
-                        //        // default so no work necessary.
-                        //        break;
-                        //    default:
-                        //        this.Core.Write(ErrorMessages.IllegalAttributeValue(sourceLineNumbers, node.Name.LocalName, attrib.Name.LocalName, sequenceValue, "execute", "ui", "both"));
-                        //        break;
-                        //    }
-                        //}
                         break;
                     case "Value":
                         value = this.Core.GetAttributeValue(sourceLineNumbers, attrib, EmptyRule.CanBeEmpty);
@@ -3995,11 +3908,6 @@ namespace WixToolset.Core
                 }
             }
 
-            if (condition == null)
-            {
-                condition = this.Core.GetConditionInnerText(node);
-            }
-
             if (null == id)
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Id"));
@@ -4528,19 +4436,6 @@ namespace WixToolset.Core
                 id = this.Core.CreateIdentifier("scp", shortcutId, key.ToUpperInvariant());
             }
 
-            var innerText = this.Core.GetTrimmedInnerText(node);
-            if (!String.IsNullOrEmpty(innerText))
-            {
-                if (String.IsNullOrEmpty(value))
-                {
-                    value = innerText;
-                }
-                else // cannot specify both the value attribute and inner text
-                {
-                    this.Core.Write(ErrorMessages.IllegalAttributeWithInnerText(sourceLineNumbers, node.Name.LocalName, "Value"));
-                }
-            }
-
             if (String.IsNullOrEmpty(value))
             {
                 this.Core.Write(ErrorMessages.ExpectedAttribute(sourceLineNumbers, node.Name.LocalName, "Value"));