Browse Source

增加图标、可执行文件

guozhaoshun 5 years ago
parent
commit
e17c1d30a0
4 changed files with 57 additions and 18 deletions
  1. 56 17
      Setup4/Installer.isl
  2. 1 1
      Setup4/Installer.isproj
  3. BIN
      Setup4/WinBox/WinBox.exe
  4. BIN
      img/shuangshi.ico

+ 56 - 17
Setup4/Installer.isl

@@ -342,7 +342,8 @@
 		<col def="S0">ISDotNetInstallerArgsUninstall</col>
 		<col def="S0">ISDotNetInstallerArgsRollback</col>
 		<row><td>ISX_DEFAULTCOMPONENT1</td><td>{9E1E24BA-7430-4F3C-B2E2-ABD75338E77B}</td><td>INSTALLDIR</td><td>2</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
-		<row><td>WinBox.exe</td><td>{CB2E50E9-D743-488C-AF6E-DC8A9081F770}</td><td>INSTALLDIR</td><td>2</td><td/><td>winbox.exe</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+		<row><td>IS_ININSTALL_SHORTCUT</td><td>{61A9E2E4-22E0-4F9B-AAAC-50403D29FF42}</td><td>INSTALLDIR</td><td>2</td><td/><td/><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
+		<row><td>WinBox.exe</td><td>{80A1ADE7-EF6B-4319-8AB8-DCB68080A2B6}</td><td>INSTALLDIR</td><td>2</td><td/><td>winbox.exe</td><td>17</td><td/><td/><td/><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td><td>/LogFile=</td></row>
 	</table>
 
 	<table name="Condition">
@@ -922,7 +923,7 @@
 		<row><td>DatabaseFolder</td><td>ChangeFolder</td><td>SpawnDialog</td><td>InstallChangeFolder</td><td>1</td><td>1</td></row>
 		<row><td>DatabaseFolder</td><td>ChangeFolder</td><td>[_BrowseProperty]</td><td>DATABASEDIR</td><td>1</td><td>2</td></row>
 		<row><td>DatabaseFolder</td><td>Next</td><td>NewDialog</td><td>SetupType</td><td>1</td><td>1</td></row>
-		<row><td>DestinationFolder</td><td>Back</td><td>NewDialog</td><td>CustomerInformation</td><td>1</td><td>0</td></row>
+		<row><td>DestinationFolder</td><td>Back</td><td>NewDialog</td><td>InstallWelcome</td><td>NOT Installed</td><td>0</td></row>
 		<row><td>DestinationFolder</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>1</td></row>
 		<row><td>DestinationFolder</td><td>ChangeFolder</td><td>SpawnDialog</td><td>InstallChangeFolder</td><td>1</td><td>1</td></row>
 		<row><td>DestinationFolder</td><td>ChangeFolder</td><td>[_BrowseProperty]</td><td>INSTALLDIR</td><td>1</td><td>2</td></row>
@@ -939,11 +940,11 @@
 		<row><td>InstallChangeFolder</td><td>Up</td><td>DirectoryListUp</td><td>0</td><td>1</td><td>0</td></row>
 		<row><td>InstallWelcome</td><td>Back</td><td>NewDialog</td><td>SplashBitmap</td><td>Display_IsBitmapDlg</td><td>0</td></row>
 		<row><td>InstallWelcome</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>
-		<row><td>InstallWelcome</td><td>Next</td><td>NewDialog</td><td>ReadyToInstall</td><td>1</td><td>0</td></row>
-		<row><td>LicenseAgreement</td><td>Back</td><td>NewDialog</td><td>InstallWelcome</td><td>1</td><td>0</td></row>
+		<row><td>InstallWelcome</td><td>Next</td><td>NewDialog</td><td>DestinationFolder</td><td>1</td><td>0</td></row>
+		<row><td>LicenseAgreement</td><td>Back</td><td>NewDialog</td><td>InstallWelcome</td><td>NOT Installed</td><td>0</td></row>
 		<row><td>LicenseAgreement</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>
 		<row><td>LicenseAgreement</td><td>ISPrintButton</td><td>DoAction</td><td>ISPrint</td><td>1</td><td>0</td></row>
