7 files changed, 105 insertions, 24 deletions

diff --git a/src/api/wix/WixToolset.Data/ErrorMessages.cs b/src/api/wix/WixToolset.Data/ErrorMessages.cs
index 80738f5e..a833452d 100644
--- a/src/api/wix/WixToolset.Data/ErrorMessages.cs
+++ b/src/api/wix/WixToolset.Data/ErrorMessages.cs
@@ -1184,6 +1184,11 @@ namespace WixToolset.Data
             return Message(null, Ids.InvalidCommandLineFileName, "Invalid file name specified on the command line: '{0}'. Error message: '{1}'", fileName, error);
         }
 
+        public static Message InvalidBundleCondition(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string condition)
+        {
+            return Message(sourceLineNumbers, Ids.InvalidBundleCondition, "The {0}/@{1} attribute's value '{2}' is not a valid bundle condition.", elementName, attributeName, condition);
+        }
+
         public static Message InvalidDateTimeFormat(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string value)
         {
             return Message(sourceLineNumbers, Ids.InvalidDateTimeFormat, "The {0}/@{1} attribute's value '{2}' is not a valid date/time value. A date/time value should follow the format YYYY-MM-DDTHH:mm:ss.", elementName, attributeName, value);
@@ -2686,6 +2691,7 @@ namespace WixToolset.Data
             MultiplePackagePayloads3 = 406,
             MissingPackagePayload = 407,
             ExpectedAttributeWithoutOtherAttributes = 408,
+            InvalidBundleCondition = 409,
         }
     }
 }
diff --git a/src/api/wix/WixToolset.Data/WarningMessages.cs b/src/api/wix/WixToolset.Data/WarningMessages.cs
index b749bcf4..f555fd93 100644
--- a/src/api/wix/WixToolset.Data/WarningMessages.cs
+++ b/src/api/wix/WixToolset.Data/WarningMessages.cs
@@ -593,6 +593,11 @@ namespace WixToolset.Data
             return Message(null, Ids.UnableToResetAcls, "Unable to reset acls on destination files. Exception detail: {0}", error);
         }
 
+        public static Message UnavailableBundleConditionVariable(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string variable, string illegalValueList)
+        {
+            return Message(sourceLineNumbers, Ids.UnavailableBundleConditionVariable, "{0}/@{1} contains the built-in Variable '{2}', which is not available when it is evaluated. (Unavailable Variables are: {3}.). Rewrite the condition to avoid Variables that are never valid during its evaluation.", elementName, attributeName, variable, illegalValueList);
+        }
+
         public static Message UnclearShortcut(SourceLineNumber sourceLineNumbers, string shortcutId, string fileId, string componentId)
         {
             return Message(sourceLineNumbers, Ids.UnclearShortcut, "Because it is an advertised shortcut, the target of shortcut '{0}' will be the keypath of component '{2}' rather than parent file '{1}'. To eliminate this warning, you can (1) make the Shortcut element a child of the File element that is the keypath of component '{2}', (2) make file '{1}' the keypath of component '{2}', or (3) remove the @Advertise attribute so the shortcut is a non-advertised shortcut.", shortcutId, fileId, componentId);
@@ -804,6 +809,7 @@ namespace WixToolset.Data
             DetectConditionRecommended = 1153,
             CollidingModularizationTypes = 1156,
             InvalidEnvironmentVariable = 1157,
+            UnavailableBundleConditionVariable = 1159,
         }
     }
 }
diff --git a/src/api/wix/WixToolset.Extensibility/Data/BundleConditionPhase.cs b/src/api/wix/WixToolset.Extensibility/Data/BundleConditionPhase.cs
new file mode 100644
index 00000000..6d876bcc
--- /dev/null
+++ b/src/api/wix/WixToolset.Extensibility/Data/BundleConditionPhase.cs
@@ -0,0 +1,35 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensibility.Data
+{
+    /// <summary>
+    /// The Burn execution phase during which a Condition will be evaluated.
+    /// </summary>
+    public enum BundleConditionPhase
+    {
+        /// <summary>
+        /// Condition is evaluated by the engine before loading the BootstrapperApplication (Bundle/@Condition).
+        /// </summary>
+        Startup,
+
+        /// <summary>
+        /// Condition is evaluated during Detect (ExePackage/@DetectCondition).
+        /// </summary>
+        Detect,
+
+        /// <summary>
+        /// Condition is evaluated during Plan (ExePackage/@InstallCondition).
+        /// </summary>
+        Plan,
+
+        /// <summary>
+        /// Condition is evaluated during Apply (MsiProperty/@Condition).
+        /// </summary>
+        Execute,
+
+        /// <summary>
+        /// Condition is evaluated after Apply.
+        /// </summary>
+        Shutdown,
+    }
+}
diff --git a/src/api/wix/WixToolset.Extensibility/Services/IBackendHelper.cs b/src/api/wix/WixToolset.Extensibility/Services/IBackendHelper.cs
index 29b8f8e6..23ad44f5 100644
--- a/src/api/wix/WixToolset.Extensibility/Services/IBackendHelper.cs
+++ b/src/api/wix/WixToolset.Extensibility/Services/IBackendHelper.cs
@@ -74,17 +74,6 @@ namespace WixToolset.Extensibility.Services
         string GenerateIdentifier(string prefix, params string[] args);
 
         /// <summary>
