개정판 44b7ba05
issue #1130: install .netframework 4.6.1 while installation
Change-Id: I1cd37653425dca18c8be88c617a62a078aa5d527
MARKUS.wxs | ||
---|---|---|
1 | 1 |
<?xml version="1.0" encoding="UTF-8"?> |
2 |
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension"> |
|
2 |
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension" xmlns:bal="http://schemas.microsoft.com/wix/BalExtension">
|
|
3 | 3 |
<Product Id="*" Name="MARKUS" Language="1033" Version="1.0.0.0" Manufacturer="DOFTECH(C)" UpgradeCode="83FC35CA-6B7D-40C3-9D5F-E8F76097B25C"> |
4 | 4 |
<Package Platform="x64" InstallerVersion="200" Compressed="yes" InstallScope="perMachine" /> |
5 | 5 |
|
... | ... | |
13 | 13 |
<ComponentGroupRef Id="MARKUS" /> |
14 | 14 |
</Feature> |
15 | 15 |
|
16 |
<PropertyRef Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED"/> |
|
17 |
<Condition Message="This application requires .NET Framework 4.6.1 Please install the .NET Framework then run this installer again."> |
|
18 |
<![CDATA[Installed OR WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED]]> |
|
19 |
</Condition> |
|
20 |
|
|
21 |
<CustomAction Id="NETFRAMEWORK_461" |
|
22 |
Directory="INSTALLFOLDER" |
|
23 |
ExeCommand=""[INSTALLFOLDER]NDP461-KB3102438-Web.exe" /norestart" /passive" /showrumi" /ChainingPackage" Contoso" |
|
24 |
Execute="commit" |
|
25 |
Return="asyncNoWait" |
|
26 |
Impersonate="no" |
|
27 |
/> |
|
28 |
|
|
29 |
<InstallExecuteSequence> |
|
30 |
<Custom Action='NETFRAMEWORK_461' After='InstallFiles' /> |
|
31 |
</InstallExecuteSequence> |
|
32 |
|
|
16 | 33 |
<Property Id="NOTEPAD" Value="notepad.exe" /> |
17 | 34 |
<CustomAction Id="LaunchFile" Property="NOTEPAD" ExeCommand="[INSTALLFOLDER]readme.txt" Return="asyncNoWait" /> |
18 | 35 |
<InstallExecuteSequence> |
... | ... | |
155 | 172 |
<Component Id="cmp8234C30B57CA4022B9BA108719FDF848" Directory="INSTALLFOLDER" Guid="3E2E60BB-3122-40F5-9A76-BDCF3F88D522" Win64='yes'> |
156 | 173 |
<File Id="fil275D1AADC07745DA9912353B6B5FC53F" KeyPath="yes" Source=".\readme.txt" /> |
157 | 174 |
</Component> |
175 |
<Component Id="cmp92F6718F031E4AD2810155492929EE55" Directory="INSTALLFOLDER" Guid="CC6B1FD1-0587-4C56-B2F0-437BFA51B673" Win64='yes'> |
|
176 |
<File Id="fil32BE8515827243CE87971B56055C66F1" KeyPath="yes" Source=".\packages\NDP461-KB3102438-Web.exe" /> |
|
177 |
</Component> |
|
158 | 178 |
<Component Id="cmp008EC7C4B15BA79DEC806A9852526EF9" Directory="INSTALLFOLDER" Guid="B4829BEF-7376-4039-8E1D-8A46D257F4AF" Win64='yes'> |
159 | 179 |
<File Id="filD7A7D725F3C20E26B1A149EAABD9323C" KeyPath="yes" Source=".\Setup\KCOM.exe.config" /> |
160 | 180 |
</Component> |
build.bat | ||
---|---|---|
37 | 37 |
IF %ERRORLEVEL% NEQ 0 goto :ERROR |
38 | 38 |
|
39 | 39 |
IF %ERRORLEVEL% NEQ 0 goto :ERROR |
40 |
%LIGHT% -out ".\Setup\MARKUS-%1.msi" ".\Setup\MARKUS.wixobj" -ext WixUIExtension -ext WixUtilExtension |
|
41 |
%LIGHT% -out ".\Setup\FinalService\FinalService-%1.msi" ".\Setup\FinalService\FinalService.wixobj" -ext WixUIExtension -ext WixUtilExtension |
|
42 |
%LIGHT% -out ".\Setup\ConvertService\ConvertService-%1.msi" ".\Setup\ConvertService\ConvertService.wixobj" -ext WixUIExtension -ext WixUtilExtension |
|
43 |
%LIGHT% -out ".\Setup\MARKUS-Daelim-%1.msi" ".\Setup\MARKUS_daelim.wixobj" -ext WixUIExtension -ext WixUtilExtension |
|
44 |
%LIGHT% -out ".\Setup\MARKUS-DaelimTest-%1.msi" ".\Setup\MARKUS_daelim_test.wixobj" -ext WixUIExtension -ext WixUtilExtension |
|
45 |
%LIGHT% -out ".\Setup\FinalService\FinalService-Daelim-%1.msi" ".\Setup\FinalService\FinalService_daelim.wixobj" -ext WixUIExtension -ext WixUtilExtension |
|
40 |
%LIGHT% -out ".\Setup\MARKUS-%1.msi" ".\Setup\MARKUS.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetfxExtension
|
|
41 |
%LIGHT% -out ".\Setup\FinalService\FinalService-%1.msi" ".\Setup\FinalService\FinalService.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetfxExtension
|
|
42 |
%LIGHT% -out ".\Setup\ConvertService\ConvertService-%1.msi" ".\Setup\ConvertService\ConvertService.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetfxExtension
|
|
43 |
%LIGHT% -out ".\Setup\MARKUS-Daelim-%1.msi" ".\Setup\MARKUS_daelim.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetfxExtension
|
|
44 |
%LIGHT% -out ".\Setup\MARKUS-DaelimTest-%1.msi" ".\Setup\MARKUS_daelim_test.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetfxExtension
|
|
45 |
%LIGHT% -out ".\Setup\FinalService\FinalService-Daelim-%1.msi" ".\Setup\FinalService\FinalService_daelim.wixobj" -ext WixUIExtension -ext WixUtilExtension -ext WixNetfxExtension
|
|
46 | 46 |
|
47 | 47 |
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 "c:\Temp\workspace\MARKUS\Setup\*.msi" |
48 | 48 |
%SIGNTOOLPATH% sign /v /f %SIGNPATH% /p Doftech1073# /tr http://timestamp.digicert.com /td sha256 /fd sha256 "c:\Temp\workspace\MARKUS\Setup\FinalService\*.msi" |
내보내기 Unified diff