Twine Studio: Added build variant to all service requests.

24 files changed, 103 insertions, 17 deletions

diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/BuildProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/BuildProvider.cs
new file mode 100644
index 000000000..ae7c716d2
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/BuildProvider.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Tango.FSE.Web.Messages;
+
+namespace Tango.FSE.BL
+{
+    public static class BuildProvider
+    {
+        public static BuildVariants Build { get; private set; }
+
+        static BuildProvider()
+        {
+#if TS
+            Build = BuildVariants.TwineStudio; 
+#endif
+        }
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServiceBase.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServiceBase.cs
index a73a393e1..8619a1d0c 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServiceBase.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/FSEServiceBase.cs
@@ -15,6 +15,8 @@ namespace Tango.FSE.BL
 {
     public abstract class FSEServiceBase : ExtendedObject, IDisposable
     {
+
+
         [TangoInject]
         protected IAuthenticationService Authentication { get; set; }
 
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/AuthenticationService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/AuthenticationService.cs
index e43ecb4cf..b3c8534f3 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/AuthenticationService.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/AuthenticationService.cs
@@ -148,7 +148,8 @@ namespace Tango.FSE.BL.Services
                 var response = client.SendForgotPasswordEmail(new ForgotPasswordRequest()
                 {
                     Email = email,
-                    MachineServiceAddress = environment.MachineServiceAddress
+                    MachineServiceAddress = environment.MachineServiceAddress,
+                    Build = BuildProvider.Build
                 }).Result;
             });
         }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/BugReportingService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/BugReportingService.cs
index 6e42ed814..b6f9ffff8 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/BugReportingService.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/BugReportingService.cs
@@ -25,7 +25,7 @@ namespace Tango.FSE.BL.Services
                 .ConfigureCascade(DataResolverNode.Online, DataResolverNode.DiskCache)
                 .Online((context) =>
                 {
-                    var response = WebClient.GetBugReportInfo(new BugReportingInfoRequest()).Result;
+                    var response = WebClient.GetBugReportInfo(new BugReportingInfoRequest() { Build = BuildProvider.Build }).Result;
 
                     LogManager.Log("Bug reporting information retrieved successfully. Caching bug reporting information on disk...");
 
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs
index 5254c04d7..1c2337a0b 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/OrganizationsService.cs
@@ -233,7 +233,8 @@ namespace Tango.FSE.BL.Services
                 {
                     UserGuid = userGuid,
                     Password = password,
-                    MachineServiceAddress = Authentication.CurrentEnvironment.MachineServiceAddress
+                    MachineServiceAddress = Authentication.CurrentEnvironment.MachineServiceAddress,
+                    Build = BuildProvider.Build
                 }).Result;
 
             });
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj b/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
index 82fad45e2..34f514c23 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Tango.FSE.BL.csproj
@@ -33,7 +33,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
     <OutputPath>..\..\Build\Twine Studio\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;TS</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -42,8 +42,8 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>..\..\Build\Twine Studio\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <Optimize>false</Optimize>
+    <DefineConstants>TRACE;TS</DefineConstants>
+    <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
     <ErrorReport>prompt</ErrorReport>
@@ -109,6 +109,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AuthorizationException.cs" />
+    <Compile Include="BuildProvider.cs" />
     <Compile Include="CacheEntities\CachedEventType.cs" />
     <Compile Include="CacheEntities\CachedPublishedProcedureProject.cs" />
     <Compile Include="Connectivity\ConnectivityVerificationMethod.cs" />
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Web/FSEWebClientBase.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Web/FSEWebClientBase.cs
index 2151f03d1..3cb9bc170 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Web/FSEWebClientBase.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Web/FSEWebClientBase.cs
@@ -33,6 +33,16 @@ namespace Tango.FSE.BL.Web
         /// <summary>
         /// Initializes a new instance of the <see cref="FSEWebClientBase"/> class.
         /// </summary>
