aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorSimon Rozman <simon@rozman.si>2019-08-02 13:28:35 +0200
committerJason A. Donenfeld <Jason@zx2c4.com>2019-08-03 10:47:35 +0200
commite2ce909007700651b9e2286c0eed93a8fbc5c4ed (patch)
treecfe621b2e225ff2e5875017b999bb1b45b90e505
parentversion: bump (diff)
downloadwireguard-windows-e2ce909007700651b9e2286c0eed93a8fbc5c4ed.tar.xz
wireguard-windows-e2ce909007700651b9e2286c0eed93a8fbc5c4ed.zip
installer: unify XML empty-element spacing
Signed-off-by: Simon Rozman <simon@rozman.si>
-rw-r--r--installer/wireguard.wxs44
-rw-r--r--manifest.xml12
2 files changed, 28 insertions, 28 deletions
diff --git a/installer/wireguard.wxs b/installer/wireguard.wxs
index 3d7daadb..c8a7d7c2 100644
--- a/installer/wireguard.wxs
+++ b/installer/wireguard.wxs
@@ -31,17 +31,17 @@
Compressed="yes"
InstallScope="perMachine"
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"/>
- <Binary Id="customactions.js" SourceFile="customactions.js"/>
+ <Icon Id="wireguard.ico" SourceFile="..\ui\icon\wireguard.ico" />
+ <Binary Id="customactions.js" SourceFile="customactions.js" />
- <Property Id="ARPPRODUCTICON" Value="wireguard.ico"/>
- <Property Id="ARPURLINFOABOUT" Value="https://www.wireguard.com/"/>
+ <Property Id="ARPPRODUCTICON" Value="wireguard.ico" />
+ <Property Id="ARPURLINFOABOUT" Value="https://www.wireguard.com/" />
<Property Id="ARPNOMODIFY" Value="yes" />
- <Property Id="DISABLEADVTSHORTCUTS" Value="yes"/>
+ <Property Id="DISABLEADVTSHORTCUTS" Value="yes" />
<Property Id="DISABLEROLLBACK" Value="yes" />
<!--
@@ -53,7 +53,7 @@
DowngradeErrorMessage="A newer version of [ProductName] is already installed."
Schedule="afterInstallExecute" />
<Property Id="INSTALLFOLDERPREV">
- <ComponentSearch Id="WireGuardExecutable" Guid="c3508d23-3362-47ce-9220-321bdb1a1acc"/>
+ <ComponentSearch Id="WireGuardExecutable" Guid="c3508d23-3362-47ce-9220-321bdb1a1acc" />
</Property>
<SetProperty
After="AppSearch"
@@ -73,12 +73,12 @@
-->
<Directory Id="TARGETDIR" Name="SourceDir">
<Directory Id="$(var.PlatformProgramFilesFolder)">
- <Directory Id="INSTALLFOLDER" Name="WireGuard"/>
+ <Directory Id="INSTALLFOLDER" Name="WireGuard" />
</Directory>
- <Directory Id="ProgramMenuFolder"/>
- <Directory Id="SystemFolder"/>
+ <Directory Id="ProgramMenuFolder" />
+ <Directory Id="SystemFolder" />
<?if $(var.Platform) != "x86"?>
- <Directory Id="System64Folder"/>
+ <Directory Id="System64Folder" />
<?endif?>
</Directory>
@@ -90,14 +90,14 @@
<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" />
</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 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>
<?if $(var.Platform) != "x86"?>
<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>
<?endif?>
</ComponentGroup>
@@ -106,31 +106,31 @@
Merge modules
-->
<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>
<!--
Features
-->
<Feature Id="WireGuardFeature" Title="WireGuard" Level="1" ConfigurableDirectory="INSTALLFOLDER">
- <ComponentGroupRef Id="WireGuardComponents"/>
+ <ComponentGroupRef Id="WireGuardComponents" />
</Feature>
<Feature Id="WintunFeature" Title="Wintun" Level="1">
- <MergeRef Id="WintunMergeModule"/>
+ <MergeRef Id="WintunMergeModule" />
</Feature>
<!--
Evaluate WireGuard services and populate ServiceControl table
-->
- <CustomAction Id="EvaluateWireGuardServices" BinaryKey="customactions.js" JScriptCall="EvaluateWireGuardServices"/>
+ <CustomAction Id="EvaluateWireGuardServices" BinaryKey="customactions.js" JScriptCall="EvaluateWireGuardServices" />
<InstallExecuteSequence>
- <Custom Action="EvaluateWireGuardServices" After="FindRelatedProducts"/>
+ <Custom Action="EvaluateWireGuardServices" After="FindRelatedProducts" />
</InstallExecuteSequence>
<!--
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>
<Custom Action="RemoveConfigFolder" After="DeleteServices">(NOT UPGRADINGPRODUCTCODE) AND (REMOVE="ALL")</Custom>
</InstallExecuteSequence>
@@ -138,7 +138,7 @@
<!--
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>
<!-- 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>
diff --git a/manifest.xml b/manifest.xml
index 17f70bd5..e9a86c3a 100644
--- a/manifest.xml
+++ b/manifest.xml
@@ -1,21 +1,21 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<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">
<application>
<!-- Windows 10 -->
- <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
+ <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}" />
<!-- Windows 8.1 -->
- <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}"/>
+ <supportedOS Id="{1f676c76-80e1-4239-95bb-83d0f6d0da78}" />
<!-- Windows 8 -->
- <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}"/>
+ <supportedOS Id="{4a2f28e3-53b9-4441-ba9c-d69d4a4a6e38}" />
<!-- Windows 7 -->
- <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}"/>
+ <supportedOS Id="{35138b9a-5d96-4fbd-8e2d-a2440225f93a}" />
</application>
</compatibility>
<dependency>
<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>
</dependency>
<application xmlns="urn:schemas-microsoft-com:asm.v3">