From 971b66587a28ffcd17a00e98c3995772d1f5746c Mon Sep 17 00:00:00 2001
From: Bob Arnson <bob@firegiant.com>
Date: Wed, 21 Dec 2022 18:21:07 -0500
Subject: Support ui:WixUI with WixUI_Common.

It's not needed but we should support the consistency.

Fixes https://github.com/wixtoolset/issues/issues/6998
---
 src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs |  2 +-
 src/ext/UI/wixlib/Common.wxs                            | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
index c637b5dd..e1f18be5 100644
--- a/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+++ b/src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
@@ -243,7 +243,7 @@ namespace WixToolsetTest.UI
                 {
                     "build",
                     Path.Combine(folder, "Package.wxs"),
-                    "-ext", Path.GetFullPath(new Uri(typeof(UIExtensionFactory).Assembly.CodeBase).LocalPath),
+                    "-ext", Path.GetFullPath(typeof(UIExtensionFactory).Assembly.Location),
                     "-bindpath", bindFolder,
                     "-intermediateFolder", intermediateFolder,
                     "-o", Path.Combine(intermediateFolder, @"bin\test.msi")
diff --git a/src/ext/UI/wixlib/Common.wxs b/src/ext/UI/wixlib/Common.wxs
index 476b00da..bfaa44b8 100644
--- a/src/ext/UI/wixlib/Common.wxs
+++ b/src/ext/UI/wixlib/Common.wxs
@@ -1,4 +1,4 @@
-<!-- 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. -->
+<!-- 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. -->
 
 
 <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -66,4 +66,12 @@
             <UIText Id="VolumeCostVolume" Value="!(loc.UITextVolumeCostVolume)" />
         </UI>
     </Fragment>
+
+    <?foreach WIXUIARCH in X86;X64;A64 ?>
+    <Fragment>
+        <UI Id="WixUI_Common_$(WIXUIARCH)">
+            <!-- An empty section so you can use ui:WixUI to refer to WixUI_Common. -->
+        </UI>
+    </Fragment>
+    <?endforeach?>
 </Wix>
-- 
cgit v1.2.3-55-g6feb