Working on merge module. No working reference from feature to components.
Sean McArdle
parent
ef8a547cc6
commit
9858556e6b
|
|
@ -6,6 +6,9 @@ MinimumVisualStudioVersion = 10.0.40219.1
|
|||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WifiSitter", "WifiSitter\WifiSitter.csproj", "{B3A5D84A-C7A0-409D-881D-1D5FF36773D4}"
|
||||
EndProject
|
||||
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WifiSitterGui", "WifiSitterGui\WifiSitterGui.csproj", "{20552785-B57D-4A59-B891-EF4FB170CE1A}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
{B3A5D84A-C7A0-409D-881D-1D5FF36773D4} = {B3A5D84A-C7A0-409D-881D-1D5FF36773D4}
|
||||
EndProjectSection
|
||||
EndProject
|
||||
Project("{930C7802-8A8C-48F9-8165-68863BCCD9DD}") = "WifiSitterInstallMM", "WifiSitterInstallMM\WifiSitterInstallMM.wixproj", "{332F9E25-675C-4D66-AD6F-3FCBC446373E}"
|
||||
ProjectSection(ProjectDependencies) = postProject
|
||||
|
|
|
|||
|
|
@ -1,9 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<Fragment>
|
||||
<Condition Message="You need to be an administrator to install this product.">
|
||||
AdminUser
|
||||
</Condition>
|
||||
|
||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||
<Directory Id="ProgramFilesFolder" Name="PFiles">
|
||||
<Directory Id="INSTALLLOCATION" Name="WifiSitter">
|
||||
|
|
@ -11,9 +9,12 @@
|
|||
</Directory>
|
||||
</Directory>
|
||||
</Directory>
|
||||
<Feature Id="WifiSitterService" Title="WifiSitter Service" Description="Installs WifiSitter service." Level="1" AllowAdvertise="yes" Absent="allow" InstallDefault="local" TypicalDefault="install" Display="collapse">
|
||||
<MergeRef Id="WifiSitterInstallMM" />
|
||||
<ComponentRef Id="owc5DB171672A528857E251FFF987889D7D"/>
|
||||
</Feature>
|
||||
|
||||
<FeatureGroup Id="features">
|
||||
<Feature Id="WifiSitterService" Title="WifiSitter Service" Description="Installs WifiSitter service."
|
||||
Level="1" AllowAdvertise="no" Absent="disallow" InstallDefault="local" TypicalDefault="install">
|
||||
<MergeRef Id="WifiSitterInstallMM" />
|
||||
</Feature>
|
||||
</FeatureGroup>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
|
|
@ -14,6 +14,9 @@
|
|||
<!-- Major Upgrade Rule to disallow downgrades -->
|
||||
<MajorUpgrade DowngradeErrorMessage="A newer version of [ProductName] is already installed." />
|
||||
<!--Common Launch Condition-->
|
||||
<Condition Message="You need to be an administrator to install this product.">
|
||||
Privileged
|
||||
</Condition>
|
||||
<!-- Examples at http://wixtoolset.org/documentation/manual/v3/customactions/wixnetfxextension.html -->
|
||||
<PropertyRef Id="NETFRAMEWORK40FULL" />
|
||||
<Condition Message="[ProductName] requires .NET Framework 4.0.">Installed OR NETFRAMEWORK40FULL</Condition>
|
||||
|
|
@ -22,6 +25,8 @@
|
|||
<Property Id="ARPPRODUCTICON" Value="Icon.ico"></Property>
|
||||
<UIRef Id="UI" />
|
||||
<!-- Include Features and Directories Fragment -->
|
||||
<DirectoryRef Id="INSTALLLOCATION" />
|
||||
<!--<DirectoryRef Id="INSTALLLOCATION" />-->
|
||||
<!--<DirectoryRef Id="TARGETDIR" />-->
|
||||
<FeatureGroupRef Id="features" />
|
||||
</Product>
|
||||
</Wix>
|
||||
|
|
@ -4,13 +4,22 @@
|
|||
<!-- SourceDir instructs IsWiX the location of the directory that contains files for this merge module -->
|
||||
<?define SourceDir="..\Deploy"?>
|
||||
<Module Id="WifiSitterInstallMM" Language="1033" Version="1.0.0.0">
|
||||
<Package Id="27a711a5-657d-4e8a-86cf-e4636a599192" Manufacturer="WifiSitterInstallMM" InstallerVersion="200" />
|
||||
<Package Id="27a711a5-657d-4e8a-86cf-e4636a599192" Manufacturer="mcardletech.com" InstallerVersion="200" Comments="Contains everything needed to install WifiSitter as a Windows service." InstallPrivileges="elevated" InstallScope="perMachine" ShortNames="no" />
|
||||
<Directory Id="TARGETDIR" Name="SourceDir">
|
||||
<Directory Id="MergeRedirectFolder">
|
||||
<Component Id="owc302C30EEF06DE6020AF828C59E8962BF" Guid="8aa1cf75-9cd2-f65e-c016-d96ce3e7a4da">
|
||||
<File Id="owf302C30EEF06DE6020AF828C59E8962BF" Source="$(var.SourceDir)\AsyncIO.dll" KeyPath="yes" />
|
||||
</Component>
|
||||
<Component Id="owc14AAE9B0AED65685CC1E502FDBE3C9C7" Guid="dfcc9867-c435-1b3e-2768-1218cd41b47b">
|
||||
<File Id="owf14AAE9B0AED65685CC1E502FDBE3C9C7" Source="$(var.SourceDir)\NetMQ.dll" KeyPath="yes" />
|
||||
</Component>
|
||||
<Component Id="owc3FC8434C1A84605AEEBC6A100CA2F3E1" Guid="47d7e276-db6d-424e-d797-1a69e1e24b3b">
|
||||
<File Id="owf3FC8434C1A84605AEEBC6A100CA2F3E1" Source="$(var.SourceDir)\Newtonsoft.Json.dll" KeyPath="yes" />
|
||||
</Component>
|
||||
<Component Id="owc5DB171672A528857E251FFF987889D7D" Guid="b6c6eb34-ffe5-5239-5443-7d4b7c291a35">
|
||||
<File Id="owf5DB171672A528857E251FFF987889D7D" Source="$(var.SourceDir)\WifiSitter.exe" KeyPath="yes" />
|
||||
<ServiceInstall Id="WifiSitter" Name="WifiSitter" Description="Babysitter for your wifi." Start="auto" Type="ownProcess" ErrorControl="ignore" Vital="yes" Arguments="/console /i"/>
|
||||
<ServiceControl Id="WifiSitter" Name="WifiSitter" Remove="uninstall" Start="install" Stop="both" Wait="no"/>
|
||||
<ServiceInstall Id="WifiSitter" Name="WifiSitter" Description="Babysitter for your wifi." Start="auto" Type="ownProcess" ErrorControl="ignore" Vital="yes" Arguments="/console /i" />
|
||||
<ServiceControl Id="WifiSitter" Name="WifiSitter" Remove="uninstall" Start="install" Stop="both" Wait="no" />
|
||||
</Component>
|
||||
</Directory>
|
||||
</Directory>
|
||||
|
|
|
|||
|
|
@ -1,17 +1,19 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
|
||||
<Fragment>
|
||||
|
||||
<!-- Reference Custom Components Below -->
|
||||
<ComponentGroup Id="Custom">
|
||||
|
||||
<Component Id="_" Guid="{AA44A146-F7DB-4E9C-BD9F-360CC8BDC735}">
|
||||
<RegistryValue Id="_" Root="HKLM" Key="SYSTEM\CurrentControlSet\services\WifiSitter\NicWhiteList" Name="0" Value="Microsoft Wi-Fi Direct" Type="string" KeyPath="yes" />
|
||||
</Component>
|
||||
<Component Id="__1" Guid="{D965BA81-CA82-4341-9EF1-F109460649B6}">
|
||||
<RegistryValue Id="__1" Root="HKLM" Key="SYSTEM\CurrentControlSet\services\WifiSitter\NicWhiteList" Name="1" Value="VirtualBox Host" Type="string" KeyPath="yes" />
|
||||
</Component>
|
||||
<Component Id="__2" Guid="{2E1E118D-A0D4-4B3B-8CCF-B991D9E1C461}">
|
||||
<RegistryValue Id="__2" Root="HKLM" Key="SYSTEM\CurrentControlSet\services\WifiSitter\NicWhiteList" Name="2" Value="VMware Network Adapter" Type="string" KeyPath="yes" />
|
||||
</Component>
|
||||
</ComponentGroup>
|
||||
|
||||
<!-- Author Custom Components Below -->
|
||||
<DirectoryRef Id="MergeRedirectFolder">
|
||||
|
||||
|
||||
</DirectoryRef>
|
||||
|
||||
<DirectoryRef Id="MergeRedirectFolder"></DirectoryRef>
|
||||
</Fragment>
|
||||
</Wix>
|
||||
Loading…
Reference in New Issue