프로젝트

일반

사용자정보

개정판 0dbf8abb

ID0dbf8abb8a6e77802a68811f1f77ecc64334f31d
상위 b21627cf
하위 8a440f6c

김동진이(가) 5년 이상 전에 추가함

issue #000: net4.6.1 포함 수정.

Change-Id: Ic87b26a2158ab57121f37879f94b01eeaf4c55d6

차이점 보기:

MARKUS_daelim.wxs
13 13 
      <ComponentGroupRef Id="MARKUS" />
14 14 
    </Feature>
15 15 

  		




  16
  
  
    
    <CustomAction Id="NETFRAMEWORK_461"


  		




  17
  
  
    
      Directory="INSTALLFOLDER"


  		




  18
  
  
    
      ExeCommand="&quot;[INSTALLFOLDER]NDP461-KB3102438-Web.exe&quot; /norestart&quot; /passive&quot; /showrumi&quot; /ChainingPackage&quot; Contoso"


  		




  19
  
  
    
      Execute="commit"


  		




  20
  
  
    
      Return="asyncNoWait"  


  		




  21
  
  
    
      Impersonate="no"


  		




  22
  
  
    
    />


  		




  23
  
  
    

  		




  24
  
  
    
    <InstallExecuteSequence>


  		




  25
  
  
    
      <Custom Action='NETFRAMEWORK_461' After='InstallFiles' />


  		




  26
  
  
    
    </InstallExecuteSequence>


  		




  27
  
  
    

  		




  28
  16
  
    
    <Property Id="WixShellExecTarget" Value="[INSTALLFOLDER]readme.html" />


  		




  29
  17
  
    
    <CustomAction Id="LaunchBrowser" 


  		




  30
  18
  
    
        BinaryKey="WixCA" 


  		




  ......




  34
  22
  
    
      <Custom Action='LaunchBrowser' After='InstallFinalize'>NOT Installed</Custom>


  		




  35
  23
  
    
    </InstallExecuteSequence>


  		




  36
  24
  
    
  </Product>


  		




  
  25
  
    
  <?define NetFx461MinRelease = 394254 ?>  


  		




  
  26
  
    
  <?define NetFx461RedistLink = http://go.microsoft.com/fwlink/?LinkId=671743 ?>


  		




  
  27
  
    
  <?define NetFx461EulaLink = http://referencesource.microsoft.com/license.html ?>


  		




  
  28
  
    

  		




  
  29
  
    
  <Fragment>


  		




  
  30
  
    
    <PropertyRef Id="WIXNETFX4RELEASEINSTALLED" />


  		




  
  31
  
    
    <Property Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Secure="yes" />


  		




  
  32
  
    
    <SetProperty Id="WIX_IS_NETFRAMEWORK_461_OR_LATER_INSTALLED" Value="1" After="AppSearch">


  		




  
  33
  
    
      WIXNETFX4RELEASEINSTALLED >= "#$(var.NetFx461MinRelease)"


  		




  
  34
  
    
    </SetProperty>


  		




  
  35
  
    
  </Fragment>


  		




  
  36
  
    
  


  		




  
  37
  
    
