|
@@ -31,12 +31,12 @@
|
|
|
|
|
|
|
|
|
|
<Media Id="1" Cabinet="app.cab" EmbedCab="yes" />
|
|
<Media Id="1" Cabinet="app.cab" EmbedCab="yes" />
|
|
-
|
|
|
|
|
|
+
|
|
<WixVariable Id="WixUIBannerBmp" Value="{{{icon_path}}}" />
|
|
<WixVariable Id="WixUIBannerBmp" Value="{{{icon_path}}}" />
|
|
{{#if license}}
|
|
{{#if license}}
|
|
<WixVariable Id="WixUILicenseRtf" Value="{{{license}}}" />
|
|
<WixVariable Id="WixUILicenseRtf" Value="{{{license}}}" />
|
|
{{/if}}
|
|
{{/if}}
|
|
-
|
|
|
|
|
|
+
|
|
<Icon Id="ProductIcon" SourceFile="{{{icon_path}}}"/>
|
|
<Icon Id="ProductIcon" SourceFile="{{{icon_path}}}"/>
|
|
<Property Id="ARPPRODUCTICON" Value="ProductIcon" />
|
|
<Property Id="ARPPRODUCTICON" Value="ProductIcon" />
|
|
<Property Id="ARPNOREPAIR" Value="yes" Secure="yes" /> <!-- Remove repair -->
|
|
<Property Id="ARPNOREPAIR" Value="yes" Secure="yes" /> <!-- Remove repair -->
|
|
@@ -111,7 +111,7 @@
|
|
|
|
|
|
<DirectoryRef Id="ApplicationProgramsFolder">
|
|
<DirectoryRef Id="ApplicationProgramsFolder">
|
|
<Component Id="ApplicationShortcut" Guid="81ccebd8-b769-4bed-bdbd-0340f9f7cad1">
|
|
<Component Id="ApplicationShortcut" Guid="81ccebd8-b769-4bed-bdbd-0340f9f7cad1">
|
|
- <Shortcut Id="ApplicationStartMenuShortcut"
|
|
|
|
|
|
+ <Shortcut Id="ApplicationStartMenuShortcut"
|
|
Name="{{{product_name}}}"
|
|
Name="{{{product_name}}}"
|
|
Description="Runs {{{product_name}}}"
|
|
Description="Runs {{{product_name}}}"
|
|
Target="[!Path]"
|
|
Target="[!Path]"
|
|
@@ -193,7 +193,7 @@
|
|
<Property Id="WVRTINSTALLED">
|
|
<Property Id="WVRTINSTALLED">
|
|
<RegistrySearch Id="WVRTInstalled" Root="HKLM" Key="SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Name="pv" Type="raw" Win64="no"/>
|
|
<RegistrySearch Id="WVRTInstalled" Root="HKLM" Key="SOFTWARE\Microsoft\EdgeUpdate\Clients\{F3017226-FE2A-4295-8BDF-00C3A9A7E4C5}" Name="pv" Type="raw" Win64="no"/>
|
|
</Property>
|
|
</Property>
|
|
- <CustomAction Id='DownloadAndInvokeBootstrapper' Directory="INSTALLDIR" Execute="deferred" ExeCommand='powershell.exe -windowstyle hidden Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/p/?LinkId=2124703" -OutFile "$env:TEMP\MicrosoftEdgeWebview2Setup.exe" ; & $env:TEMP\MicrosoftEdgeWebview2Setup.exe /install' Return='check'/>
|
|
|
|
|
|
+ <CustomAction Id='DownloadAndInvokeBootstrapper' Directory="INSTALLDIR" Execute="deferred" ExeCommand='powershell.exe -NoProfile -windowstyle hidden Invoke-WebRequest -Uri "https://go.microsoft.com/fwlink/p/?LinkId=2124703" -OutFile "$env:TEMP\MicrosoftEdgeWebview2Setup.exe" ; & $env:TEMP\MicrosoftEdgeWebview2Setup.exe /install' Return='check'/>
|
|
<InstallExecuteSequence>
|
|
<InstallExecuteSequence>
|
|
<Custom Action='DownloadAndInvokeBootstrapper' Before='InstallFinalize'>
|
|
<Custom Action='DownloadAndInvokeBootstrapper' Before='InstallFinalize'>
|
|
<![CDATA[NOT(REMOVE OR WVRTINSTALLED)]]>
|
|
<![CDATA[NOT(REMOVE OR WVRTINSTALLED)]]>
|
|
@@ -201,6 +201,6 @@
|
|
</InstallExecuteSequence>
|
|
</InstallExecuteSequence>
|
|
{{/if}}
|
|
{{/if}}
|
|
|
|
|
|
- <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize"/>
|
|
|
|
|
|
+ <SetProperty Id="ARPINSTALLLOCATION" Value="[INSTALLDIR]" After="CostFinalize"/>
|
|
</Product>
|
|
</Product>
|
|
-</Wix>
|
|
|
|
|
|
+</Wix>
|