ppn/amneziawg-windows-client
3
0
Fork 0
mirror of https://github.com/amnezia-vpn/amneziawg-windows-client.git synced 2026-06-01 22:18:53 +02:00
Code Issues Packages Projects Releases 2 Wiki Activity

installer: unify XML empty-element spacing

Browse Source 
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman
2019-08-02 13:28:35 +02:00
committed by Jason A. Donenfeld
parent e585163cd6
commit 7bb603f665
2 changed files with 28 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
installer/wireguard.wxs
+22 -22
View File
@@ -31,17 +31,17 @@
Compressed="yes" Compressed="yes"
InstallScope="perMachine" InstallScope="perMachine"
Description="WireGuard: Fast, Modern, Secure VPN Tunnel" Description="WireGuard: Fast, Modern, Secure VPN Tunnel"
ReadOnly="yes"/> ReadOnly="yes" />
<MediaTemplate EmbedCab="yes" CompressionLevel="high"/> <MediaTemplate EmbedCab="yes" CompressionLevel="high" />
<Icon Id="wireguard.ico" SourceFile="..\ui\icon\wireguard.ico"/> <Icon Id="wireguard.ico" SourceFile="..\ui\icon\wireguard.ico" />
<Binary Id="customactions.js" SourceFile="customactions.js"/> <Binary Id="customactions.js" SourceFile="customactions.js" />
<Property Id="ARPPRODUCTICON" Value="wireguard.ico"/> <Property Id="ARPPRODUCTICON" Value="wireguard.ico" />
<Property Id="ARPURLINFOABOUT" Value="https://www.wireguard.com/"/> <Property Id="ARPURLINFOABOUT" Value="https://www.wireguard.com/" />
<Property Id="ARPNOMODIFY" Value="yes" /> <Property Id="ARPNOMODIFY" Value="yes" />
<Property Id="DISABLEADVTSHORTCUTS" Value="yes"/> <Property Id="DISABLEADVTSHORTCUTS" Value="yes" />
<Property Id="DISABLEROLLBACK" Value="yes" /> <Property Id="DISABLEROLLBACK" Value="yes" />
<!-- <!--
@@ -53,7 +53,7 @@
DowngradeErrorMessage="A newer version of [ProductName] is already installed." DowngradeErrorMessage="A newer version of [ProductName] is already installed."
Schedule="afterInstallExecute" /> Schedule="afterInstallExecute" />
<Property Id="INSTALLFOLDERPREV"> <Property Id="INSTALLFOLDERPREV">
<ComponentSearch Id="WireGuardExecutable" Guid="c3508d23-3362-47ce-9220-321bdb1a1acc"/> <ComponentSearch Id="WireGuardExecutable" Guid="c3508d23-3362-47ce-9220-321bdb1a1acc" />
</Property> </Property>
<SetProperty <SetProperty
After="AppSearch" After="AppSearch"
@@ -73,12 +73,12 @@
--> -->
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.PlatformProgramFilesFolder)"> <Directory Id="$(var.PlatformProgramFilesFolder)">
<Directory Id="INSTALLFOLDER" Name="WireGuard"/> <Directory Id="INSTALLFOLDER" Name="WireGuard" />
</Directory> </Directory>
<Directory Id="ProgramMenuFolder"/> <Directory Id="ProgramMenuFolder" />
<Directory Id="SystemFolder"/> <Directory Id="SystemFolder" />
<?if $(var.Platform) != "x86"?> <?if $(var.Platform) != "x86"?>
<Directory Id="System64Folder"/> <Directory Id="System64Folder" />
<?endif?> <?endif?>
</Directory> </Directory>
@@ -90,14 +90,14 @@
<File Source="..\$(var.Platform)\wireguard.exe" KeyPath="yes"> <File Source="..\$(var.Platform)\wireguard.exe" KeyPath="yes">
<Shortcut Id="WireGuardStartMenuShortcut" Directory="ProgramMenuFolder" Name="WireGuard" Description="WireGuard: Fast, Modern, Secure VPN Tunnel" WorkingDirectory="INSTALLFOLDER" Advertise="yes" /> <Shortcut Id="WireGuardStartMenuShortcut" Directory="ProgramMenuFolder" Name="WireGuard" Description="WireGuard: Fast, Modern, Secure VPN Tunnel" WorkingDirectory="INSTALLFOLDER" Advertise="yes" />
</File> </File>
<ServiceControl Id="DummyService.3AA0C492_29F4_4342_B608_DB95B2DECB13" Name="DummyService.3AA0C492_29F4_4342_B608_DB95B2DECB13"/><!-- A dummy to make WiX create ServiceControl table for us. --> <ServiceControl Id="DummyService.3AA0C492_29F4_4342_B608_DB95B2DECB13" Name="DummyService.3AA0C492_29F4_4342_B608_DB95B2DECB13" /><!-- A dummy to make WiX create ServiceControl table for us. -->
</Component> </Component>
<Component Directory="SystemFolder" Win64="no" Id="Wg32Executable" Guid="5ca31841-97d8-4614-a318-f1e268135ba7"> <Component Directory="SystemFolder" Win64="no" Id="Wg32Executable" Guid="5ca31841-97d8-4614-a318-f1e268135ba7">
<File Source="..\x86\wg.exe" Id="Wg32Executable"/> <File Source="..\x86\wg.exe" Id="Wg32Executable" />
</Component> </Component>
<?if $(var.Platform) != "x86"?> <?if $(var.Platform) != "x86"?>
<Component Directory="System64Folder" Win64="yes" Id="Wg64Executable" Guid="d9b494ec-0959-442c-89ad-6aa175acfd03"> <Component Directory="System64Folder" Win64="yes" Id="Wg64Executable" Guid="d9b494ec-0959-442c-89ad-6aa175acfd03">
<File Source="..\$(var.Platform)\wg.exe" Id="Wg64Executable"/> <File Source="..\$(var.Platform)\wg.exe" Id="Wg64Executable" />
</Component> </Component>
<?endif?> <?endif?>
</ComponentGroup> </ComponentGroup>
@@ -106,31 +106,31 @@
Merge modules Merge modules
--> -->
<DirectoryRef Id="INSTALLFOLDER"> <DirectoryRef Id="INSTALLFOLDER">
<Merge Id="WintunMergeModule" Language="0" DiskId="1" SourceFile=".deps\wintun-$(var.Platform).msm"/> <Merge Id="WintunMergeModule" Language="0" DiskId="1" SourceFile=".deps\wintun-$(var.Platform).msm" />
</DirectoryRef> </DirectoryRef>
<!-- <!--
Features Features
--> -->
<Feature Id="WireGuardFeature" Title="WireGuard" Level="1" ConfigurableDirectory="INSTALLFOLDER"> <Feature Id="WireGuardFeature" Title="WireGuard" Level="1" ConfigurableDirectory="INSTALLFOLDER">
<ComponentGroupRef Id="WireGuardComponents"/> <ComponentGroupRef Id="WireGuardComponents" />
</Feature> </Feature>
<Feature Id="WintunFeature" Title="Wintun" Level="1"> <Feature Id="WintunFeature" Title="Wintun" Level="1">
<MergeRef Id="WintunMergeModule"/> <MergeRef Id="WintunMergeModule" />
</Feature> </Feature>
<!-- <!--
Evaluate WireGuard services and populate ServiceControl table Evaluate WireGuard services and populate ServiceControl table
--> -->
<CustomAction Id="EvaluateWireGuardServices" BinaryKey="customactions.js" JScriptCall="EvaluateWireGuardServices"/> <CustomAction Id="EvaluateWireGuardServices" BinaryKey="customactions.js" JScriptCall="EvaluateWireGuardServices" />
<InstallExecuteSequence> <InstallExecuteSequence>
<Custom Action="EvaluateWireGuardServices" After="FindRelatedProducts"/> <Custom Action="EvaluateWireGuardServices" After="FindRelatedProducts" />
</InstallExecuteSequence> </InstallExecuteSequence>
<!-- <!--
Clear out our config folder on uninstall Clear out our config folder on uninstall
--> -->
<CustomAction Id="RemoveConfigFolder" BinaryKey="customactions.js" JScriptCall="RemoveConfigFolder" Execute="deferred" Impersonate="no"/> <CustomAction Id="RemoveConfigFolder" BinaryKey="customactions.js" JScriptCall="RemoveConfigFolder" Execute="deferred" Impersonate="no" />
<InstallExecuteSequence> <InstallExecuteSequence>
<Custom Action="RemoveConfigFolder" After="DeleteServices">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom> <Custom Action="RemoveConfigFolder" After="DeleteServices">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
</InstallExecuteSequence> </InstallExecuteSequence>
@@ -138,7 +138,7 @@
<!-- <!--
Launch wireguard.exe after setup complete Launch wireguard.exe after setup complete
--> -->
<CustomAction Id="LaunchApplication" HideTarget="yes" Impersonate="no" Execute="deferred" FileKey="wireguard.exe" ExeCommand="" Return="asyncNoWait"/> <CustomAction Id="LaunchApplication" HideTarget="yes" Impersonate="no" Execute="deferred" FileKey="wireguard.exe" ExeCommand="" Return="asyncNoWait" />
<InstallExecuteSequence> <InstallExecuteSequence>
<!-- TODO: this should not launch when msiexec is called with whatever flag means it shouldn't launch. --> <!-- TODO: this should not launch when msiexec is called with whatever flag means it shouldn't launch. -->
<Custom Action="LaunchApplication" After="PublishProduct">NOT Installed</Custom> <Custom Action="LaunchApplication" After="PublishProduct">NOT Installed</Custom>
manifest.xml
+6 -6
View File
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?> <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0"> <assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
<assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="wireguard" type="win32"/> <assemblyIdentity version="1.0.0.0" processorArchitecture="*" name="wireguard" type="win32" />
<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1"> <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application> <application>
<!-- Windows 10 --> <!-- Windows 10 -->
<supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/> <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
<!-- Windows 8.1 --> <!-- Windows 8.1 -->
<supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/> <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
<!-- Windows 8 --> <!-- Windows 8 -->
<supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/> <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
<!-- Windows 7 --> <!-- Windows 7 -->
<supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/> <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
</application> </application>
</compatibility> </compatibility>
<dependency> <dependency>
<dependentAssembly> <dependentAssembly>
<assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*"/> <assemblyIdentity type="win32" name="Microsoft.Windows.Common-Controls" version="6.0.0.0" processorArchitecture="*" publicKeyToken="6595b64144ccf1df" language="*" />
</dependentAssembly> </dependentAssembly>
</dependency> </dependency>
<application xmlns="urn:schemas-microsoft-com:asm.v3"> <application xmlns="urn:schemas-microsoft-com:asm.v3">