-        /// Validates path is relative and canonicalizes it.
-        /// For example, "a\..\c\.\d.exe" => "c\d.exe".
-        /// </summary>
-        /// <param name="sourceLineNumbers"></param>
-        /// <param name="elementName"></param>
-        /// <param name="attributeName"></param>
-        /// <param name="relativePath"></param>
-        /// <returns>The original value if not relative, otherwise the canonicalized relative path.</returns>
-        string GetCanonicalRelativePath(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string relativePath);
-
-        /// <summary>
         /// Gets a valid code page from the given web name or integer value.
         /// </summary>
         /// <param name="value">A code page web name or integer value as a string.</param>
diff --git a/src/api/wix/WixToolset.Extensibility/Services/IBundleValidator.cs b/src/api/wix/WixToolset.Extensibility/Services/IBundleValidator.cs
new file mode 100644
index 00000000..fc88a443
--- /dev/null
+++ b/src/api/wix/WixToolset.Extensibility/Services/IBundleValidator.cs
@@ -0,0 +1,56 @@
+// Copyright (c) .NET Foundation and contributors. All rights reserved. Licensed under the Microsoft Reciprocal License. See LICENSE.TXT file in the project root for full license information.
+
+namespace WixToolset.Extensibility.Services
+{
+    using WixToolset.Data;
+    using WixToolset.Extensibility.Data;
+
+    /// <summary>
+    /// Interface provided to help with bundle validation.
+    /// </summary>
+    public interface IBundleValidator
+    {
+
+        /// <summary>
+        /// Validates path is relative and canonicalizes it.
+        /// For example, "a\..\c\.\d.exe" => "c\d.exe".
+        /// </summary>
+        /// <param name="sourceLineNumbers"></param>
+        /// <param name="elementName"></param>
+        /// <param name="attributeName"></param>
+        /// <param name="relativePath"></param>
+        /// <returns>The original value if not relative, otherwise the canonicalized relative path.</returns>
+        string GetCanonicalRelativePath(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string relativePath);
+
+        /// <summary>
+        /// Validates an MsiProperty name value and displays an error for an illegal value.
+        /// </summary>
+        /// <param name="sourceLineNumbers"></param>
+        /// <param name="elementName"></param>
+        /// <param name="attributeName"></param>
+        /// <param name="propertyName"></param>
+        /// <returns>Whether the name is valid.</returns>
+        bool ValidateBundleMsiPropertyName(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string propertyName);
+
+        /// <summary>
+        /// Validates a Bundle variable name and displays an error for an illegal value.
+        /// </summary>
+        /// <param name="sourceLineNumbers"></param>
+        /// <param name="elementName"></param>
+        /// <param name="attributeName"></param>
+        /// <param name="variableName"></param>
+        /// <returns>Whether the name is valid.</returns>
+        bool ValidateBundleVariableName(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string variableName);
+
+        /// <summary>
+        /// Validates a bundle condition and displays an error for an illegal value.
+        /// </summary>
+        /// <param name="sourceLineNumbers"></param>
+        /// <param name="elementName"></param>
+        /// <param name="attributeName"></param>
+        /// <param name="condition"></param>
+        /// <param name="phase"></param>
+        /// <returns>Whether the condition is valid.</returns>
+        bool ValidateBundleCondition(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string condition, BundleConditionPhase phase);
+    }
+}
diff --git a/src/api/wix/WixToolset.Extensibility/Services/IBurnBackendHelper.cs b/src/api/wix/WixToolset.Extensibility/Services/IBurnBackendHelper.cs
index ef5fcc65..1b6a2828 100644
--- a/src/api/wix/WixToolset.Extensibility/Services/IBurnBackendHelper.cs
+++ b/src/api/wix/WixToolset.Extensibility/Services/IBurnBackendHelper.cs
@@ -7,7 +7,7 @@ namespace WixToolset.Extensibility.Services
     /// <summary>
     /// Interface provided to help Burn backend extensions.
     /// </summary>
-    public interface IBurnBackendHelper : IBackendHelper
+    public interface IBurnBackendHelper : IBackendHelper, IBundleValidator
     {
         /// <summary>
         /// Adds the given XML to the BootstrapperApplicationData manifest.
diff --git a/src/api/wix/WixToolset.Extensibility/Services/IParseHelper.cs b/src/api/wix/WixToolset.Extensibility/Services/IParseHelper.cs
index fbe5aae4..de2c6f9f 100644
--- a/src/api/wix/WixToolset.Extensibility/Services/IParseHelper.cs
+++ b/src/api/wix/WixToolset.Extensibility/Services/IParseHelper.cs
@@ -13,7 +13,7 @@ namespace WixToolset.Extensibility.Services
     /// <summary>
     /// Interface provided to help compiler extensions parse.
     /// </summary>
-    public interface IParseHelper
+    public interface IParseHelper : IBundleValidator
     {
         /// <summary>
         /// Creates a version 3 name-based UUID.
@@ -323,17 +323,6 @@ namespace WixToolset.Extensibility.Services
         YesNoDefaultType GetAttributeYesNoDefaultValue(SourceLineNumber sourceLineNumbers, XAttribute attribute);
 
         /// <summary>
-        /// Validates path is relative and canonicalizes it.
-        /// For example, "a\..\c\.\d.exe" => "c\d.exe".
-        /// </summary>
-        /// <param name="sourceLineNumbers"></param>
-        /// <param name="elementName"></param>
-        /// <param name="attributeName"></param>
-        /// <param name="relativePath"></param>
-        /// <returns>The original value if not relative, otherwise the canonicalized relative path.</returns>
-        string GetCanonicalRelativePath(SourceLineNumber sourceLineNumbers, string elementName, string attributeName, string relativePath);
-
-        /// <summary>
         /// Gets a source line number for an element.
         /// </summary>
         /// <param name="element">Element to get source line number.</param>