+        /// <param name="address">The service address.</param>
+        /// <param name="controller">The controller name.</param>
+        public FSEWebClientBase(String address, String controller, String token) : base(address, controller, token)
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="FSEWebClientBase"/> class.
+        /// </summary>
         /// <param name="cloned">Other instance.</param>
         public FSEWebClientBase(FSEWebClientBase cloned) : base(cloned)
         {
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs
index f43812d80..45aabf097 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/MainWindowVM.cs
@@ -198,7 +198,7 @@ namespace Tango.FSE.Publisher.UI
                     IsFree = false;
                     UpdateProgress("Getting remote version...");
                     _client = new FSEWebClient(SelectedEnvironment.MachineServiceAddress);
-                    RemoteVersion = (await _client.GetLatestVersion(new Web.Messages.LatestVersionRequest())).Version;
+                    RemoteVersion = (await _client.GetLatestVersion(new Web.Messages.LatestVersionRequest() { Build = BL.BuildProvider.Build })).Version;
                     ProgressReady();
                 }
                 catch (Exception ex)
@@ -246,7 +246,8 @@ namespace Tango.FSE.Publisher.UI
                 {
                     Email = Email,
                     Password = Password,
-                    Version = LocalVersion
+                    Version = LocalVersion,
+                    Build = BL.BuildProvider.Build
                 });
 
                 UpdateProgress("Requesting version upload...");
@@ -254,7 +255,8 @@ namespace Tango.FSE.Publisher.UI
                 {
                     Comments = Comments,
                     InstallerBlobName = installerName,
-                    Version = LocalVersion
+                    Version = LocalVersion,
+                    Build = BL.BuildProvider.Build
                 });
 
                 UpdateProgress("Building Tango FSE installer...");
@@ -283,7 +285,8 @@ namespace Tango.FSE.Publisher.UI
 
                 await _client.NotifyVersionUploadCompleted(new UploadCompletedRequest()
                 {
-                    Token = uploadResponse.Token
+                    Token = uploadResponse.Token,
+                    Build = BL.BuildProvider.Build
                 });
 
                 UpdateProgress("Validating...");
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/Tango.FSE.Publisher.UI.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/Tango.FSE.Publisher.UI.csproj
index daca67b9f..b0bbed270 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/Tango.FSE.Publisher.UI.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Publisher.UI/Tango.FSE.Publisher.UI.csproj
@@ -36,7 +36,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS|AnyCPU'">
     <OutputPath>bin\TS\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;TS</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -46,7 +46,7 @@
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'TS_Debug|AnyCPU'">
     <OutputPath>bin\TS_Debug\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
+    <DefineConstants>TRACE;TS</DefineConstants>
     <Optimize>true</Optimize>
     <DebugType>pdbonly</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs
index f4448569d..0a23f4528 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Authentication/DefaultAuthenticationProvider.cs
@@ -142,6 +142,7 @@ namespace Tango.FSE.UI.Authentication
                         Email = email,
                         Password = password,
                         Version = appVersion,
