Hesham/wintun
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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:21:15 +02:00
parent c9da443273
commit 810d2ac73a
3 changed files with 41 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
installer/installer.wixproj
View File

@ -18,7 +18,7 @@
<DefineSolutionProperties>false</DefineSolutionProperties> <DefineSolutionProperties>false</DefineSolutionProperties>
</PropertyGroup> </PropertyGroup>
<Import Project="..\wintun.props"/> <Import Project="..\wintun.props" />
<PropertyGroup> <PropertyGroup>
<IntermediateOutputPath>..\$(WintunPlatform)\$(Configuration)\</IntermediateOutputPath> <IntermediateOutputPath>..\$(WintunPlatform)\$(Configuration)\</IntermediateOutputPath>
@ -37,26 +37,26 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<Compile Include="installer.wxs"/> <Compile Include="installer.wxs" />
</ItemGroup> </ItemGroup>
<Import Project="$(MSBuildProjectName).user" Condition="exists('$(MSBuildProjectName).user')"/> <Import Project="$(MSBuildProjectName).user" Condition="exists('$(MSBuildProjectName).user')" />
<Import Project="$(WixTargetsPath)" Condition="'$(WixTargetsPath)'!=''"/> <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="$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets" Condition="'$(WixTargetsPath)'=='' AND Exists('$(MSBuildExtensionsPath32)\Microsoft\WiX\v3.x\Wix.targets')" />
<Target Name="EnsureWixToolsetInstalled" Condition="'$(WixTargetsImported)'!='true'"> <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>
<Target Name="HashInstallerLibrary"> <Target Name="HashInstallerLibrary">
<GetFileHash Files="$(IntermediateOutputPath)installer.dll" Algorithm="SHA256" HashEncoding="hex"> <GetFileHash Files="$(IntermediateOutputPath)installer.dll" Algorithm="SHA256" HashEncoding="hex">
<Output TaskParameter="Items" ItemName="InstallerLibraryHash"/> <Output TaskParameter="Items" ItemName="InstallerLibraryHash" />
</GetFileHash> </GetFileHash>
<PropertyGroup> <PropertyGroup>
<DefineConstants>$(DefineConstants);INSTALLER_LIBRARY_HASH=@(InstallerLibraryHash->Metadata('FileHash'));INSTALLER_LIBRARY_TIME=$([System.IO.File]::GetLastWriteTime('$(IntermediateOutputPath)installer.dll').Ticks)</DefineConstants> <DefineConstants>$(DefineConstants);INSTALLER_LIBRARY_HASH=@(InstallerLibraryHash->Metadata('FileHash'));INSTALLER_LIBRARY_TIME=$([System.IO.File]::GetLastWriteTime('$(IntermediateOutputPath)installer.dll').Ticks)</DefineConstants>
</PropertyGroup> </PropertyGroup>
</Target> </Target>
<Import Project="..\wintun.vcxproj.user" Condition="exists('..\wintun.vcxproj.user')"/> <Import Project="..\wintun.vcxproj.user" Condition="exists('..\wintun.vcxproj.user')" />
<PropertyGroup> <PropertyGroup>
<SigningCertificate Condition="$(SignMode)=='TestSign' And '$(TestCertificate)'!=''">$(TestCertificate)</SigningCertificate> <SigningCertificate Condition="$(SignMode)=='TestSign' And '$(TestCertificate)'!=''">$(TestCertificate)</SigningCertificate>
<SigningCertificate Condition="$(SignMode)=='ProductionSign' And '$(ProductionCertificate)'!=''">$(ProductionCertificate)</SigningCertificate> <SigningCertificate Condition="$(SignMode)=='ProductionSign' And '$(ProductionCertificate)'!=''">$(ProductionCertificate)</SigningCertificate>
@ -68,9 +68,9 @@
Inputs="$(TargetPath)" Inputs="$(TargetPath)"
Outputs="$(IntermediateOutputPath)$(TargetName).sign"> Outputs="$(IntermediateOutputPath)$(TargetName).sign">
<Exec Command="signtool.exe sign /sha1 &quot;$(SigningCertificate)&quot; /fd sha256 /tr &quot;$(TimeStampServer)&quot; /td sha256 &quot;$(TargetPath)&quot;" /> <Exec Command="signtool.exe sign /sha1 &quot;$(SigningCertificate)&quot; /fd sha256 /tr &quot;$(TimeStampServer)&quot; /td sha256 &quot;$(TargetPath)&quot;" />
<Touch Files="$(IntermediateOutputPath)$(TargetName).sign" AlwaysCreate="true"/> <Touch Files="$(IntermediateOutputPath)$(TargetName).sign" AlwaysCreate="true" />
</Target> </Target>
<Target Name="CleanSignTarget"> <Target Name="CleanSignTarget">
<Delete Files="$(IntermediateOutputPath)$(TargetName).sign"/> <Delete Files="$(IntermediateOutputPath)$(TargetName).sign" />
</Target> </Target>
</Project> </Project>