-		<row><td>LicenseAgreement</td><td>Next</td><td>NewDialog</td><td>CustomerInformation</td><td>AgreeToLicense = "Yes"</td><td>0</td></row>
+		<row><td>LicenseAgreement</td><td>Next</td><td>NewDialog</td><td>ReadyToInstall</td><td>AgreeToLicense = "Yes"</td><td>0</td></row>
 		<row><td>MaintenanceType</td><td>Back</td><td>NewDialog</td><td>MaintenanceWelcome</td><td>1</td><td>0</td></row>
 		<row><td>MaintenanceType</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>
 		<row><td>MaintenanceType</td><td>Next</td><td>NewDialog</td><td>CustomSetup</td><td>_IsMaintenance = "Change"</td><td>12</td></row>
@@ -974,7 +975,7 @@
 		<row><td>ReadmeInformation</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>1</td></row>
 		<row><td>ReadmeInformation</td><td>Next</td><td>NewDialog</td><td>CustomerInformation</td><td>1</td><td>1</td></row>
 		<row><td>ReadyToInstall</td><td>Back</td><td>NewDialog</td><td>CustomSetup</td><td>Installed OR _IsSetupTypeMin = "Custom"</td><td>2</td></row>
-		<row><td>ReadyToInstall</td><td>Back</td><td>NewDialog</td><td>InstallWelcome</td><td>NOT Installed</td><td>1</td></row>
+		<row><td>ReadyToInstall</td><td>Back</td><td>NewDialog</td><td>DestinationFolder</td><td>NOT Installed</td><td>1</td></row>
 		<row><td>ReadyToInstall</td><td>Back</td><td>NewDialog</td><td>MaintenanceType</td><td>Installed AND _IsMaintenance = "Reinstall"</td><td>3</td></row>
 		<row><td>ReadyToInstall</td><td>Cancel</td><td>SpawnDialog</td><td>CancelSetup</td><td>1</td><td>0</td></row>
 		<row><td>ReadyToInstall</td><td>InstallNow</td><td>EndDialog</td><td>Return</td><td>OutOfNoRbDiskSpace &lt;&gt; 1</td><td>0</td></row>
@@ -1052,6 +1053,7 @@
 		<col key="yes" def="s72">Directory_</col>
 		<col key="yes" def="s72">Component_</col>
 		<row><td>INSTALLDIR</td><td>ISX_DEFAULTCOMPONENT1</td></row>
+		<row><td>INSTALLDIR</td><td>IS_ININSTALL_SHORTCUT</td></row>
 		<row><td>INSTALLDIR</td><td>WinBox.exe</td></row>
 	</table>
 
@@ -1866,6 +1868,7 @@
 		<col key="yes" def="s38">Feature_</col>
 		<col key="yes" def="s72">Component_</col>
 		<row><td>AlwaysInstall</td><td>ISX_DEFAULTCOMPONENT1</td></row>
+		<row><td>AlwaysInstall</td><td>IS_ININSTALL_SHORTCUT</td></row>
 		<row><td>AlwaysInstall</td><td>WinBox.exe</td></row>
 	</table>
 
@@ -1881,7 +1884,7 @@
 		<col def="S255">ISBuildSourcePath</col>
 		<col def="I4">ISAttributes</col>
 		<col def="S72">ISComponentSubFolder_</col>
-		<row><td>winbox.exe</td><td>WinBox.exe</td><td>WinBox.exe</td><td>0</td><td/><td/><td/><td>1</td><td>C:\Users\william\Desktop\WinBox.exe</td><td>1</td><td/></row>
+		<row><td>winbox.exe</td><td>WinBox.exe</td><td>WinBox.exe</td><td>0</td><td/><td/><td/><td>1</td><td>D:\work-visual\WinBox\WinBox\bin\Debug\WinBox.exe</td><td>1</td><td/></row>
 	</table>
 
 	<table name="FileSFPCatalog">
@@ -1897,6 +1900,7 @@
 	<table name="ISAssistantTag">
 		<col key="yes" def="s72">Tag</col>
 		<col def="S255">Data</col>
+		<row><td>PROJECT_ASSISTANT_DEFAULT_FEATURE</td><td>AlwaysInstall</td></row>
 	</table>
 
 	<table name="ISBillBoard">
@@ -2024,7 +2028,8 @@
 		<col def="S0">HTTPLocation</col>
 		<col def="S0">Miscellaneous</col>
 		<row><td>ISX_DEFAULTCOMPONENT1</td><td/><td/><td>_B7CC9F02_AE07_43DA_8A90_BE4BD7BEDB38_FILTER</td><td/><td/><td/><td/></row>
