diff options
author | Rob Mensching <rob@firegiant.com> | 2023-03-09 03:43:57 -0800 |
---|---|---|
committer | Rob Mensching <rob@firegiant.com> | 2023-03-09 06:17:00 -0700 |
commit | 3efe3f3a8682f333741b3c52e10eea2297f43dc9 (patch) | |
tree | c4935644e337175b44ba137e99265144444857bc /src/ext/UI/wixlib/WixUI_Minimal.wxs | |
parent | 3bc1056b69b420de75ce571c102b3b24c8cab390 (diff) | |
download | wix-3efe3f3a8682f333741b3c52e10eea2297f43dc9.tar.gz wix-3efe3f3a8682f333741b3c52e10eea2297f43dc9.tar.bz2 wix-3efe3f3a8682f333741b3c52e10eea2297f43dc9.zip |
Prevent direct references to platform neutral WixUI
Fixes 7265
Diffstat (limited to 'src/ext/UI/wixlib/WixUI_Minimal.wxs')
-rw-r--r-- | src/ext/UI/wixlib/WixUI_Minimal.wxs | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/ext/UI/wixlib/WixUI_Minimal.wxs b/src/ext/UI/wixlib/WixUI_Minimal.wxs index 6d1709c5..0c69d8f8 100644 --- a/src/ext/UI/wixlib/WixUI_Minimal.wxs +++ b/src/ext/UI/wixlib/WixUI_Minimal.wxs | |||
@@ -1,7 +1,5 @@ | |||
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 | 2 | ||
3 | |||
4 | |||
5 | <!-- | 3 | <!-- |
6 | First-time install dialog sequence: | 4 | First-time install dialog sequence: |
7 | - WixUI_WelcomeEulaDlg | 5 | - WixUI_WelcomeEulaDlg |
@@ -17,8 +15,18 @@ Patch dialog sequence: | |||
17 | --> | 15 | --> |
18 | 16 | ||
19 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> | 17 | <Wix xmlns="http://wixtoolset.org/schemas/v4/wxs"> |
18 | <?foreach WIXUIARCH in X86;X64;A64 ?> | ||
20 | <Fragment> | 19 | <Fragment> |
21 | <UI Id="WixUI_Minimal"> | 20 | <UI Id="WixUI_Minimal_$(WIXUIARCH)"> |
21 | <Publish Dialog="WelcomeEulaDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" /> | ||
22 | </UI> | ||
23 | |||
24 | <UIRef Id="WixUI_Minimal" /> | ||
25 | </Fragment> | ||
26 | <?endforeach?> | ||
27 | |||
28 | <Fragment> | ||
29 | <UI Id="file WixUI_Minimal"> | ||
22 | <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> | 30 | <TextStyle Id="WixUI_Font_Normal" FaceName="Tahoma" Size="8" /> |
23 | <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> | 31 | <TextStyle Id="WixUI_Font_Bigger" FaceName="Tahoma" Size="12" /> |
24 | <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" /> | 32 | <TextStyle Id="WixUI_Font_Title" FaceName="Tahoma" Size="9" Bold="yes" /> |
@@ -59,12 +67,4 @@ Patch dialog sequence: | |||
59 | 67 | ||
60 | <UIRef Id="WixUI_Common" /> | 68 | <UIRef Id="WixUI_Common" /> |
61 | </Fragment> | 69 | </Fragment> |
62 | |||
63 | <?foreach WIXUIARCH in X86;X64;A64 ?> | ||
64 | <Fragment> | ||
65 | <UI Id="WixUI_Minimal_$(WIXUIARCH)"> | ||
66 | <Publish Dialog="WelcomeEulaDlg" Control="Print" Event="DoAction" Value="WixUIPrintEula_$(WIXUIARCH)" /> | ||
67 | </UI> | ||
68 | </Fragment> | ||
69 | <?endforeach?> | ||
70 | </Wix> | 70 | </Wix> |