<Fragment>


  		




  
  38
  
    
    <util:RegistrySearchRef Id="NETFRAMEWORK45"/>


  		




  
  39
  
    

  		




  
  40
  
    
    <WixVariable Id="WixMbaPrereqPackageId" Value="NetFx461Redist" />


  		




  
  41
  
    
    <WixVariable Id="WixMbaPrereqLicenseUrl" Value="$(var.NetFx461EulaLink)" Overridable="yes" />


  		




  
  42
  
    
    <WixVariable Id="NetFx461RedistDetectCondition" Value="NETFRAMEWORK45 &gt;= $(var.NetFx461MinRelease)" Overridable="yes" />


  		




  
  43
  
    
    <WixVariable Id="NetFx461RedistInstallCondition" Value="" Overridable="yes" />


  		




  
  44
  
    
    <WixVariable Id="NetFx461RedistPackageDirectory" Value="redist\" Overridable="yes" />


  		




  37
  45
  
    

  		




  
  46
  
    
    <PackageGroup Id="NetFx461Redist">


  		




  
  47
  
    
      <ExePackage


  		




  
  48
  
    
          InstallCommand="/q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"


  		




  
  49
  
    
          RepairCommand="/q /norestart /repair /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"


  		




  
  50
  
    
          UninstallCommand="/uninstall /q /norestart /ChainingPackage &quot;[WixBundleName]&quot; /log &quot;[NetFx461FullLog].html&quot;"


  		




  
  51
  
    
          PerMachine="yes"


  		




  
  52
  
    
          DetectCondition="!(wix.NetFx461RedistDetectCondition)"


  		




  
  53
  
    
          InstallCondition="!(wix.NetFx461RedistInstallCondition)"


  		




  
  54
  
    
          Id="NetFx461Redist"


  		




  
  55
  
    
          Vital="yes"


  		




  
  56
  
    
          Permanent="yes"


  		




  
  57
  
    
          Protocol="netfx4"


  		




  
  58
  
    
          DownloadUrl="$(var.NetFx461RedistLink)"


  		




  
  59
  
    
          LogPathVariable="NetFx461FullLog"


  		




  
  60
  
    
          Compressed="no"


  		




  
  61
  
    
          Name="!(wix.NetFx461RedistPackageDirectory)NDP461-KB3102436-x86-x64-AllOS-ENU.exe">


  		




  
  62
  
    
        <RemotePayload


  		




  
  63
  
    
          CertificatePublicKey="52868DFCA6E3AF2632389E6C1EE7D0468D3797D0" 


  		




  
  64
  
    
          CertificateThumbprint="3BDA323E552DB1FDE5F4FBEE75D6D5B2B187EEDC" 


  		




  
  65
  
    
          Description="Microsoft .NET Framework 4.6.1 Setup" 


  		




  
  66
  
    
          Hash="83D048D171FF44A3CAD9B422137656F585295866" 


  		




  
  67
  
    
          ProductName="Microsoft .NET Framework 4.6.1" 


  		




  
  68
  
    
          Size="67681000" 


  		




  
  69
  
    
          Version="4.6.1055.0" />


  		




  
  70
  
    
      </ExePackage>


  		




  
  71
  
    
    </PackageGroup>


  		




  
  72
  
    
  </Fragment>


  		




  
  73
  
    
  


  		




  38
  74
  
    
  <Fragment>


  		




  39
  75
  
    
    <Directory Id="TARGETDIR" Name="SourceDir">


  		




  40
  76
  
    
      <Directory Id="DesktopFolder" Name="Desktop">


  		




  ......




  154
  190
  
    
            </Component>


  		




  155
  191
  
    
            <Component Id="cmp8234C30B57CA4022B9BA108719FDF848" Directory="INSTALLFOLDER" Guid="3E2E60BB-3122-40F5-9A76-BDCF3F88D522" Win64='yes'>


  		




  156
  192
  
    
                <File Id="fil275D1AADC07745DA9912353B6B5FC53F" KeyPath="yes" Source=".\readme.html" />


  		




  157
  
  
    
            </Component>


  		




  158
  
  
    
            <Component Id="cmp92F6718F031E4AD2810155492929EE55" Directory="INSTALLFOLDER" Guid="CC6B1FD1-0587-4C56-B2F0-437BFA51B673" Win64='yes'>


  		




  159
  
  
    
                <File Id="fil32BE8515827243CE87971B56055C66F1" KeyPath="yes" Source=".\packages\NDP461-KB3102438-Web.exe" />


  		




  160
  
  
    
            </Component>


  		




  
  193
  
    
            </Component>            


  		




  161
  194
  
    
            <Component Id="cmp008EC7C4B15BA79DEC806A9852526EF9" Directory="INSTALLFOLDER" Guid="B4829BEF-7376-4039-8E1D-8A46D257F4AF" Win64='yes'>


  		




  162
  195
  
    
                <File Id="filD7A7D725F3C20E26B1A149EAABD9323C" KeyPath="yes" Source=".\Setup\KCOM.exe.config" />


  		




  163
  196
  
    
            </Component>


  		












내보내기  Unified diff




         
        

    















   



  

  
  클립보드 이미지 추가
  (최대 크기: 500 MB)