merge

1 files changed, 3 insertions, 27 deletions

diff --git a/Software/Visual_Studio/Tango.AdvancedInstaller/InstallerBuilder.cs b/Software/Visual_Studio/Tango.AdvancedInstaller/InstallerBuilder.cs
index 40d18c991..ed52aeb05 100644
--- a/Software/Visual_Studio/Tango.AdvancedInstaller/InstallerBuilder.cs
+++ b/Software/Visual_Studio/Tango.AdvancedInstaller/InstallerBuilder.cs
@@ -1,9 +1,7 @@
 using System;
 using System.Collections.Generic;
-using System.IO;
 using System.Linq;
 using System.Text;
-using System.Text.RegularExpressions;
 using System.Threading.Tasks;
 using Tango.Core.Components;
 
@@ -11,32 +9,13 @@ namespace Tango.AdvancedInstaller
 {
     public class InstallerBuilder
     {
-        private const string ADVANCED_INSTALLER_BASE_FOLDER = @"C:\Program Files (x86)\Caphyon";
-
         public String AdvancedInstallerPath { get; set; }
 
         public String ProjectFile { get; private set; }
 
         private InstallerBuilder()
         {
-            double latestVersion = 0.0;
-
-            //Extract the latest advanced installer version...
-            foreach (var folder in Directory.GetDirectories(ADVANCED_INSTALLER_BASE_FOLDER))
-            {
-                try
-                {
-                    var versionString = Regex.Match(Path.GetFileName(folder), @"\d+\.*\d+").Value;
-                    double version = double.Parse(versionString);
-                    if (version > latestVersion)
-                    {
-                        latestVersion = version;
-                    }
-                }
-                catch { }
-            }
-
-            AdvancedInstallerPath = $@"{ADVANCED_INSTALLER_BASE_FOLDER}\Advanced Installer {latestVersion}\bin\x86\AdvancedInstaller.com";
+            AdvancedInstallerPath = @"C:\Program Files (x86)\Caphyon\Advanced Installer 15.6\bin\x86\AdvancedInstaller.com";
         }
 
         public InstallerBuilder(String projectFile) : this()
@@ -85,9 +64,6 @@ namespace Tango.AdvancedInstaller
                 command = new CmdCommand(AdvancedInstallerPath, $"/edit \"{ProjectFile}\" /SetPackageName \"{outputFile}\" -buildname DefaultBuild");
                 command.Run().Wait();
 
-                command = new CmdCommand(AdvancedInstallerPath, $"/edit \"{ProjectFile}\" /SetPackageName \"{Path.ChangeExtension(outputFile, ".msi")}\" -buildname DefaultBuild");
-                command.Run().Wait();
-
                 command = new CmdCommand(AdvancedInstallerPath, $"/rebuild \"{ProjectFile}\"");
                 command.Timeout = TimeSpan.FromMinutes(2);
                 command.Run().Wait();
@@ -96,7 +72,7 @@ namespace Tango.AdvancedInstaller
 
         public Task Uninstall()
         {
-            return Task.Factory.StartNew(() =>
+            return Task.Factory.StartNew(() => 
             {
                 String productName = GetProperty(ProjectProperty.ProductName).Result;
                 CmdCommand command = new CmdCommand("wmic", $"product where name=\"{productName}\" call uninstall /nointeractive");
@@ -107,7 +83,7 @@ namespace Tango.AdvancedInstaller
 
         public Task<bool> IsInstalled()
         {
-            return Task.Factory.StartNew<bool>(() =>
+            return Task.Factory.StartNew<bool>(() => 
             {
                 String productName = GetProperty(ProjectProperty.ProductName).Result;
                 CmdCommand command = new CmdCommand("wmic", $"product get name");