-		<row><td>WinBox.exe</td><td/><td/><td>_5CD37C0D_27A5_4D9D_B12F_2C7295B3E695_FILTER</td><td/><td/><td/><td/></row>
+		<row><td>IS_ININSTALL_SHORTCUT</td><td/><td/><td>_963303E4_1E4F_482F_8F9A_DB5E32198494_FILTER</td><td/><td/><td/><td/></row>
+		<row><td>WinBox.exe</td><td/><td/><td>_42FD2D2F_DA89_433A_A339_9727B674E6CF_FILTER</td><td/><td/><td/><td/></row>
 	</table>
 
 	<table name="ISCustomActionReference">
@@ -2580,6 +2585,8 @@
 		<col def="I2">Order</col>
 		<col def="I2">ISSetupLocation</col>
 		<col def="S255">ISReleaseFlags</col>
+		<row><td>_7DB01F72_A649_45F9_8617_B0D2A2BF74C8_</td><td>Internet Explorer 11.0 for Windows 7 (x86).prq</td><td/><td/><td/></row>
+		<row><td>_D85B4B45_DA22_457D_B2ED_9E82B04D094E_</td><td>Microsoft .NET Framework 4.0 Full.prq</td><td/><td/><td/></row>
 	</table>
 
 	<table name="ISSetupType">
@@ -2613,7 +2620,7 @@
 		<col def="I2">Encoded</col>
 		<col def="S0">Comment</col>
 		<col def="I4">TimeStamp</col>
-		<row><td>COMPANY_NAME</td><td>2052</td><td>领教信息科技</td><td>0</td><td/><td>-1549389143</td></row>
+		<row><td>COMPANY_NAME</td><td>2052</td><td>领教信息科技</td><td>0</td><td/><td>-1146696501</td></row>
 		<row><td>DN_AlwaysInstall</td><td>2052</td><td>始终安装</td><td>0</td><td/><td>-1549373207</td></row>
 		<row><td>IDPROP_EXPRESS_LAUNCH_CONDITION_COLOR</td><td>2052</td><td>系统颜色设置不足以运行 [ProductName]。</td><td>0</td><td/><td>-1549373207</td></row>
 		<row><td>IDPROP_EXPRESS_LAUNCH_CONDITION_DOTNETVERSION40FULL</td><td>1033</td><td>Microsoft .NET Framework 4.0 Full package or greater needs to be installed for this installation to continue.</td><td>0</td><td/><td>-1549379223</td></row>
@@ -3431,6 +3438,14 @@
 		<row><td>IDS_SETUPEXE_LAUNCH_COND_E</td><td>2052</td><td>本安装程序内建有 InstallShield 的评估版,只能用 setup.exe 文件启动。</td><td>0</td><td/><td>-1549373207</td></row>
 		<row><td>IDS_SHORTCUT_DISPLAY_NAME1</td><td>1033</td><td/><td>0</td><td/><td>-1549376983</td></row>
 		<row><td>IDS_SHORTCUT_DISPLAY_NAME1</td><td>2052</td><td>全能双师</td><td>0</td><td/><td>-1549351863</td></row>
+		<row><td>IDS_SHORTCUT_DISPLAY_NAME2</td><td>1033</td><td/><td>0</td><td/><td>-1146741750</td></row>
+		<row><td>IDS_SHORTCUT_DISPLAY_NAME2</td><td>2052</td><td>LAUNCH~1.EXE|Launch WinBox.exe</td><td>0</td><td/><td>-1146741750</td></row>
+		<row><td>IDS_SHORTCUT_DISPLAY_NAME3</td><td>1033</td><td/><td>0</td><td/><td>-1146729462</td></row>
+		<row><td>IDS_SHORTCUT_DISPLAY_NAME3</td><td>2052</td><td>全能双师</td><td>0</td><td/><td>-1146697365</td></row>
+		<row><td>IDS_SHORTCUT_DISPLAY_NAME4</td><td>1033</td><td/><td>0</td><td/><td>-1146704341</td></row>
+		<row><td>IDS_SHORTCUT_DISPLAY_NAME4</td><td>2052</td><td>LAUNCH~1.EXE|Launch WinBox.exe</td><td>0</td><td/><td>-1146704341</td></row>
+		<row><td>IDS_SHORTCUT_DISPLAY_NAME5</td><td>1033</td><td/><td>0</td><td/><td>-1146696149</td></row>
+		<row><td>IDS_SHORTCUT_DISPLAY_NAME5</td><td>2052</td><td>全能双师</td><td>0</td><td/><td>-1146739125</td></row>
 		<row><td>IDS_SQLBROWSE_INTRO</td><td>2052</td><td>从以下服务器列表中选择要连接的数据库服务器。</td><td>0</td><td/><td>-1549373207</td></row>
 		<row><td>IDS_SQLBROWSE_INTRO_DB</td><td>2052</td><td>从以下的编录名称列表中,选择您希望将其作为目标的数据库编录。</td><td>0</td><td/><td>-1549373207</td></row>
 		<row><td>IDS_SQLBROWSE_INTRO_TEMPLATE</td><td>2052</td><td>[IS_SQLBROWSE_INTRO]</td><td>0</td><td/><td>-1549373207</td></row>
