diff options
Diffstat (limited to 'installer')
| -rw-r--r-- | installer/installer.wixproj | 20 | ||||
| -rw-r--r-- | installer/installer.wxs | 18 |
2 files changed, 19 insertions, 19 deletions
diff --git a/installer/installer.wixproj b/installer/installer.wixproj index 69b40a6..90c7964 100644 --- a/installer/installer.wixproj +++ b/installer/installer.wixproj @@ -18,7 +18,7 @@ <DefineSolutionProperties>false</DefineSolutionProperties> </PropertyGroup> - <Import Project="..\wintun.props"/> + <Import Project="..\wintun.props" /> <PropertyGroup> <IntermediateOutputPath>..\$(WintunPlatform)\$(Configuration)\</IntermediateOutputPath> @@ -37,26 +37,26 @@ </PropertyGroup> <ItemGroup> - <Compile Include="installer.wxs"/> + <Compile Include="installer.wxs" /> </ItemGroup> - <Import Project="$(MSBuildProjectName).user" Condition="exists('$(MSBuildProjectName).user')"/> - <Import Project="$(WixTargetsPath)" Condition="'$(WixTargetsPath)'!=''"/> - <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition="'$(WixTargetsPath)'=='' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets')"/> + <Import Project="$(MSBuildProjectName).user" Condition="exists('$(MSBuildProjectName).user')" /> + <Import Project="$(WixTargetsPath)" Condition="'$(WixTargetsPath)'!=''" /> + <Import Project="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition="'$(WixTargetsPath)'=='' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets')" /> <Target Name="EnsureWixToolsetInstalled" Condition="'$(WixTargetsImported)'!='true'"> - <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/"/> + <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" /> </Target> <Target Name="HashInstallerLibrary"> <GetFileHash Files="$(IntermediateOutputPath)installer.dll" Algorithm="SHA256" HashEncoding="hex"> - <Output TaskParameter="Items" ItemName="InstallerLibraryHash"/> + <Output TaskParameter="Items" ItemName="InstallerLibraryHash" /> </GetFileHash> <PropertyGroup> <DefineConstants>$(DefineConstants);INSTALLER_LIBRARY_HASH=@(InstallerLibraryHash->Metadata('FileHash'));INSTALLER_LIBRARY_TIME=$([System.IO.File]::GetLastWriteTime('$(IntermediateOutputPath)installer.dll').Ticks)</DefineConstants> </PropertyGroup> </Target> - <Import Project="..\wintun.vcxproj.user" Condition="exists('..\wintun.vcxproj.user')"/> + <Import Project="..\wintun.vcxproj.user" Condition="exists('..\wintun.vcxproj.user')" /> <PropertyGroup> <SigningCertificate Condition="$(SignMode)=='TestSign' And '$(TestCertificate)'!=''">$(TestCertificate)</SigningCertificate> <SigningCertificate Condition="$(SignMode)=='ProductionSign' And '$(ProductionCertificate)'!=''">$(ProductionCertificate)</SigningCertificate> @@ -68,9 +68,9 @@ Inputs="$(TargetPath)" Outputs="$(IntermediateOutputPath)$(TargetName).sign"> <Exec Command="signtool.exe sign /sha1 "$(SigningCertificate)" /fd sha256 /tr "$(TimeStampServer)" /td sha256 "$(TargetPath)"" /> - <Touch Files="$(IntermediateOutputPath)$(TargetName).sign" AlwaysCreate="true"/> + <Touch Files="$(IntermediateOutputPath)$(TargetName).sign" AlwaysCreate="true" /> </Target> <Target Name="CleanSignTarget"> - <Delete Files="$(IntermediateOutputPath)$(TargetName).sign"/> + <Delete Files="$(IntermediateOutputPath)$(TargetName).sign" /> </Target> </Project> diff --git a/installer/installer.wxs b/installer/installer.wxs index f5627dd..dd2f1c8 100644 --- a/installer/installer.wxs +++ b/installer/installer.wxs @@ -13,7 +13,7 @@ InstallerVersion="200" InstallPrivileges="elevated" InstallScope="perMachine" - ReadOnly="yes"/> + ReadOnly="yes" /> <Directory Id="TARGETDIR" Name="SourceDir"> <Component Guid="b668d4c7-abb3-485a-b8df-d34200489a43"> @@ -22,24 +22,24 @@ Key="SOFTWARE\Wintun" Type="integer" Value="1" - KeyPath="yes"/> + KeyPath="yes" /> </Component> </Directory> - <Property Id="WintunInstallerHash" Value="$(var.INSTALLER_LIBRARY_HASH)" SuppressModularization="yes"/> - <Property Id="WintunInstallerBuildtime" Value="$(var.INSTALLER_LIBRARY_TIME)" SuppressModularization="yes"/> - <Property Id="WintunVersion" Value="$(var.WINTUN_VERSION)" SuppressModularization="yes"/> + <Property Id="WintunInstallerHash" Value="$(var.INSTALLER_LIBRARY_HASH)" SuppressModularization="yes" /> + <Property Id="WintunInstallerBuildtime" Value="$(var.INSTALLER_LIBRARY_TIME)" SuppressModularization="yes" /> + <Property Id="WintunVersion" Value="$(var.WINTUN_VERSION)" SuppressModularization="yes" /> - <Binary Id="installer.dll" SourceFile="!(bindpath.output_dir)installer.dll"/> + <Binary Id="installer.dll" SourceFile="!(bindpath.output_dir)installer.dll" /> <CustomAction Id="EvaluateWintun" SuppressModularization="yes" BinaryKey="installer.dll" DllEntry="MsiEvaluate" Execute="immediate" /> <CustomAction Id="ProcessWintun" SuppressModularization="yes" BinaryKey="installer.dll" DllEntry="MsiProcess" Execute="deferred" Impersonate="no" /> <InstallExecuteSequence> - <Custom Action="EvaluateWintun" After="CostFinalize"/> - <Custom Action="ProcessWintun" After="InstallFiles"/> + <Custom Action="EvaluateWintun" After="CostFinalize" /> + <Custom Action="ProcessWintun" After="InstallFiles" /> </InstallExecuteSequence> <?if $(var.Platform) = "x86"?> - <CustomAction Id="WoW64Unsupported" Error="You are attempting to install the 32-bit variant of [ProductName] on a 64-bit operating system, which is not supported. Please install the 64-bit variant instead."/> + <CustomAction Id="WoW64Unsupported" Error="You are attempting to install the 32-bit variant of [ProductName] on a 64-bit operating system, which is not supported. Please install the 64-bit variant instead." /> <InstallExecuteSequence> <Custom Action="WoW64Unsupported" After="LaunchConditions"><![CDATA[VersionNT64]]></Custom> </InstallExecuteSequence> |