Merge branch 'felfert-winfsp#128'

This commit is contained in:
Bill Zissimopoulos 2017-12-19 16:22:37 -08:00
commit 08bf8e14ce
No known key found for this signature in database
GPG Key ID: 3D4F95D52C7B3EA3
3 changed files with 9 additions and 3 deletions

View File

@ -58,4 +58,5 @@ CONTRIBUTOR LIST
|John Oberschelp |john at oberschelp.net |John Oberschelp |john at oberschelp.net
|Sam Kelly (DuroSoft Technologies LLC, https://durosoft.com) |sam at durosoft.com |Sam Kelly (DuroSoft Technologies LLC, https://durosoft.com) |sam at durosoft.com
|Tobias Urlaub |saibotu at outlook.de |Tobias Urlaub |saibotu at outlook.de
|Fritz Elfert |fritz-github at fritz-elfert.de
|=== |===

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"> <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:dep="http://schemas.microsoft.com/wix/DependencyExtension">
<Product <Product
Id="*" Id="*"
Name="$(var.MyProductName) $(var.MyProductVersion)" Name="$(var.MyProductName) $(var.MyProductVersion)"
@ -53,8 +54,8 @@
Key="[P.RegistryKey]" Key="[P.RegistryKey]"
Name="InstallDir" Name="InstallDir"
Type="string" Type="string"
Value="[INSTALLDIR]" Value="[INSTALLDIR]" />
KeyPath="yes" /> <dep:Provides Key="WinFsp" />
</Component> </Component>
<Component Id="C.License.txt"> <Component Id="C.License.txt">
<File Name="License.txt" Source="..\..\..\License.txt" KeyPath="yes" /> <File Name="License.txt" Source="..\..\..\License.txt" KeyPath="yes" />

View File

@ -39,6 +39,10 @@
<HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath> <HintPath>$(WixExtDir)\WixUIExtension.dll</HintPath>
<Name>WixUIExtension</Name> <Name>WixUIExtension</Name>
</WixExtension> </WixExtension>
<WixExtension Include="WixDependencyExtension">
<HintPath>$(WixExtDir)\WixDependencyExtension.dll</HintPath>
<Name>WixDependencyExtension</Name>
</WixExtension>
</ItemGroup> </ItemGroup>
<Import Project="$(WixTargetsPath)" /> <Import Project="$(WixTargetsPath)" />
<!-- <!--