@@ -3720,10 +3735,24 @@
 		<row><td>IDS__TargetReq_DESC_RAM</td><td>2052</td><td>对于运行 [ProductName] 内存量不足。</td><td>0</td><td/><td>-1549373207</td></row>
 		<row><td>IDS__TargetReq_DESC_RESOLUTION</td><td>2052</td><td>对于运行 [ProductName] 屏幕分辨率不足。</td><td>0</td><td/><td>-1549373207</td></row>
 		<row><td>ID_STRING1</td><td>2052</td><td/><td>0</td><td/><td>-1549373207</td></row>
+		<row><td>ID_STRING10</td><td>1033</td><td>全能双师</td><td>0</td><td/><td>-1146712821</td></row>
+		<row><td>ID_STRING10</td><td>2052</td><td>全能双师</td><td>0</td><td/><td>-1146712821</td></row>
+		<row><td>ID_STRING11</td><td>1033</td><td>全能双师</td><td>0</td><td/><td>-1146737077</td></row>
+		<row><td>ID_STRING11</td><td>2052</td><td>全能双师</td><td>0</td><td/><td>-1146737077</td></row>
 		<row><td>ID_STRING2</td><td>2052</td><td/><td>0</td><td/><td>-1549373207</td></row>
-		<row><td>ID_STRING3</td><td>2052</td><td>http://www.lingjiao.cn</td><td>0</td><td/><td>-1549397111</td></row>
+		<row><td>ID_STRING3</td><td>2052</td><td>http://www.lingjiao.com</td><td>0</td><td/><td>-1146722773</td></row>
 		<row><td>ID_STRING4</td><td>1033</td><td>领教信息科技</td><td>0</td><td/><td>-1549397687</td></row>
-		<row><td>ID_STRING4</td><td>2052</td><td>领教信息科技</td><td>0</td><td/><td>-1549389143</td></row>
+		<row><td>ID_STRING4</td><td>2052</td><td>领教信息科技</td><td>0</td><td/><td>-1146696501</td></row>
+		<row><td>ID_STRING5</td><td>1033</td><td>WinBox</td><td>0</td><td/><td>-1146733526</td></row>
+		<row><td>ID_STRING5</td><td>2052</td><td>WinBox</td><td>0</td><td/><td>-1146733526</td></row>
+		<row><td>ID_STRING6</td><td>1033</td><td/><td>0</td><td/><td>-1146698677</td></row>
+		<row><td>ID_STRING6</td><td>2052</td><td/><td>0</td><td/><td>-1146698677</td></row>
+		<row><td>ID_STRING7</td><td>1033</td><td/><td>0</td><td/><td>-1146704757</td></row>
+		<row><td>ID_STRING7</td><td>2052</td><td/><td>0</td><td/><td>-1146704757</td></row>
+		<row><td>ID_STRING8</td><td>1033</td><td/><td>0</td><td/><td>-1146702709</td></row>
+		<row><td>ID_STRING8</td><td>2052</td><td/><td>0</td><td/><td>-1146702709</td></row>
+		<row><td>ID_STRING9</td><td>1033</td><td>NEWSHO~1|NewShortcut1</td><td>0</td><td/><td>-1146729205</td></row>
+		<row><td>ID_STRING9</td><td>2052</td><td>全能双师</td><td>0</td><td/><td>-1146721013</td></row>
 		<row><td>IIDS_UITEXT_FeatureUninstalled</td><td>2052</td><td>系统将不安装此功能。</td><td>0</td><td/><td>-1549373207</td></row>
 	</table>
 
@@ -3837,8 +3866,17 @@
 		<col def="V0">Data</col>
 		<col def="S255">ISBuildSourcePath</col>
 		<col def="I2">ISIconIndex</col>
