jyapayne/moonlight-qt
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Allow side-by-side installation of nightly and release builds"

Browse source 
This reverts commit 33e814122e.
This commit is contained in:
Cameron Gutman 2020-05-04 17:50:03 -07:00
commit 96fe1a7da1
4 changed files with 12 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

20
wix/Moonlight/Product.wxs
View file

@ -1,21 +1,11 @@
<?xml version="1.0" encoding="UTF-8"?>
<?if $(env.APPVEYOR) = True ?>
<?define ShortName = "Moonlight (Nightly)" ?>
<?define FullName = "Moonlight Game Streaming Client (Nightly)" ?>
<?define InstallFolder = "Moonlight Game Streaming (Nightly)" ?>
<?define RegKeyName = "Moonlight Game Streaming Project (Nightly)" ?>
<?define UpgradeCode = "1b3bbb1b-3ee3-4000-adf2-6358eab315f6" ?>
<?else?>
<?define ShortName = "Moonlight" ?>
<?define FullName = "Moonlight Game Streaming Client" ?>
<?define InstallFolder = "Moonlight Game Streaming" ?>
<?define RegKeyName = "Moonlight Game Streaming Project" ?>
<?define UpgradeCode = "5c09f94e-f809-4c6a-9b7b-597c99f041fe" ?>
<?endif ?>
<?define ShortcutName = "$(var.ShortName)" ?>
<?define ShortcutDesc = "Stream games from your NVIDIA GameStream-enabled PC" ?>
<?define InstallFolder = "Moonlight Game Streaming" ?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi"
xmlns:fire="http://schemas.microsoft.com/wix/FirewallExtension"
@ -26,7 +16,7 @@
Language="1033"
Version="!(bind.fileVersion.MoonlightExe)"
Manufacturer="Moonlight Game Streaming Project"
UpgradeCode="$(var.UpgradeCode)">
UpgradeCode="5c09f94e-f809-4c6a-9b7b-597c99f041fe">
<Package InstallerVersion="500" Compressed="yes" InstallScope="perMachine" />
@ -72,7 +62,7 @@
WorkingDirectory="INSTALLFOLDER" />
<RemoveFolder Id="CleanupStartMenuShortcut" Directory="ApplicationProgramsFolder" On="uninstall" />
<util:RemoveFolderEx Id="CleanupAppDataFolder" On="uninstall" Property="APPDATAFOLDER" />
<RegistryValue Root="HKCU" Key="Software\$(var.RegKeyName)" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
<RegistryValue Root="HKCU" Key="Software\Moonlight Game Streaming Project" Name="Installed" Type="integer" Value="1" KeyPath="yes" />
</Component>
<Component Id="MoonlightDesktopShortcut" Guid="*" Directory="INSTALLFOLDER">
@ -84,7 +74,7 @@
WorkingDirectory="INSTALLFOLDER" />
<RemoveFolder Id="CleanupDesktopShortcut" Directory="DesktopFolder" On="uninstall" />
<RegistryValue Root="HKCU"
Key="Software\$(var.RegKeyName)"
Key="Software\Moonlight Game Streaming Project"
Name="DesktopShortcutInstalled"
Type="integer"
Value="1"
@ -97,7 +87,7 @@
product -->
<Component Id="MoonlightDesktopShortcutState" Guid="*" Directory="INSTALLFOLDER">
<RegistryValue Root="HKCU"
Key="Software\$(var.RegKeyName)"
Key="Software\Moonlight Game Streaming Project"
Name="DesktopShortcutInstallState"
Type="integer"
Value="[ADDDESKTOPSHORTCUT]"