+                        Build = BuildProvider.Build
 
                     }).Result;
 
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.UI/Updates/DefaultUpdatesManager.cs b/Software/Visual_Studio/FSE/Tango.FSE.UI/Updates/DefaultUpdatesManager.cs
index 5ef4d3adb..13275c2bc 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.UI/Updates/DefaultUpdatesManager.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.UI/Updates/DefaultUpdatesManager.cs
@@ -87,7 +87,8 @@ namespace Tango.FSE.UI.Updates
 
                 var response = await WebClient.CheckForUpdates(new CheckForUpdatesRequest()
                 {
-                    Version = appVersion.ToString()
+                    Version = appVersion.ToString(),
+                    Build = Tango.FSE.BL.BuildProvider.Build
                 });
 
                 LogManager.Log($"Update check response received:\n{response.ToJsonString()}");
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BugReportingInfoRequest.cs b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BugReportingInfoRequest.cs
index ee52e3368..dc22f54c4 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BugReportingInfoRequest.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BugReportingInfoRequest.cs
@@ -9,6 +9,6 @@ namespace Tango.FSE.Web.Messages
 {
     public class BugReportingInfoRequest : WebRequestMessage
     {
-
+        public BuildVariants Build { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BuildVariants.cs b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BuildVariants.cs
new file mode 100644
index 000000000..0c117541d
--- /dev/null
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/BuildVariants.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace Tango.FSE.Web.Messages
+{
+    public enum BuildVariants
+    {
+        FSE,
+        TwineStudio
+    }
+}
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/CheckForUpdatesRequest.cs b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/CheckForUpdatesRequest.cs
index 3cf355292..41a8607f7 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/CheckForUpdatesRequest.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/CheckForUpdatesRequest.cs
@@ -11,5 +11,6 @@ namespace Tango.FSE.Web.Messages
     public class CheckForUpdatesRequest : WebRequestMessage
     {
         public String Version { get; set; }
+        public BuildVariants Build { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/ForgotPasswordRequest.cs b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/ForgotPasswordRequest.cs
index a8ac52123..e2288bcb0 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/ForgotPasswordRequest.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/ForgotPasswordRequest.cs
@@ -11,5 +11,6 @@ namespace Tango.FSE.Web.Messages
     {
         public String Email { get; set; }
         public String MachineServiceAddress { get; set; }
+        public BuildVariants Build { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/LatestVersionRequest.cs b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/LatestVersionRequest.cs
index 8f6117241..fbb47e14f 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/LatestVersionRequest.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/LatestVersionRequest.cs
@@ -10,6 +10,6 @@ namespace Tango.FSE.Web.Messages
 {
     public class LatestVersionRequest : WebRequestMessage
     {
-        
+        public BuildVariants Build { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/LoginRequest.cs b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/LoginRequest.cs
index 6898364ae..37f76b3b7 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/LoginRequest.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/LoginRequest.cs
@@ -12,5 +12,6 @@ namespace Tango.FSE.Web.Messages
         public String Version { get; set; }
         public String Email { get; set; }
         public String Password { get; set; }
+        public BuildVariants Build { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UploadCompletedRequest.cs b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UploadCompletedRequest.cs
index a82ac0083..780643830 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UploadCompletedRequest.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UploadCompletedRequest.cs
@@ -11,5 +11,6 @@ namespace Tango.FSE.Web.Messages
     public class UploadCompletedRequest : WebRequestMessage
     {
         public String Token { get; set; }
+        public BuildVariants Build { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UploadVersionRequest.cs b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UploadVersionRequest.cs
index 01968d249..cd838b707 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UploadVersionRequest.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UploadVersionRequest.cs
@@ -15,5 +15,7 @@ namespace Tango.FSE.Web.Messages
         public String Comments { get; set; }
 
         public String InstallerBlobName { get; set; }
+
+        public BuildVariants Build { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UserInvitationEmailRequest.cs b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UserInvitationEmailRequest.cs
index 23acbb536..e0d65bfa8 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UserInvitationEmailRequest.cs
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Messages/UserInvitationEmailRequest.cs
@@ -12,5 +12,6 @@ namespace Tango.FSE.Web.Messages
         public String UserGuid { get; set; }
         public String Password { get; set; }
         public String MachineServiceAddress { get; set; }
+        public BuildVariants Build { get; set; }
     }
 }
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj b/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj
index f93785c2a..f1b44f747 100644
--- a/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj
+++ b/Software/Visual_Studio/FSE/Tango.FSE.Web/Tango.FSE.Web.csproj
@@ -61,6 +61,7 @@
   <ItemGroup>
     <Compile Include="Messages\BugReportingInfoRequest.cs" />
     <Compile Include="Messages\BugReportingInfoResponse.cs" />
+    <Compile Include="Messages\BuildVariants.cs" />
     <Compile Include="Messages\CheckForUpdatesRequest.cs" />
     <Compile Include="Messages\CheckForUpdatesResponse.cs" />
     <Compile Include="Messages\DownloadTangoVersionRequest.cs" />
diff --git a/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientv2CodeFile.cshtml b/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientv2CodeFile.cshtml
index cfcc89716..ab281d929 100644
--- a/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientv2CodeFile.cshtml
+++ b/Software/Visual_Studio/Tango.CodeGeneration/Templates/TangoWebClientv2CodeFile.cshtml
@@ -35,6 +35,16 @@ namespace @(model.Namespace)
         /// <summary>
         /// Initializes a new instance of the <see cref="@(model.Name)"/> class.
         /// </summary>
+        /// <param name="address">The service address.</param>
+        /// <param name="controller">The controller name.</param>
+        public @(model.Name)(String address, String controller, String token) : base(address, controller, token)
+        {
+
+        }
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="@(model.Name)"/> class.
+        /// </summary>
         /// <param name="cloned">Other instance.</param>
         public @(model.Name)(@(model.Name) cloned) : base(cloned)
         {
diff --git a/Software/Visual_Studio/Tango.FSE.sln b/Software/Visual_Studio/Tango.FSE.sln
index e482a1dd8..230743a66 100644
--- a/Software/Visual_Studio/Tango.FSE.sln
+++ b/Software/Visual_Studio/Tango.FSE.sln
@@ -41,6 +41,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.PPC.Shared", "PPC\Tan
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.DataStore", "DataStore\Tango.DataStore\Tango.DataStore.csproj", "{E0364DFA-0721-4637-9D32-9D22AAC109D6}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Web", "Web", "{A3CC0A72-0DAB-4414-999D-3B89707FDECD}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tango.MachineService", "Web\Tango.MachineService\Tango.MachineService.csproj", "{3F09B230-5AAC-4651-BA7A-19F3BDFCF701}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -177,6 +181,14 @@ Global
 		{E0364DFA-0721-4637-9D32-9D22AAC109D6}.TS_Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E0364DFA-0721-4637-9D32-9D22AAC109D6}.TS|Any CPU.ActiveCfg = Release|Any CPU
 		{E0364DFA-0721-4637-9D32-9D22AAC109D6}.TS|Any CPU.Build.0 = Release|Any CPU
+		{3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.TS_Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.TS_Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.TS|Any CPU.ActiveCfg = Release|Any CPU
+		{3F09B230-5AAC-4651-BA7A-19F3BDFCF701}.TS|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -198,6 +210,7 @@ Global
 		{1754F846-4763-4000-807F-C7BFAA145DB2} = {DBE903D1-1D6C-4B0D-8EB1-CCB447FA1775}
 		{12EC97A5-C3C2-40CB-B658-EC4018B89269} = {DBE903D1-1D6C-4B0D-8EB1-CCB447FA1775}
 		{208C8BD8-72C6-4E3C-ACAA-351091A2ACC7} = {4EDA9CB2-1455-47BC-8507-B5C034E2B986}
+		{3F09B230-5AAC-4651-BA7A-19F3BDFCF701} = {A3CC0A72-0DAB-4414-999D-3B89707FDECD}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {44758539-3458-4A3E-89DD-68F496B34B45}
diff --git a/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Program.cs b/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Program.cs
index d7567d73d..501058016 100644
--- a/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Program.cs
+++ b/Software/Visual_Studio/Utilities/Tango.WebClientGenerator/Program.cs
@@ -17,13 +17,13 @@ namespace Tango.WebClientGenerator
         static void Main(string[] args)
         {
             //Generate PPC client.
-            GenerateWebClient<PPC.Common.Web.LoginRequest, PPC.Common.Web.LoginResponse, MachineService.Controllers.PPCController>("Tango.PPC.Common.Web", "PPCWebClientBase", PathHelper.GetSolutionFolder() + @"\PPC\Tango.PPC.Common\Web");
+            //GenerateWebClient<PPC.Common.Web.LoginRequest, PPC.Common.Web.LoginResponse, MachineService.Controllers.PPCController>("Tango.PPC.Common.Web", "PPCWebClientBase", PathHelper.GetSolutionFolder() + @"\PPC\Tango.PPC.Common\Web");
 
             //Generate Machine Studio client.
             //GenerateWebClient<MachineStudio.Common.Web.LoginRequest, MachineStudio.Common.Web.LoginResponse, MachineService.Controllers.MachineStudioController>("Tango.MachineStudio.Common.Web", "MachineStudioWebClientBase", PathHelper.GetSolutionFolder() + @"\MachineStudio\Tango.MachineStudio.Common\Web");
 
             //Generate FSE client.
-            //GenerateWebClientV2<FSE.Web.Messages.LoginRequest, FSE.Web.Messages.LoginResponse, MachineService.Controllers.FSEController>("Tango.FSE.BL.Web", "FSEWebClientBase", PathHelper.GetSolutionFolder() + @"\FSE\Tango.FSE.BL\Web");
+            GenerateWebClientV2<FSE.Web.Messages.LoginRequest, FSE.Web.Messages.LoginResponse, MachineService.Controllers.FSEController>("Tango.FSE.BL.Web", "FSEWebClientBase", PathHelper.GetSolutionFolder() + @"\FSE\Tango.FSE.BL\Web");
 
             Console.WriteLine("Done");
         }