Support ui:WixUI with WixUI_Common.
It's not needed but we should support the consistency. Fixes https://github.com/wixtoolset/issues/issues/6998
Bob Arnson committed
Dec 21, 2022 at 18:21 UTC
971b66587a28ffcd17a00e98c3995772d1f5746c
2 files changed
+10
-2
src/ext/UI/test/WixToolsetTest.UI/UIExtensionFixture.cs
+1
-1
@@ -243,7 +243,7 @@ namespace WixToolsetTest.UI
243
{
244
"build",
245
Path.Combine(folder, "Package.wxs"),
246
- "-ext", Path.GetFullPath(new Uri(typeof(UIExtensionFactory).Assembly.CodeBase).LocalPath),
246
+ "-ext", Path.GetFullPath(typeof(UIExtensionFactory).Assembly.Location),
247
"-bindpath", bindFolder,
248
"-intermediateFolder", intermediateFolder,
249
"-o", Path.Combine(intermediateFolder, @"bin\test.msi")
src/ext/UI/wixlib/Common.wxs
+9
-1
@@ -1,4 +1,4 @@
1
-<!-- 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. -->
1
+<!-- 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. -->
2
3
4
<Wix xmlns="http://wixtoolset.org/schemas/v4/wxs">
@@ -66,4 +66,12 @@
66
<UIText Id="VolumeCostVolume" Value="!(loc.UITextVolumeCostVolume)" />
67
</UI>
68
</Fragment>
69
+
70
+ <?foreach WIXUIARCH in X86;X64;A64 ?>
71
+ <Fragment>
72
+ <UI Id="WixUI_Common_$(WIXUIARCH)">
73
+ <!-- An empty section so you can use ui:WixUI to refer to WixUI_Common. -->
74
+ </UI>
75
+ </Fragment>
76
+ <?endforeach?>
77
</Wix>