From 44f06b8e4ef8ba75ee805f1bb9dbcedf97f04fb8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Pedro?= <jpedrolmail@gmail.com>
Date: Wed, 28 Mar 2018 01:18:46 +0100
Subject: [PATCH] Builder improvements.

---
 .../CommandLineBuilderConfiguration.cs          |  2 --
 source/Cosmos.Build.Builder/CosmosTask.cs       | 17 +----------------
 .../IBuilderConfiguration.cs                    |  2 --
 3 files changed, 1 insertion(+), 20 deletions(-)

diff --git a/source/Cosmos.Build.Builder/CommandLineBuilderConfiguration.cs b/source/Cosmos.Build.Builder/CommandLineBuilderConfiguration.cs
index 329d85337..76d95cf08 100644
--- a/source/Cosmos.Build.Builder/CommandLineBuilderConfiguration.cs
+++ b/source/Cosmos.Build.Builder/CommandLineBuilderConfiguration.cs
@@ -8,10 +8,8 @@ namespace Cosmos.Build.Builder
     {
         public bool NoVsLaunch => GetSwitch();
         public bool UserKit => GetSwitch();
-        public bool ResetHive => GetSwitch();
         public bool StayOpen => GetSwitch();
         public bool NoClean => GetSwitch();
-        public bool VsExpHive => GetSwitch();
         public string VsPath => GetOption();
 
         private Dictionary<string, string> _args;
diff --git a/source/Cosmos.Build.Builder/CosmosTask.cs b/source/Cosmos.Build.Builder/CosmosTask.cs
index 1e3438058..421e1b293 100644
--- a/source/Cosmos.Build.Builder/CosmosTask.cs
+++ b/source/Cosmos.Build.Builder/CosmosTask.cs
@@ -46,13 +46,7 @@ namespace Cosmos.Build.Builder {
     /// <param name="releaseNumber">Release number for the current setup.</param>
     /// <returns>Name of the setup file.</returns>
     public static string GetSetupName(int releaseNumber) {
-      string setupName = $"CosmosUserKit-{releaseNumber}-vs2017";
-
-      if (App.BuilderConfiguration.VsExpHive) {
-        setupName += "Exp";
-      }
-
-      return setupName;
+      return $"CosmosUserKit-{releaseNumber}-vs2017";
     }
 
     private void CleanDirectory(string aName, string aPath) {
@@ -415,10 +409,6 @@ namespace Cosmos.Build.Builder {
       string xCfg = App.BuilderConfiguration.UserKit ? "UserKit" : "DevKit";
       string vsVersionConfiguration = "vs2017";
 
-      // Use configuration which will install to the VS Exp Hive
-      if (App.BuilderConfiguration.VsExpHive) {
-        vsVersionConfiguration += "Exp";
-      }
       Logger.LogMessage($"  {xISCC} /Q {Quoted(mInnoFile)} /dBuildConfiguration={xCfg} /dVSVersion={vsVersionConfiguration} /dChangeSetVersion={Quoted(mReleaseNo.ToString())}");
       StartConsole(xISCC, $"/Q {Quoted(mInnoFile)} /dBuildConfiguration={xCfg} /dVSVersion={vsVersionConfiguration} /dChangeSetVersion={Quoted(mReleaseNo.ToString())}");
     }
@@ -432,11 +422,6 @@ namespace Cosmos.Build.Builder {
         return;
       }
 
-      if (App.BuilderConfiguration.ResetHive) {
-        Logger.LogMessage("Resetting hive");
-        Start(xVisualStudio, @"/setup /rootsuffix Exp /ranu");
-      }
-
       Logger.LogMessage("Launching Visual Studio");
       Start(xVisualStudio, Quoted(mCosmosPath + @"Kernel.sln"), false, true);
     }
diff --git a/source/Cosmos.Build.Builder/IBuilderConfiguration.cs b/source/Cosmos.Build.Builder/IBuilderConfiguration.cs
index dd2eac4b6..4fbbbd383 100644
--- a/source/Cosmos.Build.Builder/IBuilderConfiguration.cs
+++ b/source/Cosmos.Build.Builder/IBuilderConfiguration.cs
@@ -4,10 +4,8 @@
     {
         bool NoVsLaunch { get; }
         bool UserKit { get; }
-        bool ResetHive { get; }
         bool StayOpen { get; }
         bool NoClean { get; }
-        bool VsExpHive { get; }
         string VsPath { get; }
     }
 }