Update of /cvsroot/wix/wix/src/ext/UIExtension/wixlib In directory sc8-pr-cvs9.sourceforge.net:/tmp/cvs-serv7721/src/ext/UIExtension/wixlib Modified Files: BrowseDlg.wxs CancelDlg.wxs Common.wxs CustomizeDlg.wxs DiskCostDlg.wxs ErrorDlg.wxs ErrorProgressText.wxs ExitDialog.wxs FatalError.wxs FilesInUse.wxs InstallDirDlg.wxs LicenseAgreementDlg.wxs MaintenanceTypeDlg.wxs MaintenanceWelcomeDlg.wxs MsiRMFilesInUse.wxs OutOfDiskDlg.wxs OutOfRbDiskDlg.wxs PrepareDlg.wxs ProgressDlg.wxs ResumeDlg.wxs SetupTypeDlg.wxs UserExit.wxs VerifyReadyDlg.wxs WaitForCostingDlg.wxs WelcomeDlg.wxs WelcomeEulaDlg.wxs WixUI_FeatureTree.wxs WixUI_InstallDir.wxs WixUI_Minimal.wxs WixUI_Mondo.wxs WixUI_en-us.wxl Log Message: DerekC: More strictly parse some Shortcut attribute values. BobArnso: Added extension .XSDs to binaries .zip JRock: Fixed a couple of issues with the public builds related to the MSBuild stuff and WixTasks. Also fixed a couple of issues on the public build when trying to build from a path that has spaces in it. DerekC: Change the xml namespace URI for WiX 3.0 since the xml schema is now different from the xml schema for WiX 2.0. ScotK: Fixing crash in ConfigureIIs when it runs into a malformed WebSite in the metabase. DerekC: - SFBUG:1445483 - No support for Long Filenames in COM Registry entries - Fix several issues related to COM registration elements - Properly parse more identifier attribute values - Move the creation of simple references closer to the places in the compiler code where the attribute's value is parsed - Change the PerfCounter element to use the formatted string for long file names to reflect the fact that the short file name format of [!FileId] actually resolves to long file names outside of the Registry table Index: FilesInUse.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/FilesInUse.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FilesInUse.wxs 17 May 2006 08:02:48 -0000 1.2 --- FilesInUse.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: SetupTypeDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/SetupTypeDlg.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** SetupTypeDlg.wxs 24 May 2006 09:21:41 -0000 1.3 --- SetupTypeDlg.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: ProgressDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/ProgressDlg.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** ProgressDlg.wxs 12 Jun 2006 01:42:51 -0000 1.3 --- ProgressDlg.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: CustomizeDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/CustomizeDlg.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** CustomizeDlg.wxs 24 May 2006 09:21:41 -0000 1.3 --- CustomizeDlg.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: ErrorProgressText.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/ErrorProgressText.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ErrorProgressText.wxs 17 May 2006 08:02:48 -0000 1.2 --- ErrorProgressText.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI Id="WixUI_ErrorProgressText"> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI Id="WixUI_ErrorProgressText"> Index: DiskCostDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/DiskCostDlg.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** DiskCostDlg.wxs 17 May 2006 08:02:48 -0000 1.2 --- DiskCostDlg.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: VerifyReadyDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/VerifyReadyDlg.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** VerifyReadyDlg.wxs 24 May 2006 09:21:41 -0000 1.3 --- VerifyReadyDlg.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: ResumeDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/ResumeDlg.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ResumeDlg.wxs 17 May 2006 08:02:48 -0000 1.2 --- ResumeDlg.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: WelcomeEulaDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/WelcomeEulaDlg.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WelcomeEulaDlg.wxs 24 May 2006 23:41:12 -0000 1.3 --- WelcomeEulaDlg.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: FatalError.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/FatalError.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** FatalError.wxs 17 May 2006 08:02:48 -0000 1.2 --- FatalError.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: MaintenanceWelcomeDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/MaintenanceWelcomeDlg.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MaintenanceWelcomeDlg.wxs 24 May 2006 09:21:41 -0000 1.3 --- MaintenanceWelcomeDlg.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: WixUI_FeatureTree.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/WixUI_FeatureTree.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WixUI_FeatureTree.wxs 24 May 2006 09:21:41 -0000 1.3 --- WixUI_FeatureTree.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 21,25 **** --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI Id="WixUI_FeatureTree"> --- 21,25 ---- --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI Id="WixUI_FeatureTree"> *************** *** 44,48 **** <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Back]">1</Publish> ! <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Next]" Order="2">LicenseAccepted = "1"</Publish> <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="[WixUI_CustomizeDlg_BackChange]" Order="1">WixUI_InstallMode = "Change"</Publish> --- 44,48 ---- <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Back]">1</Publish> ! <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Next]" Order="2">LicenseAccepted = "1"</Publish> <Publish Dialog="CustomizeDlg" Control="Back" Event="NewDialog" Value="[WixUI_CustomizeDlg_BackChange]" Order="1">WixUI_InstallMode = "Change"</Publish> Index: OutOfRbDiskDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/OutOfRbDiskDlg.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OutOfRbDiskDlg.wxs 17 May 2006 08:02:48 -0000 1.2 --- OutOfRbDiskDlg.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: WixUI_Minimal.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/WixUI_Minimal.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WixUI_Minimal.wxs 24 May 2006 09:21:41 -0000 1.3 --- WixUI_Minimal.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 20,24 **** --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI Id="WixUI_Minimal"> --- 20,24 ---- --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI Id="WixUI_Minimal"> Index: ExitDialog.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/ExitDialog.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ExitDialog.wxs 17 May 2006 08:02:48 -0000 1.2 --- ExitDialog.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: CancelDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/CancelDlg.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** CancelDlg.wxs 17 May 2006 08:02:48 -0000 1.2 --- CancelDlg.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: Common.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/Common.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** Common.wxs 24 May 2006 23:41:11 -0000 1.3 --- Common.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <Binary Id="WixUI_Bmp_Banner" SourceFile="!(wix.WixUIBannerBmp=$(var.bannerBmp))" /> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <Binary Id="WixUI_Bmp_Banner" SourceFile="!(wix.WixUIBannerBmp=$(var.bannerBmp))" /> *************** *** 76,82 **** <Fragment> ! <!-- print EULA functionality --> ! <CustomAction Id="WixUIPrintEula" BinaryKey="WixUIWixca" DllEntry="PrintEula" Return="ignore" Execute="immediate" /> ! <Binary Id="WixUIWixca" SourceFile="$(var.printeulaDll)" /> </Fragment> </Wix> \ No newline at end of file --- 76,82 ---- <Fragment> ! <!-- print EULA functionality --> ! <CustomAction Id="WixUIPrintEula" BinaryKey="WixUIWixca" DllEntry="PrintEula" Return="ignore" Execute="immediate" /> ! <Binary Id="WixUIWixca" SourceFile="$(var.printeulaDll)" /> </Fragment> </Wix> \ No newline at end of file Index: PrepareDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/PrepareDlg.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** PrepareDlg.wxs 17 May 2006 08:02:48 -0000 1.2 --- PrepareDlg.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: ErrorDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/ErrorDlg.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** ErrorDlg.wxs 17 May 2006 08:02:48 -0000 1.2 --- ErrorDlg.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: MaintenanceTypeDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/MaintenanceTypeDlg.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** MaintenanceTypeDlg.wxs 24 May 2006 09:21:41 -0000 1.3 --- MaintenanceTypeDlg.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: WixUI_Mondo.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/WixUI_Mondo.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WixUI_Mondo.wxs 24 May 2006 09:21:41 -0000 1.3 --- WixUI_Mondo.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 23,27 **** --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI Id="WixUI_Mondo"> --- 23,27 ---- --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI Id="WixUI_Mondo"> *************** *** 46,50 **** <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Back]">1</Publish> ! <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Next]" Order="2">LicenseAccepted = "1"</Publish> <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="[WixUI_SetupTypeDlg_Back]">1</Publish> --- 46,50 ---- <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Back]">1</Publish> ! <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Next]" Order="2">LicenseAccepted = "1"</Publish> <Publish Dialog="SetupTypeDlg" Control="Back" Event="NewDialog" Value="[WixUI_SetupTypeDlg_Back]">1</Publish> Index: OutOfDiskDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/OutOfDiskDlg.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** OutOfDiskDlg.wxs 17 May 2006 08:02:48 -0000 1.2 --- OutOfDiskDlg.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: BrowseDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/BrowseDlg.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** BrowseDlg.wxs 17 May 2006 08:02:48 -0000 1.2 --- BrowseDlg.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: WixUI_en-us.wxl =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/WixUI_en-us.wxl,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WixUI_en-us.wxl 12 Jul 2006 09:00:28 -0000 1.3 --- WixUI_en-us.wxl 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2003/11/localization"> <String Id="WixUIBack" Overridable="yes">&Back</String> <String Id="WixUINext" Overridable="yes">&Next</String> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <WixLocalization Culture="en-us" xmlns="http://schemas.microsoft.com/wix/2006/localization"> <String Id="WixUIBack" Overridable="yes">&Back</String> <String Id="WixUINext" Overridable="yes">&Next</String> Index: InstallDirDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/InstallDirDlg.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** InstallDirDlg.wxs 24 May 2006 09:21:41 -0000 1.3 --- InstallDirDlg.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: WelcomeDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/WelcomeDlg.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WelcomeDlg.wxs 24 May 2006 09:21:41 -0000 1.3 --- WelcomeDlg.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: UserExit.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/UserExit.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** UserExit.wxs 17 May 2006 08:02:48 -0000 1.2 --- UserExit.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: WixUI_InstallDir.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/WixUI_InstallDir.wxs,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** WixUI_InstallDir.wxs 24 May 2006 09:21:41 -0000 1.3 --- WixUI_InstallDir.wxs 19 Jul 2006 05:54:28 -0000 1.4 *************** *** 21,25 **** --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI Id="WixUI_InstallDir"> --- 21,25 ---- --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI Id="WixUI_InstallDir"> *************** *** 46,50 **** <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Back]">1</Publish> ! <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Next]" Order="2">LicenseAccepted = "1"</Publish> <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="[WixUI_InstallDirDlg_Back]">1</Publish> --- 46,50 ---- <Publish Dialog="LicenseAgreementDlg" Control="Back" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Back]">1</Publish> ! <Publish Dialog="LicenseAgreementDlg" Control="Next" Event="NewDialog" Value="[WixUI_LicenseAgreementDlg_Next]" Order="2">LicenseAccepted = "1"</Publish> <Publish Dialog="InstallDirDlg" Control="Back" Event="NewDialog" Value="[WixUI_InstallDirDlg_Back]">1</Publish> Index: WaitForCostingDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/WaitForCostingDlg.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** WaitForCostingDlg.wxs 17 May 2006 08:02:48 -0000 1.2 --- WaitForCostingDlg.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: LicenseAgreementDlg.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/LicenseAgreementDlg.wxs,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** LicenseAgreementDlg.wxs 24 May 2006 23:41:12 -0000 1.4 --- LicenseAgreementDlg.wxs 19 Jul 2006 05:54:28 -0000 1.5 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> Index: MsiRMFilesInUse.wxs =================================================================== RCS file: /cvsroot/wix/wix/src/ext/UIExtension/wixlib/MsiRMFilesInUse.wxs,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** MsiRMFilesInUse.wxs 17 May 2006 08:02:48 -0000 1.2 --- MsiRMFilesInUse.wxs 19 Jul 2006 05:54:28 -0000 1.3 *************** *** 11,15 **** You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2003/01/wi"> <Fragment> <UI> --- 11,15 ---- You must not remove this notice, or any other, from this software. --> ! <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Fragment> <UI> |