18
installer/installer.wxs
View File

@ -13,7 +13,7 @@
InstallerVersion="200" InstallerVersion="200"
InstallPrivileges="elevated" InstallPrivileges="elevated"
InstallScope="perMachine" InstallScope="perMachine"
ReadOnly="yes"/> ReadOnly="yes" />
<Directory Id="TARGETDIR" Name="SourceDir"> <Directory Id="TARGETDIR" Name="SourceDir">
<Component Guid="b668d4c7-abb3-485a-b8df-d34200489a43"> <Component Guid="b668d4c7-abb3-485a-b8df-d34200489a43">
@ -22,24 +22,24 @@
Key="SOFTWARE\Wintun" Key="SOFTWARE\Wintun"
Type="integer" Type="integer"
Value="1" Value="1"
KeyPath="yes"/> KeyPath="yes" />
</Component> </Component>
</Directory> </Directory>
<Property Id="WintunInstallerHash" Value="$(var.INSTALLER_LIBRARY_HASH)" SuppressModularization="yes"/> <Property Id="WintunInstallerHash" Value="$(var.INSTALLER_LIBRARY_HASH)" SuppressModularization="yes" />
<Property Id="WintunInstallerBuildtime" Value="$(var.INSTALLER_LIBRARY_TIME)" SuppressModularization="yes"/> <Property Id="WintunInstallerBuildtime" Value="$(var.INSTALLER_LIBRARY_TIME)" SuppressModularization="yes" />
<Property Id="WintunVersion" Value="$(var.WINTUN_VERSION)" 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="EvaluateWintun" SuppressModularization="yes" BinaryKey="installer.dll" DllEntry="MsiEvaluate" Execute="immediate" />
<CustomAction Id="ProcessWintun" SuppressModularization="yes" BinaryKey="installer.dll" DllEntry="MsiProcess" Execute="deferred" Impersonate="no" /> <CustomAction Id="ProcessWintun" SuppressModularization="yes" BinaryKey="installer.dll" DllEntry="MsiProcess" Execute="deferred" Impersonate="no" />
<InstallExecuteSequence> <InstallExecuteSequence>
<Custom Action="EvaluateWintun" After="CostFinalize"/> <Custom Action="EvaluateWintun" After="CostFinalize" />
<Custom Action="ProcessWintun" After="InstallFiles"/> <Custom Action="ProcessWintun" After="InstallFiles" />
</InstallExecuteSequence> </InstallExecuteSequence>
<?if $(var.Platform) = "x86"?> <?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> <InstallExecuteSequence>
<Custom Action="WoW64Unsupported" After="LaunchConditions"><![CDATA[VersionNT64]]></Custom> <Custom Action="WoW64Unsupported" After="LaunchConditions"><![CDATA[VersionNT64]]></Custom>
</InstallExecuteSequence> </InstallExecuteSequence>

44
wintun.proj
View File

