1 files changed, 13 insertions, 1 deletions

diff --git a/src/ext/UI/wixext/UICompiler.cs b/src/ext/UI/wixext/UICompiler.cs
index 5f2751c9..57a0dc16 100644
--- a/src/ext/UI/wixext/UICompiler.cs
+++ b/src/ext/UI/wixext/UICompiler.cs
@@ -56,6 +56,7 @@ namespace WixToolset.UI
             var sourceLineNumbers = this.ParseHelper.GetSourceLineNumbers(element);
             string id = null;
             string installDirectory = null;
+            YesNoType extendedPathValidation = YesNoType.No;
 
             foreach (var attrib in element.Attributes())
             {
@@ -69,6 +70,9 @@ namespace WixToolset.UI
                         case "InstallDirectory":
                             installDirectory = this.ParseHelper.GetAttributeIdentifierValue(sourceLineNumbers, attrib);
                             break;
+                        case "ExtendedPathValidation":
+                            extendedPathValidation = this.ParseHelper.GetAttributeYesNoValue(sourceLineNumbers, attrib);
+                            break;
                         default:
                             this.ParseHelper.UnexpectedAttribute(element, attrib);
                             break;
@@ -87,7 +91,15 @@ namespace WixToolset.UI
             else
             {
                 var platform = this.Context.Platform == Platform.ARM64 ? "A64" : this.Context.Platform.ToString();
-                this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixUI, $"{id}_{platform}");
+
+                if (extendedPathValidation == YesNoType.No)
+                {
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixUI, $"{id}_{platform}");
+                }
+                else
+                {
+                    this.ParseHelper.CreateSimpleReference(section, sourceLineNumbers, SymbolDefinitions.WixUI, $"{id}_ExtendedPathValidation_{platform}");
+                }
 
                 if (installDirectory != null)
                 {