-		<row><td>ARPPRODUCTICON.exe</td><td/><td>C:\William\Lingjiao\Project\shuangshi.ico</td><td>0</td></row>
+		<row><td>ARPPRODUCTICON.exe</td><td/><td>&lt;VSSolutionFolder&gt;\img\shuangshi.ico</td><td>0</td></row>
+		<row><td>NewShortcut11_90C8A61099DD4F5B905DE97B5F7010CD.exe</td><td/><td>D:\work-visual\WinBox\WinBox\bin\Debug\WinBox.exe</td><td>0</td></row>
+		<row><td>NewShortcut1_71C784A062C341ACA407BF13A4B1DE2F.exe</td><td/><td>D:\work-visual\WinBox\WinBox\bin\Debug\WinBox.exe</td><td>0</td></row>
+		<row><td>Shortcut_E3878F386D2C4595AA4ADA083E570BE1.exe</td><td/><td>C:\Program Files (x86)\InstallShield\2015LE\Redist\Language Independent\OS Independent\uninstall.ico</td><td>0</td></row>
+		<row><td>WinBox.exe1_4A04D9CD50B94638AD4F987C12D75DD5.exe</td><td/><td>D:\work-visual\Projects\WinBoxInstaller\Installer\Installer\WinBox.exe</td><td>0</td></row>
+		<row><td>WinBox.exe1_6AD46ABDEA0F4D6AB136FCE8CB0AA66F.exe</td><td/><td>D:\work-visual\WinBox\WinBox\bin\Debug\WinBox.exe</td><td>0</td></row>
+		<row><td>WinBox.exe_07C7DAECC1EF4CDDAC600DD424955CA9.exe</td><td/><td>D:\work-visual\Projects\WinBoxInstaller\Installer\Installer\WinBox.exe</td><td>0</td></row>
+		<row><td>WinBox.exe_168709425D414D3EA04A9D5BA589EBD5.exe</td><td/><td>D:\work-visual\WinBox\WinBox\bin\Debug\WinBox.exe</td><td>0</td></row>
 		<row><td>WinBox.exe_5B7A6747B66544A089467D8CE9D14556.exe</td><td/><td>&lt;ISProductFolder&gt;\redist\Language Independent\OS Independent\GenericExe.ico</td><td>0</td></row>
+		<row><td>WinBox.exe_CCD8FD8EC9A64858A6B1E104FDD6D48E.exe</td><td/><td>D:\work-visual\Projects\WinBoxInstaller\Installer\Installer\WinBox.exe</td><td>0</td></row>
+		<row><td>WinBox.exe_F819B231233440BAA2A562F6F72BA4E3.exe</td><td/><td>D:\work-visual\WinBox\WinBox\bin\Debug\WinBox.exe</td><td>0</td></row>
 	</table>
 
 	<table name="IniFile">
@@ -3971,7 +4009,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
 		<row><td>ISTheme</td><td>InstallShield Blue.theme</td></row>
 		<row><td>ISUSLock</td><td>{B1EC749E-AF88-4EB1-A20E-9B3990342002}</td></row>
 		<row><td>ISUSSignature</td><td>{58456FBF-6426-4E6E-BD50-03DAAE224F7F}</td></row>
-		<row><td>ISVisitedViews</td><td>viewAssistant,viewISToday,viewProject,viewUpgradePaths,viewUpdateService,viewAppFiles,viewObjects,viewShortcuts,viewRegistry,viewSystemSearch,viewTextMessages,viewCustomActions,viewRelease,viewServices</td></row>
+		<row><td>ISVisitedViews</td><td>viewAssistant,viewISToday,viewProject,viewUpgradePaths,viewUpdateService,viewAppFiles,viewObjects,viewShortcuts,viewRegistry,viewSystemSearch,viewTextMessages,viewCustomActions,viewRelease,viewServices,viewLearnMore,viewUI,viewIniFiles,viewFileExtensions,viewEnvironmentVariables,viewVRoots</td></row>
 		<row><td>Limited</td><td>1</td></row>
 		<row><td>LockPermissionMode</td><td>1</td></row>
 		<row><td>MsiExecCmdLineOptions</td><td/></row>
@@ -4318,7 +4356,6 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
 		<row><td>IS_SQLSERVER_SERVER</td><td/><td/></row>
 		<row><td>IS_SQLSERVER_USERNAME</td><td>sa</td><td/></row>
 		<row><td>InstallChoice</td><td>AR</td><td/></row>