@ -9,20 +9,20 @@
<!-- <!--
General Properties General Properties
--> -->
<Import Project="wintun.props"/> <Import Project="wintun.props" />
<Import Project="wintun.vcxproj.user" Condition="exists('wintun.vcxproj.user')"/> <Import Project="wintun.vcxproj.user" Condition="exists('wintun.vcxproj.user')" />
<Target Name="Build" DependsOnTargets="Driver-x86;Driver-amd64;Driver-arm64"/> <Target Name="Build" DependsOnTargets="Driver-x86;Driver-amd64;Driver-arm64" />
<Target Name="MSM" DependsOnTargets="MSM-x86;MSM-amd64"/> <Target Name="MSM" DependsOnTargets="MSM-x86;MSM-amd64" />
<Target Name="Clean"> <Target Name="Clean">
<RemoveDir Directories="x86\Release\"/> <RemoveDir Directories="x86\Release\" />
<RemoveDir Directories="amd64\Release\"/> <RemoveDir Directories="amd64\Release\" />
<RemoveDir Directories="arm64\Release\"/> <RemoveDir Directories="arm64\Release\" />
<RemoveDir Directories="$(SDVDir)"/> <RemoveDir Directories="$(SDVDir)" />
<RemoveDir Directories="$(DistributionDir)"/> <RemoveDir Directories="$(DistributionDir)" />
<Delete Files="smvbuild.log;smvstats.txt;wintun.DVL.XML"/> <Delete Files="smvbuild.log;smvstats.txt;wintun.DVL.XML" />
</Target> </Target>
<Target Name="Rebuild" DependsOnTargets="Clean;Build"/> <Target Name="Rebuild" DependsOnTargets="Clean;Build" />
<!-- <!--
Driver Building Driver Building
@ -34,17 +34,17 @@
<Target Name="Driver-x86" <Target Name="Driver-x86"
Outputs="x86\Release\wintun\wintun.sys;x86\Release\wintun\wintun.inf;x86\Release\wintun\wintun.cat" Outputs="x86\Release\wintun\wintun.sys;x86\Release\wintun\wintun.inf;x86\Release\wintun\wintun.cat"
Inputs="$(DriverInputs)"> 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>
<Target Name="Driver-amd64" <Target Name="Driver-amd64"
Outputs="amd64\Release\wintun\wintun.sys;amd64\Release\wintun\wintun.inf;amd64\Release\wintun\wintun.cat" Outputs="amd64\Release\wintun\wintun.sys;amd64\Release\wintun\wintun.inf;amd64\Release\wintun\wintun.cat"
Inputs="$(DriverInputs)"> 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>
<Target Name="Driver-arm64" <Target Name="Driver-arm64"
Outputs="arm64\Release\wintun\wintun.sys;arm64\Release\wintun\wintun.inf;arm64\Release\wintun\wintun.cat" Outputs="arm64\Release\wintun\wintun.sys;arm64\Release\wintun\wintun.inf;arm64\Release\wintun\wintun.cat"
Inputs="$(DriverInputs)"> 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> </Target>
<!-- <!--
@ -52,25 +52,25 @@
--> -->
<Target Name="Installer-x86" <Target Name="Installer-x86"
Outputs="x86\Release\installer.dll"> 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>
<Target Name="Installer-amd64" <Target Name="Installer-amd64"
Outputs="amd64\Release\installer.dll"> 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>
<Target Name="Installer-arm64" <Target Name="Installer-arm64"
Outputs="arm64\Release\installer.dll"> 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> </Target>
<!-- <!--
Static Driver Verifier Static Driver Verifier
--> -->
<Target Name="SDV" Outputs="$(SDVDir)SDV.DVL.xml;amd64\Release\vc.nativecodeanalysis.all.xml"> <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>
<Target Name="SDVView"> <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> </Target>
<!-- <!--
@ -79,7 +79,7 @@
<Target Name="DVL" DependsOnTargets="SDV" <Target Name="DVL" DependsOnTargets="SDV"
Outputs="wintun.DVL.XML" Outputs="wintun.DVL.XML"
Inputs="$(SDVDir)SDV.DVL.xml;amd64\Release\vc.nativecodeanalysis.all.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> </Target>
<!-- <!--
@ -87,10 +87,10 @@
--> -->
<Target Name="MSM-x86" DependsOnTargets="Installer-x86" <Target Name="MSM-x86" DependsOnTargets="Installer-x86"
Outputs="$(DistributionDir)wintun-x86-$(WintunVersionStr).msm"> 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>
<Target Name="MSM-amd64" DependsOnTargets="Installer-amd64" <Target Name="MSM-amd64" DependsOnTargets="Installer-amd64"
Outputs="$(DistributionDir)wintun-amd64-$(WintunVersionStr).msm"> 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> </Target>
</Project> </Project>