From c46860862414f1d40d137cd7e1397822ce60ebbb Mon Sep 17 00:00:00 2001
From: Cyberboss <Cyberboss@users.noreply.github.com>
Date: Tue, 4 Jul 2017 15:02:35 -0400
Subject: [PATCH] Fixes uninstall potentially not working

---
 TGServiceInstaller/Product.wxs | 42 +++++++++++++++++-----------------
 1 file changed, 21 insertions(+), 21 deletions(-)

diff --git a/TGServiceInstaller/Product.wxs b/TGServiceInstaller/Product.wxs
index 7d6a03a1b7..3c1d2eba6b 100644
--- a/TGServiceInstaller/Product.wxs
+++ b/TGServiceInstaller/Product.wxs
@@ -40,7 +40,7 @@
 
   <Fragment>
     <ComponentGroup Id="StartMenuShortcuts" Directory="ApplicationProgramsFolder">
-      <Component Id="StartMenuShortcut" Guid="685790d5-24ae-431b-8c5a-c71125e389d5">
+      <Component Id="StartMenuShortcut" Guid="*">
         <Condition>INSTALLSHORTCUTSTART = 1</Condition>
         <Shortcut Id="StartMenuShortcutCL"
                   Name="TG Command Line"
@@ -61,7 +61,7 @@
     </ComponentGroup>
     
     <ComponentGroup Id="DesktopShortcuts" Directory="DesktopFolder">
-      <Component Id="DesktopShortcut" Guid="08950533-8264-4824-b7a5-8424c48375df">
+      <Component Id="DesktopShortcut" Guid="*">
         <Condition>INSTALLSHORTCUTDESK = 1</Condition>
         <Shortcut Id="DesktopShortcutCL"
                   Name="TG Command Line"
@@ -77,68 +77,68 @@
     </ComponentGroup>
 
     <ComponentGroup Id="ProductComponents" Directory="INSTALLFOLDER">
-      <Component Id="TGCommandLine">
+      <Component Id="TGCommandLine" Guid="*">
         <File Source="$(var.TGCommandLine.TargetPath)" />
         <Environment Id="PATH" Name="PATH" Value="[INSTALLFOLDER]" Permanent="no" Part="last" Action="set" System="yes" />
       </Component>
-      <Component Id="TGServerService">
+      <Component Id="TGServerService" Guid="*">
         <File Source="$(var.TGServerService.TargetPath)" />
         <ServiceInstall Id="ServiceInstaller" Name="TG Station Server" Type="ownProcess" EraseDescription="no" ErrorControl="normal" Start="auto" Vital="yes" />
         <ServiceControl Id="StartService" Start="install" Stop="both" Remove="uninstall" Name="TG Station Server" Wait="yes" />
       </Component>
-      <Component Id="DiscordNet">
+      <Component Id="DiscordNet" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)/Discord.Net.dll" />
       </Component>
-      <Component Id="LibGit2Sharp">
+      <Component Id="LibGit2Sharp" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)/LibGit2Sharp.dll" />
       </Component>
-      <Component Id="MeebeySmartIrc4net">
+      <Component Id="MeebeySmartIrc4net" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)/Meebey.SmartIrc4net.dll" />
       </Component>
-      <Component Id="NewtonsoftJson">
+      <Component Id="NewtonsoftJson" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)/Newtonsoft.Json.dll" />
       </Component>
-      <Component Id="NitoAsyncConc">
+      <Component Id="NitoAsyncConc" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)/Nito.AsyncEx.Concurrent.dll" />
       </Component>
-      <Component Id="NitoAsync">
+      <Component Id="NitoAsync" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)/Nito.AsyncEx.dll" />
       </Component>
-      <Component Id="NitoAsyncEnlight">
+      <Component Id="NitoAsyncEnlight" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)/Nito.AsyncEx.Enlightenment.dll" />
       </Component>
-      <Component Id="RestSharp">
+      <Component Id="RestSharp" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)/RestSharp.dll" />
       </Component>
-      <Component Id="WebSock">
+      <Component Id="WebSock" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)/WebSocket4Net.dll" />
       </Component>
-      <Component Id="TGControlPanel">
+      <Component Id="TGControlPanel" Guid="*">
         <File Source="$(var.TGControlPanel.TargetPath)" KeyPath="yes" />
       </Component>
-      <Component Id="TGServiceInterface">
+      <Component Id="TGServiceInterface" Guid="*">
         <File Source="$(var.TGServiceInterface.TargetPath)" />
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="Gitx86Components" Directory="x86Folder">
-      <Component Id="LibGit2Sharpx86">
+      <Component Id="LibGit2Sharpx86" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)lib\win32\x86\git2-ssh-baa87df.dll" Id="LibGit2Sharpx86dll"/>
       </Component>
-      <Component Id="LibGit2Sharpx86SSH">
+      <Component Id="LibGit2Sharpx86SSH" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)lib\win32\x86\libssh2.dll" Id="LibGit2Sharpx86SSHdll"/>
       </Component>
-      <Component Id="LibGit2Sharpx86Z">
+      <Component Id="LibGit2Sharpx86Z" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)lib\win32\x86\zlib.dll" Id="LibGit2Sharpx86Zdll"/>
       </Component>
     </ComponentGroup>
     <ComponentGroup Id="Gitx64Components" Directory="x64Folder">
-      <Component Id="LibGit2Sharpx64">
+      <Component Id="LibGit2Sharpx64" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)lib\win32\x64\git2-ssh-baa87df.dll" Id="LibGit2Sharpx64dll" />
       </Component>
-      <Component Id="LibGit2Sharpx64SSH">
+      <Component Id="LibGit2Sharpx64SSH" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)lib\win32\x64\libssh2.dll" Id="LibGit2Sharpx64SSHdll"/>
       </Component>
-      <Component Id="LibGit2Sharpx64Z">
+      <Component Id="LibGit2Sharpx64Z" Guid="*">
         <File Source="$(var.TGServerService.TargetDir)lib\win32\x64\zlib.dll" Id="LibGit2Sharpx64Zdll"/>
       </Component>
     </ComponentGroup>