-		<row><td>LAUNCHPROGRAM</td><td>1</td><td/></row>
 		<row><td>LAUNCHREADME</td><td>1</td><td/></row>
 		<row><td>Manufacturer</td><td>##COMPANY_NAME##</td><td/></row>
 		<row><td>PIDKEY</td><td/><td/></row>
@@ -4360,6 +4397,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
 		<row><td>RestartManagerOption</td><td>CloseRestart</td><td/></row>
 		<row><td>SERIALNUMBER</td><td/><td/></row>
 		<row><td>SERIALNUMVALSUCCESSRETVAL</td><td>1</td><td/></row>
+		<row><td>SHOWLAUNCHPROGRAM</td><td>0</td><td/></row>
 		<row><td>SecureCustomProperties</td><td>ISFOUNDNEWERPRODUCTVERSION;USERNAME;COMPANYNAME;ISX_SERIALNUM;SUPPORTDIR;DOTNETVERSION40FULL;IE11FOUND</td><td/></row>
 		<row><td>SelectedSetupType</td><td>##IDS__DisplayName_Typical##</td><td/></row>
 		<row><td>SetupType</td><td>Typical</td><td/></row>
@@ -4424,8 +4462,7 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
 		<col def="L255">FileName</col>
 		<col def="s72">DirProperty</col>
 		<col def="i2">InstallMode</col>
-		<row><td>FileKey1</td><td>WinBox.exe</td><td/><td>company_name</td><td>2</td></row>
-		<row><td>FileKey2</td><td>WinBox.exe</td><td/><td>product_name</td><td>2</td></row>
+		<row><td>Shortcut</td><td>IS_ININSTALL_SHORTCUT</td><td/><td>product_name</td><td>2</td></row>
 		<row><td>WinBox.exe</td><td>WinBox.exe</td><td/><td>product_name</td><td>2</td></row>
 	</table>
 
@@ -4512,7 +4549,9 @@ UwBpAG4AZwBsAGUASQBtAGEAZwBlAAEARQB4AHAAcgBlAHMAcwA=
 		<col def="S255">ISComments</col>
 		<col def="S255">ISShortcutName</col>
 		<col def="I4">ISAttributes</col>
-		<row><td>WinBox.exe</td><td>product_name</td><td>##IDS_SHORTCUT_DISPLAY_NAME1##</td><td>WinBox.exe</td><td>AlwaysInstall</td><td/><td/><td/><td>WinBox.exe_5B7A6747B66544A089467D8CE9D14556.exe</td><td>0</td><td>1</td><td>INSTALLDIR</td><td/><td/><td/><td/><td/><td/><td/></row>
+		<row><td>Shortcut</td><td>product_name</td><td>UNINST|Uninstall 全能双师</td><td>IS_ININSTALL_SHORTCUT</td><td>[SystemFolder]msiexec.exe</td><td>/x {4581F7DC-BF17-4E68-8B94-6AA3F5B1C955}</td><td/><td/><td>Shortcut_E3878F386D2C4595AA4ADA083E570BE1.exe</td><td>0</td><td>1</td><td/><td/><td/><td/><td/><td/><td/><td/></row>
+		<row><td>WinBox.exe</td><td>product_name</td><td>##IDS_SHORTCUT_DISPLAY_NAME5##</td><td>WinBox.exe</td><td>AlwaysInstall</td><td/><td/><td/><td>WinBox.exe_F819B231233440BAA2A562F6F72BA4E3.exe</td><td>1</td><td>1</td><td>INSTALLDIR</td><td/><td/><td/><td/><td/><td/><td/></row>
+		<row><td>WinBox.exe1</td><td>DesktopFolder</td><td>##IDS_SHORTCUT_DISPLAY_NAME5##</td><td>WinBox.exe</td><td>AlwaysInstall</td><td/><td/><td/><td>WinBox.exe1_6AD46ABDEA0F4D6AB136FCE8CB0AA66F.exe</td><td>1</td><td>1</td><td>INSTALLDIR</td><td/><td/><td/><td/><td/><td/><td/></row>
 	</table>
 
 	<table name="Signature">

+ 1 - 1
Setup4/Installer.isproj

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<Project ToolsVersion="3.5" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 	<PropertyGroup>
 		<!-- Select a Product Configuration -->
 		<InstallShieldProductConfiguration>Express</InstallShieldProductConfiguration>

BIN
Setup4/WinBox/WinBox.exe


BIN
img/shuangshi.ico