Unify XML empty-element spacing
Signed-off-by: Simon Rozman <simon@rozman.si>
This commit is contained in:
Simon Rozman
parent
c9da443273
commit
810d2ac73a
@ -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>
|
||||
|
||||
@ -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>
|
||||
|
||||
44
wintun.proj
44
wintun.proj
@ -9,20 +9,20 @@
|
||||
<!--
|
||||
General Properties
|
||||
-->
|
||||
<Import Project="wintun.props"/>
|
||||
<Import Project="wintun.vcxproj.user" Condition="exists('wintun.vcxproj.user')"/>
|
||||
<Import Project="wintun.props" />
|
||||
<Import Project="wintun.vcxproj.user" Condition="exists('wintun.vcxproj.user')" />
|
||||
|
||||
<Target Name="Build" DependsOnTargets="Driver-x86;Driver-amd64;Driver-arm64"/>
|
||||
<Target Name="MSM" DependsOnTargets="MSM-x86;MSM-amd64"/>
|
||||
<Target Name="Build" DependsOnTargets="Driver-x86;Driver-amd64;Driver-arm64" />
|
||||
<Target Name="MSM" DependsOnTargets="MSM-x86;MSM-amd64" />
|
||||
<Target Name="Clean">
|
||||
<RemoveDir Directories="x86\Release\"/>
|
||||
<RemoveDir Directories="amd64\Release\"/>
|
||||
<RemoveDir Directories="arm64\Release\"/>
|
||||
<RemoveDir Directories="$(SDVDir)"/>
|
||||
<RemoveDir Directories="$(DistributionDir)"/>
|
||||
<Delete Files="smvbuild.log;smvstats.txt;wintun.DVL.XML"/>
|
||||
<RemoveDir Directories="x86\Release\" />
|
||||
<RemoveDir Directories="amd64\Release\" />
|
||||
<RemoveDir Directories="arm64\Release\" />
|
||||
<RemoveDir Directories="$(SDVDir)" />
|
||||
<RemoveDir Directories="$(DistributionDir)" />
|
||||
<Delete Files="smvbuild.log;smvstats.txt;wintun.DVL.XML" />
|
||||
</Target>
|
||||
<Target Name="Rebuild" DependsOnTargets="Clean;Build"/>
|
||||
<Target Name="Rebuild" DependsOnTargets="Clean;Build" />
|
||||
|
||||
<!--
|
||||
Driver Building
|
||||
@ -34,17 +34,17 @@
|
||||
<Target Name="Driver-x86"
|
||||
Outputs="x86\Release\wintun\wintun.sys;x86\Release\wintun\wintun.inf;x86\Release\wintun\wintun.cat"
|
||||
Inputs="$(DriverInputs)">
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=Win32"/>
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=Win32" />
|
||||
</Target>
|
||||
<Target Name="Driver-amd64"
|
||||
Outputs="amd64\Release\wintun\wintun.sys;amd64\Release\wintun\wintun.inf;amd64\Release\wintun\wintun.cat"
|
||||
Inputs="$(DriverInputs)">
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=x64"/>
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=x64" />
|
||||
</Target>
|
||||
<Target Name="Driver-arm64"
|
||||
Outputs="arm64\Release\wintun\wintun.sys;arm64\Release\wintun\wintun.inf;arm64\Release\wintun\wintun.cat"
|
||||
Inputs="$(DriverInputs)">
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=ARM64"/>
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=ARM64" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
@ -52,25 +52,25 @@
|
||||
-->
|
||||
<Target Name="Installer-x86"
|
||||
Outputs="x86\Release\installer.dll">
|
||||
<MSBuild Projects="installer\installer.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=Win32"/>
|
||||
<MSBuild Projects="installer\installer.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=Win32" />
|
||||
</Target>
|
||||
<Target Name="Installer-amd64"
|
||||
Outputs="amd64\Release\installer.dll">
|
||||
<MSBuild Projects="installer\installer.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=x64"/>
|
||||
<MSBuild Projects="installer\installer.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=x64" />
|
||||
</Target>
|
||||
<Target Name="Installer-arm64"
|
||||
Outputs="arm64\Release\installer.dll">
|
||||
<MSBuild Projects="installer\installer.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=ARM64"/>
|
||||
<MSBuild Projects="installer\installer.vcxproj" Targets="Build" Properties="Configuration=Release;Platform=ARM64" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
Static Driver Verifier
|
||||
-->
|
||||
<Target Name="SDV" Outputs="$(SDVDir)SDV.DVL.xml;amd64\Release\vc.nativecodeanalysis.all.xml">
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="sdv" Properties="Inputs=/check:*;Configuration=Release;Platform=x64"/>
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="sdv" Properties="Inputs=/check:*;Configuration=Release;Platform=x64" />
|
||||
</Target>
|
||||
<Target Name="SDVView">
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="sdv" Properties="Inputs=/view;Configuration=Release;Platform=x64"/>
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="sdv" Properties="Inputs=/view;Configuration=Release;Platform=x64" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
@ -79,7 +79,7 @@
|
||||
<Target Name="DVL" DependsOnTargets="SDV"
|
||||
Outputs="wintun.DVL.XML"
|
||||
Inputs="$(SDVDir)SDV.DVL.xml;amd64\Release\vc.nativecodeanalysis.all.xml">
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="dvl" Properties="Configuration=Release;Platform=x64"/>
|
||||
<MSBuild Projects="wintun.vcxproj" Targets="dvl" Properties="Configuration=Release;Platform=x64" />
|
||||
</Target>
|
||||
|
||||
<!--
|
||||
@ -87,10 +87,10 @@
|
||||
-->
|
||||
<Target Name="MSM-x86" DependsOnTargets="Installer-x86"
|
||||
Outputs="$(DistributionDir)wintun-x86-$(WintunVersionStr).msm">
|
||||
<MSBuild Projects="installer/installer.wixproj" Targets="Build" Properties="Configuration=Release;Platform=x86"/>
|
||||
<MSBuild Projects="installer/installer.wixproj" Targets="Build" Properties="Configuration=Release;Platform=x86" />
|
||||
</Target>
|
||||
<Target Name="MSM-amd64" DependsOnTargets="Installer-amd64"
|
||||
Outputs="$(DistributionDir)wintun-amd64-$(WintunVersionStr).msm">
|
||||
<MSBuild Projects="installer/installer.wixproj" Targets="Build" Properties="Configuration=Release;Platform=x64"/>
|
||||
<MSBuild Projects="installer/installer.wixproj" Targets="Build" Properties="Configuration=Release;Platform=x64" />
|
||||
</Target>
|
||||
</Project>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user