From 09b1dd03e5d67453e673789fe0826e7a25d881ab Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 24 Sep 2020 22:28:15 +0300
Subject: Allow null user on jobs. Dropped use of any user on PPC.

---
 .../Controllers/PPCController.cs                   | 28 +++-------------------
 1 file changed, 3 insertions(+), 25 deletions(-)

(limited to 'Software/Visual_Studio/Web/Tango.MachineService/Controllers')

diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 22feb29c1..4215cd175 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -507,8 +507,6 @@ namespace Tango.MachineService.Controllers
                 });
             }
 
-            User machineUser = null;
-
             try
             {
                 using (ObservablesContext db = ObservablesContextHelper.CreateContext())
@@ -519,26 +517,6 @@ namespace Tango.MachineService.Controllers
                     {
                         throw new AuthenticationException("The specified machine could not be found.");
                     }
-
-                    machineUser = db.Users.Include(x => x.Contact).SingleOrDefault(x => x.Contact.FirstName == machine.Name);
-
-                    if (machineUser == null)
-                    {
-                        //No machine user then create one.
-                        machineUser = new User();
-                        machineUser.Email = machine.SerialNumber + "@twine-s.com";
-                        machineUser.Password = machine.SerialNumber;
-                        machineUser.OrganizationGuid = machine.OrganizationGuid;
-                        machineUser.Contact = new Contact();
-                        machineUser.Contact.Email = machineUser.Email;
-                        machineUser.Contact.FirstName = machine.Name;
-                        machineUser.Contact.LastName = machine.Name;
-                        machineUser.Contact.FullName = machine.Name;
-                        machineUser.Address = new Address();
-
-                        db.Users.Add(machineUser);
-                        db.SaveChanges();
-                    }
                 }
 
                 //Insert/Replace Jobs.
@@ -551,7 +529,7 @@ namespace Tango.MachineService.Controllers
                             var job = dto.ToObservable();
 
                             job.ID = 0;
-                            job.UserGuid = machineUser.Guid;
+                            job.UserGuid = dto.UserGuid;
                             job.CustomerGuid = null;
                             job.IsSynchronized = true;
 
@@ -589,7 +567,7 @@ namespace Tango.MachineService.Controllers
                         {
                             var run = dto.ToObservable();
                             run.ID = 0;
-                            run.UserGuid = machineUser.Guid;
+                            run.UserGuid = dto.UserGuid;
                             run.IsSynchronized = true;
 
                             if (db.JobRuns.SingleOrDefault(x => x.Guid == run.Guid) == null)
@@ -618,7 +596,7 @@ namespace Tango.MachineService.Controllers
                         {
                             var ev = dto.ToObservable();
                             ev.ID = 0;
-                            ev.UserGuid = machineUser.Guid;
+                            ev.UserGuid = dto.UserGuid;
                             ev.IsSynchronized = true;
 
                             if (db.MachinesEvents.SingleOrDefault(x => x.Guid == ev.Guid) == null)
-- 
cgit v1.3.1


From 17a624c8ddacc1dac4904793645d6c893f7ced77 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Thu, 24 Sep 2020 23:20:25 +0300
Subject: Changed all PPC updated to based on GUID !

---
 Software/DB/Tango.mdf                              | Bin 75497472 -> 75497472 bytes
 Software/DB/Tango_log.ldf                          | Bin 22675456 -> 22675456 bytes
 .../MachineSetup/MachineSetupManager.cs            |   1 -
 .../MachineUpdate/IMachineUpdateManager.cs         |  13 +++---
 .../MachineUpdate/MachineUpdateManager.cs          |  47 +++++++++------------
 .../DefaultMachineDataSynchronizer.cs              |   2 +-
 .../Tango.PPC.Common/Web/CheckForUpdateRequest.cs  |   1 -
 .../Tango.PPC.Common/Web/DownloadUpdateRequest.cs  |   2 +-
 .../PPC/Tango.PPC.Common/Web/LoginRequest.cs       |   1 +
 .../Tango.PPC.Common/Web/MachineSetupRequest.cs    |   1 -
 .../PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs    |   1 -
 .../Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs |   6 +--
 .../Configurations/ProvisionMachine.xml            | Bin 88354 -> 76348 bytes
 .../SQLExaminer/Configurations/UpdateMachine.xml   | Bin 55424 -> 72920 bytes
 .../Controllers/PPCController.cs                   |  10 +++--
 15 files changed, 39 insertions(+), 46 deletions(-)

(limited to 'Software/Visual_Studio/Web/Tango.MachineService/Controllers')

diff --git a/Software/DB/Tango.mdf b/Software/DB/Tango.mdf
index f8c0132fb..aeb06fad3 100644
Binary files a/Software/DB/Tango.mdf and b/Software/DB/Tango.mdf differ
diff --git a/Software/DB/Tango_log.ldf b/Software/DB/Tango_log.ldf
index 5cc378c9f..52724650c 100644
Binary files a/Software/DB/Tango_log.ldf and b/Software/DB/Tango_log.ldf differ
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
index a2a750805..15902f629 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineSetup/MachineSetupManager.cs
@@ -247,7 +247,6 @@ namespace Tango.PPC.Common.MachineSetup
                 }
 
                 MachineSetupRequest request = new MachineSetupRequest();
-                request.SerialNumber = serialNumber;
                 request.DeviceID = await _windows_manager.GetDeviceId();
                 request.DeviceName = deviceName;
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs
index 3e3fbcc27..77646da40 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/IMachineUpdateManager.cs
@@ -38,9 +38,8 @@ namespace Tango.PPC.Common.MachineUpdate
         event EventHandler<MachineUpdateProgress> Progress;
 
         /// <summary>
-        /// Performs a machine update using the specified serial number and machine service address.
+        /// Performs a machine update.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <param name="setupFirmware">if set to <c>true</c> updates the embedded device firmware.</param>
         /// <param name="setupFPGA">if set to <c>true</c> updates the embedded device FPGA version and other parameters.</param>
         /// <returns></returns>
@@ -61,24 +60,22 @@ namespace Tango.PPC.Common.MachineUpdate
         Task UpdateFromTFP(String fileName);
 
         /// <summary>
-        /// Checks if any update are available for the specified machine serial number.
+        /// Checks if any update are available.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <returns></returns>
-        Task<CheckForUpdateResponse> CheckForUpdate(String serialNumber);
+        Task<CheckForUpdateResponse> CheckForUpdate();
 
         /// <summary>
         /// Checks whether it is necessary to updates all the "overwrite-able" database tables.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <returns></returns>
-        Task<DbCompareResult> UpdateDBCheck(String serialNumber);
+        Task<DbCompareResult> UpdateDBCheck();
 
         /// <summary>
         /// Updates all the "overwrite-able" database tables.
         /// </summary>
         /// <returns></returns>
-        Task UpdateDB(DbCompareResult dbCompareResult, String serialNumber);
+        Task UpdateDB(DbCompareResult dbCompareResult);
 
         /// <summary>
         /// Gets the update package file information.
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
index 4f8be0a6e..9b4462a70 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/MachineUpdate/MachineUpdateManager.cs
@@ -148,12 +148,12 @@ namespace Tango.PPC.Common.MachineUpdate
 
         #region Private Methods
 
-        private Task Login(String serialNumber)
+        private Task Login(String machineGuid)
         {
             return _client.Login(new LoginRequest()
             {
                 Mode = LoginMode.Machine,
-                SerialNumber = serialNumber,
+                MachineGuid = machineGuid,
             });
         }
 
@@ -609,9 +609,8 @@ namespace Tango.PPC.Common.MachineUpdate
         #region Public Methods
 
         /// <summary>
-        /// Performs a machine update using the specified serial number and machine service address.
+        /// Performs a machine update.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <param name="setupFirmware">if set to <c>true</c> updates the embedded device firmware.</param>
         /// <param name="setupFPGA">if set to <c>true</c> updates the embedded device FPGA version and other parameters.</param>
         /// <returns></returns>
@@ -638,7 +637,7 @@ namespace Tango.PPC.Common.MachineUpdate
             var _newPackageTempFolder = TemporaryManager.CreateFolder();
             _newPackageTempFolder.Persist = true;
 
-            String serialNumber = _machineProvider.Machine.SerialNumber;
+            String machineGuid = _machineProvider.Machine.Guid;
 
             try
             {
@@ -646,7 +645,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 var machineServiceAddress = _settings.GetMachineServiceAddress();
 
-                LogManager.Log($"Starting machine update for serial number {serialNumber}...");
+                LogManager.Log($"Starting machine update...");
 
                 //Connecting to machine...
                 LogManager.Log("Verifying machine connection and state...");
@@ -677,10 +676,9 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                await Login(serialNumber);
+                await Login(machineGuid);
 
                 DownloadUpdateRequest request = new DownloadUpdateRequest();
-                request.SerialNumber = serialNumber;
 
                 update_response = await _client.MachineUpdate(request);
 
@@ -804,7 +802,7 @@ namespace Tango.PPC.Common.MachineUpdate
                     Path.Combine(_newPackageTempFolder, "Update Scripts"),
                         update_response.DataSource,
                         localDataSource,
-                        serialNumber);
+                        machineGuid);
 
                 runner.Log += (x, msg) =>
                 {
@@ -894,12 +892,11 @@ namespace Tango.PPC.Common.MachineUpdate
         }
 
         /// <summary>
-        /// Checks if any update are available for the specified machine serial number.
+        /// Checks if any update are available for the specified machine.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <param name="machineServiceAddress">The machine service address.</param>
         /// <returns></returns>
-        public Task<CheckForUpdateResponse> CheckForUpdate(string serialNumber)
+        public Task<CheckForUpdateResponse> CheckForUpdate()
         {
             return Task.Factory.StartNew<CheckForUpdateResponse>(() =>
             {
@@ -909,12 +906,13 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                Login(serialNumber).GetAwaiter().GetResult();
+                String machineGuid = _machineProvider.Machine.Guid;
+
+                Login(machineGuid).GetAwaiter().GetResult();
 
                 LogManager.Log($"Checking if updates available...");
 
                 CheckForUpdateRequest request = new CheckForUpdateRequest();
-                request.SerialNumber = serialNumber;
                 request.Version = _app_manager.Version.ToString();
                 request.FirmwareVersion = _app_manager.FirmwareVersion?.ToString();
 
@@ -950,10 +948,9 @@ namespace Tango.PPC.Common.MachineUpdate
         /// <summary>
         /// Updates all the "overwrite-able" database tables.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <param name="machineServiceAddress">The machine service address.</param>
         /// <returns></returns>
-        public Task UpdateDB(DbCompareResult dbCompareResult, String serialNumber)
+        public Task UpdateDB(DbCompareResult dbCompareResult)
         {
             _updateStartDate = DateTime.UtcNow;
             _logs.Clear();
@@ -1034,7 +1031,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                         if (item.RequiresSerialNumber)
                         {
-                            builder.SetMachineSerialNumber(serialNumber);
+                            builder.SetMachineSerialNumber(_machineProvider.Machine.Guid);
                         }
 
                         builder.Synchronize();
@@ -1081,16 +1078,15 @@ namespace Tango.PPC.Common.MachineUpdate
         /// <summary>
         /// Checks whether it is necessary to updates all the "overwrite-able" database tables.
         /// </summary>
-        /// <param name="serialNumber">The serial number.</param>
         /// <param name="machineServiceAddress">The machine service address.</param>
         /// <returns></returns>
-        public Task<DbCompareResult> UpdateDBCheck(string serialNumber)
+        public Task<DbCompareResult> UpdateDBCheck()
         {
             return Task.Factory.StartNew<DbCompareResult>(() =>
             {
                 var machineServiceAddress = _settings.GetMachineServiceAddress();
 
-                LogManager.Log($"Checking if database update is required for serial number {serialNumber}...");
+                LogManager.Log($"Checking if database update is required...");
 
                 LogManager.Log("Looking for update scripts configuration on application path...");
 
@@ -1103,10 +1099,9 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 LogManager.Log($"Connecting to machine service on {machineServiceAddress}...");
 
-                Login(serialNumber).Wait();
+                Login(_machineProvider.Machine.Guid).Wait();
 
                 UpdateDBRequest request = new UpdateDBRequest();
-                request.SerialNumber = serialNumber;
                 request.ApplicationVersion = _app_manager.Version.ToString();
                 request.FirmwareVersion = _app_manager.FirmwareVersion.ToString();
 
@@ -1137,7 +1132,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                     if (item.RequiresSerialNumber)
                     {
-                        builder.SetMachineSerialNumber(serialNumber);
+                        builder.SetMachineSerialNumber(_machineProvider.Machine.Guid);
                     }
 
                     var config = builder.Build();
@@ -1227,7 +1222,7 @@ namespace Tango.PPC.Common.MachineUpdate
             {
                 _isUpdating = true;
 
-                LogManager.Log($"Starting machine update for serial number {serialNumber}...");
+                LogManager.Log($"Starting machine update (TUP) for serial number {serialNumber}...");
 
                 //Connecting to machine...
                 LogManager.Log("Verifying machine connection and state...");
@@ -1368,7 +1363,7 @@ namespace Tango.PPC.Common.MachineUpdate
                     Path.Combine(_newPackageTempFolder, "Update Scripts"),
                         tempDbDataSource,
                         localDataSource,
-                        serialNumber);
+                        _machineProvider.Machine.Guid);
 
                 runner.Log += (x, msg) =>
                 {
@@ -1661,7 +1656,7 @@ namespace Tango.PPC.Common.MachineUpdate
 
                 try
                 {
-                    var response = await CheckForUpdate(_machineProvider.Machine.SerialNumber);
+                    var response = await CheckForUpdate();
                     if (response.IsUpdateAvailable || response.IsDatabaseUpdateAvailable)
                     {
                         LogManager.Log($"New {(response.IsDatabaseUpdateAvailable ? "database updates" : "application version")} detected ({response.Version}). Raising event...");
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
index ab1f8e890..645ddbdf5 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Synchronization/DefaultMachineDataSynchronizer.cs
@@ -452,7 +452,7 @@ namespace Tango.PPC.Common.Synchronization
                     await this.client.Login(new LoginRequest()
                     {
                         Mode = LoginMode.Machine,
-                        SerialNumber = _machineProvider.Machine.SerialNumber,
+                        MachineGuid = _machineProvider.Machine.Guid,
                     });
                 }
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs
index a93b30a59..8e13ea7c4 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/CheckForUpdateRequest.cs
@@ -9,7 +9,6 @@ namespace Tango.PPC.Common.Web
 {
     public class CheckForUpdateRequest : WebRequestMessage
     {
-        public String SerialNumber { get; set; }
         public String Version { get; set; }
         public String FirmwareVersion { get; set; }
 
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs
index a32d3d497..db4080dff 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/DownloadUpdateRequest.cs
@@ -9,6 +9,6 @@ namespace Tango.PPC.Common.Web
 {
     public class DownloadUpdateRequest : WebRequestMessage
     {
-        public String SerialNumber { get; set; }
+        
     }
 }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LoginRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LoginRequest.cs
index f8588f6b0..9ae0d65ae 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LoginRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/LoginRequest.cs
@@ -11,6 +11,7 @@ namespace Tango.PPC.Common.Web
     {
         public LoginMode Mode { get; set; }
         public String SerialNumber { get; set; }
+        public String MachineGuid { get; set; }
         public String Email { get; set; }
         public String Password { get; set; }
     }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs
index 821828a48..a9e68df36 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/MachineSetupRequest.cs
@@ -9,7 +9,6 @@ namespace Tango.PPC.Common.Web
 {
     public class MachineSetupRequest : WebRequestMessage
     {
-        public String SerialNumber { get; set; }
         public String DeviceID { get; set; }
         public String DeviceName { get; set; }
     }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs
index c78f6199e..4d8433a56 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.Common/Web/UpdateDBRequest.cs
@@ -9,7 +9,6 @@ namespace Tango.PPC.Common.Web
 {
     public class UpdateDBRequest : WebRequestMessage
     {
-        public String SerialNumber { get; set; }
         public String ApplicationVersion { get; set; }
         public String FirmwareVersion { get; set; }
     }
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
index d4d78dac6..23ec956a0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/ViewModels/MachineUpdateViewVM.cs
@@ -167,7 +167,7 @@ namespace Tango.PPC.UI.ViewModels
                     return;
                 }
 
-                var response = await MachineUpdateManager.CheckForUpdate(MachineProvider.Machine.SerialNumber);
+                var response = await MachineUpdateManager.CheckForUpdate();
 
                 try
                 {
@@ -208,7 +208,7 @@ namespace Tango.PPC.UI.ViewModels
                 }
                 else
                 {
-                    _db_compare_result = await MachineUpdateManager.UpdateDBCheck(MachineProvider.Machine.SerialNumber);
+                    _db_compare_result = await MachineUpdateManager.UpdateDBCheck();
 
                     if (_db_compare_result.RequiresUpdate)
                     {
@@ -261,7 +261,7 @@ namespace Tango.PPC.UI.ViewModels
 
                 try
                 {
-                    await MachineUpdateManager.UpdateDB(_db_compare_result, MachineProvider.Machine.SerialNumber);
+                    await MachineUpdateManager.UpdateDB(_db_compare_result);
                     LogManager.Log("Database update completed.");
                     await NavigateTo(MachineUpdateView.UpdateCompletedView);
                 }
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml
index 8f60372b0..f3b845010 100644
Binary files a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml and b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/ProvisionMachine.xml differ
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml
index 540b4cad9..260448394 100644
Binary files a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml and b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml differ
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 4215cd175..601438d67 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -390,7 +390,11 @@ namespace Tango.MachineService.Controllers
                     if (hasDatabaseUpdates)
                     {
                         response.IsDatabaseUpdateAvailable = true;
-                        response.UpdateDBResponse = UpdateDB(new UpdateDBRequest() { SerialNumber = request.SerialNumber });
+                        response.UpdateDBResponse = UpdateDB(new UpdateDBRequest()
+                        {
+                            ApplicationVersion = request.Version,
+                            FirmwareVersion = request.FirmwareVersion
+                        });
                     }
 
                     //Compare database
@@ -937,11 +941,11 @@ namespace Tango.MachineService.Controllers
                 }
                 else if (request.Mode == LoginMode.Machine)
                 {
-                    var machine = db.Machines.SingleOrDefault(x => x.SerialNumber == request.SerialNumber);
+                    var machine = db.Machines.SingleOrDefault(x => x.SerialNumber == request.SerialNumber || x.Guid == request.MachineGuid);
 
                     if (machine == null)
                     {
-                        throw new AuthenticationException("Invalid serial number.");
+                        throw new AuthenticationException("Invalid machine serial number or id.");
                     }
 
                     response.AccessToken = WebToken<TokenObject>.CreateNew(MachineServiceConfig.JWT_TOKEN_SECRET, new TokenObject()
-- 
cgit v1.3.1


From 73d68112321587add7e22d89175fd1f12c34c6d1 Mon Sep 17 00:00:00 2001
From: Roy Ben Shabat <Roy.mail.net@gmail.com>
Date: Fri, 25 Sep 2020 04:04:52 +0300
Subject: Improved Auth2 package and tested. Dropped "Stack trace not provided"
 message from TangoController. Retained job user round-trip from MS.

---
 .../PPC Installer-cache/cacheIndex.txt             | Bin 52 -> 52 bytes
 .../Advanced Installer Projects/PPC Installer.aip  | 125 +++++++++++++--------
 .../Views/MachineJobSelectionView.xaml             |   2 +-
 .../PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs    |   2 +-
 .../Visual_Studio/PPC/Tango.PPC.UI/app.manifest    |   2 +-
 .../Tango.PPC.Packages.Auth2/Auth2.cs              |  37 +++++-
 .../Tango.PPC.Packages.Auth2.csproj                |   4 +
 .../SQLExaminer/Configurations/UpdateMachine.xml   | Bin 72920 -> 77930 bytes
 .../Tango.Web/Controllers/TangoController.cs       |   2 +-
 .../Controllers/PPCController.cs                   |   4 +-
 .../Properties/AssemblyInfo.cs                     |   2 +-
 11 files changed, 119 insertions(+), 61 deletions(-)

(limited to 'Software/Visual_Studio/Web/Tango.MachineService/Controllers')

diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt
index a603ff06b..5fe5afe5a 100644
Binary files a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt and b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer-cache/cacheIndex.txt differ
diff --git a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip
index d1e783e61..7cd6c02b1 100644
--- a/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip	
+++ b/Software/Visual_Studio/Advanced Installer Projects/PPC Installer.aip	
@@ -18,10 +18,10 @@
     <ROW Property="ARPNOREPAIR" Value="1" MultiBuildValue="DefaultBuild:1"/>
     <ROW Property="ARPSYSTEMCOMPONENT" Value="1"/>
     <ROW Property="Manufacturer" Value="Twine"/>
-    <ROW Property="ProductCode" Value="1033:{8A3B9B38-2FC2-48EE-8EA4-36BB1B29F214} " Type="16"/>
+    <ROW Property="ProductCode" Value="1033:{89DF366A-2C79-4626-BA98-249E464D5997} " Type="16"/>
     <ROW Property="ProductLanguage" Value="1033"/>
     <ROW Property="ProductName" Value="Tango"/>
-    <ROW Property="ProductVersion" Value="1.1.28.0" Type="32"/>
+    <ROW Property="ProductVersion" Value="1.2.0.0" Type="32"/>
     <ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
     <ROW Property="UpgradeCode" Value="{F8EAB8B4-FD57-45B7-8307-D52DF760273D}"/>
     <ROW Property="WindowsType9X" MultiBuildValue="DefaultBuild:Windows 9x/ME" ValueLocId="-"/>
@@ -73,7 +73,9 @@
     <ROW Component="DocumentFormat.OpenXml.dll" ComponentId="{DF22F9D3-CEF7-4D41-8D0D-1D45C509376E}" Directory_="APPDIR" Attributes="0" KeyPath="DocumentFormat.OpenXml.dll"/>
     <ROW Component="EFCache.dll" ComponentId="{E15AE519-6E9A-4860-AE1B-36A611A2ACC2}" Directory_="APPDIR" Attributes="0" KeyPath="EFCache.dll"/>
     <ROW Component="EntityFramework.SqlServer.dll" ComponentId="{38839FC0-3C26-4FF6-B4F7-83CE250C9BA2}" Directory_="APPDIR" Attributes="0" KeyPath="EntityFramework.SqlServer.dll"/>
+    <ROW Component="EntityFramework.SqlServer.dll_1" ComponentId="{618EF41C-2BB3-4EFB-87D5-6218117DA04B}" Directory_="Packages_Dir" Attributes="0" KeyPath="EntityFramework.SqlServer.dll_1"/>
     <ROW Component="EntityFramework.dll" ComponentId="{84E4D21B-268D-488B-B890-EC2958C2FFBC}" Directory_="APPDIR" Attributes="0" KeyPath="EntityFramework.dll"/>
+    <ROW Component="EntityFramework.dll_1" ComponentId="{BEAA311D-850A-4779-8BB6-CEF1F36296F8}" Directory_="Packages_Dir" Attributes="0" KeyPath="EntityFramework.dll_1"/>
     <ROW Component="FluentFTP.dll" ComponentId="{212CBAE7-9A31-46CD-AA9C-2585FB7EC2E5}" Directory_="APPDIR" Attributes="0" KeyPath="FluentFTP.dll"/>
     <ROW Component="FontAwesome.WPF.dll" ComponentId="{303DB9BF-511C-4AAB-8DD9-C0B773679FFF}" Directory_="APPDIR" Attributes="0" KeyPath="FontAwesome.WPF.dll"/>
     <ROW Component="Google.Protobuf.dll" ComponentId="{974E6663-6A5F-4596-A2A1-BBD1B21850E8}" Directory_="APPDIR" Attributes="0" KeyPath="Google.Protobuf.dll"/>
@@ -156,7 +158,6 @@
     <ROW Component="System.Reactive.Interfaces.dll" ComponentId="{C23DD172-ACE0-4811-90D6-0C2F38B2C27E}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Interfaces.dll"/>
     <ROW Component="System.Reactive.Linq.dll" ComponentId="{572F229C-22E6-4934-BDB9-68600F354F67}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.Linq.dll"/>
     <ROW Component="System.Reactive.PlatformServices.dll" ComponentId="{84B191EA-72B0-4FA8-B352-AEF6BBD48F31}" Directory_="APPDIR" Attributes="0" KeyPath="System.Reactive.PlatformServices.dll"/>
-    <ROW Component="System.Spatial.dll" ComponentId="{5E31D7A5-2EC5-409E-B8F4-999D1349D46C}" Directory_="APPDIR" Attributes="0" KeyPath="System.Spatial.dll"/>
     <ROW Component="System.Web.Http.WebHost.dll" ComponentId="{9F1DD6B2-3514-4C62-AACA-EE7368ECB36B}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.WebHost.dll"/>
     <ROW Component="System.Web.Http.dll" ComponentId="{0ABCDC64-DE4A-4994-B4C8-3B0146F68F09}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Http.dll"/>
     <ROW Component="System.Web.Razor.dll" ComponentId="{231E534C-FAF8-41DD-A21F-B5CACF6AB05F}" Directory_="APPDIR" Attributes="0" KeyPath="System.Web.Razor.dll"/>
@@ -164,6 +165,7 @@
     <ROW Component="Tango.AdvancedInstaller.dll" ComponentId="{5C51256D-50D1-46F5-A44F-73AF2E63EAF5}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.AdvancedInstaller.dll"/>
     <ROW Component="Tango.AnimatedGif.dll" ComponentId="{2DCBEDC8-EDA7-4C90-8852-39E0B13DABF7}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.AnimatedGif.dll"/>
     <ROW Component="Tango.BL.dll" ComponentId="{56D29CF3-E600-48A5-BF55-045EEE7CFDC6}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.BL.dll"/>
+    <ROW Component="Tango.BL.dll_1" ComponentId="{CA63BB8F-8EF2-4DF9-A796-6D546B0F5FCE}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.BL.dll_1"/>
     <ROW Component="Tango.CSV.dll" ComponentId="{7980426F-EE8B-472C-A2E5-D5E09258E1B1}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.CSV.dll"/>
     <ROW Component="Tango.CodeGeneration.dll" ComponentId="{7BE2B8CB-E5B7-435B-A585-C49EB042E9EB}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.CodeGeneration.dll"/>
     <ROW Component="Tango.ColorConversion.dll" ComponentId="{A7FB8123-03C9-41A1-AEFE-1516E5A04224}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.ColorConversion.dll"/>
@@ -194,12 +196,14 @@
     <ROW Component="Tango.PPC.Jobs.dll" ComponentId="{33A3CD47-B643-4119-804A-814A7FACF534}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.Jobs.dll"/>
     <ROW Component="Tango.PPC.MachineSettings.dll" ComponentId="{1FD6EEEA-0DE3-4ED2-A3BB-033E5F0E1F4D}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.MachineSettings.dll"/>
     <ROW Component="Tango.PPC.Maintenance.dll" ComponentId="{F5E90747-F99F-493B-8CA5-0929FBE77C13}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.Maintenance.dll"/>
+    <ROW Component="Tango.PPC.Packages.Auth2.dll" ComponentId="{9D638EFF-9BDF-4903-AFB5-8015EB34B6F2}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.Auth2.dll"/>
     <ROW Component="Tango.PPC.Packages.CefInstaller.dll" ComponentId="{EB7A5008-6488-43B7-97E1-3B6E43315BBB}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.CefInstaller.dll"/>
     <ROW Component="Tango.PPC.Packages.JobRunsStartTimePatch.dll" ComponentId="{F680010B-E063-428A-84C7-1FEB9E253502}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.JobRunsStartTimePatch.dll"/>
     <ROW Component="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" ComponentId="{B588371F-F16E-495E-83EC-CA7089242B07}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" Type="0"/>
     <ROW Component="Tango.PPC.Packages.SamplePostPackage.dll" ComponentId="{B5384C95-9D5A-48EE-A938-DBFE32FC2E25}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.SamplePostPackage.dll"/>
     <ROW Component="Tango.PPC.Packages.SamplePrePackage.dll" ComponentId="{30CD58AB-F4B9-4690-8962-DCBAB4DD059D}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Packages.SamplePrePackage.dll"/>
     <ROW Component="Tango.PPC.Shared.dll" ComponentId="{AA769313-AC05-4C33-A72C-43CF04DF6EBD}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.Shared.dll"/>
+    <ROW Component="Tango.PPC.Shared.dll_1" ComponentId="{79B609E5-FDCC-4169-ACB7-84A1503DFF2A}" Directory_="Packages_Dir" Attributes="0" KeyPath="Tango.PPC.Shared.dll_1"/>
     <ROW Component="Tango.PPC.Storage.dll" ComponentId="{5FDB1CE0-A29E-44F9-83E2-AD7A5FC7DF22}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.Storage.dll"/>
     <ROW Component="Tango.PPC.Technician.dll" ComponentId="{B96E96EB-9E0A-49D1-A8E5-E2989E81F142}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.Technician.dll"/>
     <ROW Component="Tango.PPC.UI.exe" ComponentId="{ABCBFD0F-3957-42AF-A7E5-931A097E4814}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.PPC.UI.exe"/>
@@ -221,26 +225,28 @@
     <ROW Component="Tango.WiFi.dll" ComponentId="{8082C9BD-5BDB-4C52-BCA6-E8604D4D232B}" Directory_="APPDIR" Attributes="0" KeyPath="Tango.WiFi.dll"/>
     <ROW Component="WebRtc.NET.dll" ComponentId="{11563A6C-E1FC-4578-8BDD-8A8C30677126}" Directory_="APPDIR" Attributes="0" KeyPath="WebRtc.NET.dll"/>
     <ROW Component="WindowsInput.dll" ComponentId="{916884AD-CD7D-4AB0-8B3B-A2205ACFBDF4}" Directory_="APPDIR" Attributes="0" KeyPath="WindowsInput.dll"/>
-    <ROW Component="alpine.3.9x64" ComponentId="{6DB3E93E-4406-4753-9B30-B5508B69711B}" Directory_="alpine.3.9x64_Dir" Attributes="0"/>
-    <ROW Component="alpinex64" ComponentId="{E3E5F0FF-FAFF-4BCF-B878-BD465B954890}" Directory_="alpinex64_Dir" Attributes="0"/>
-    <ROW Component="debian.9x64" ComponentId="{59ABDB75-49D6-4451-9D77-49E82530328C}" Directory_="debian.9x64_Dir" Attributes="0"/>
-    <ROW Component="debianarm64" ComponentId="{39F06D97-1FA0-4FFF-B628-6ECAB11464EC}" Directory_="debianarm64_Dir" Attributes="0"/>
-    <ROW Component="fedorax64" ComponentId="{56ED5509-080A-4368-AE7F-CC89B74D216A}" Directory_="fedorax64_Dir" Attributes="0"/>
-    <ROW Component="linuxx64" ComponentId="{735AEA61-2DCA-4D1B-8B6E-354A32A3B9D6}" Directory_="linuxx64_Dir" Attributes="0"/>
+    <ROW Component="git2106a5f2.dll" ComponentId="{3FE9C608-F478-4E38-898A-160256F0207A}" Directory_="x64_Dir" Attributes="256" KeyPath="git2106a5f2.dll"/>
+    <ROW Component="git2106a5f2.dll_1" ComponentId="{034CC49B-B60E-454A-9643-18180F3D7D0E}" Directory_="x86_Dir" Attributes="0" KeyPath="git2106a5f2.dll_1"/>
+    <ROW Component="libgit2106a5f2.dylib" ComponentId="{7F920851-4EC7-4DF7-B150-61CDB649EB3F}" Directory_="osx_Dir" Attributes="0" KeyPath="libgit2106a5f2.dylib" Type="0"/>
+    <ROW Component="libgit2106a5f2.so" ComponentId="{A767A633-DB48-42D4-ABEE-A8A578F95EC4}" Directory_="alpinex64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_1" ComponentId="{316FC4F2-3D64-4777-A62D-7D06C4C6FF8F}" Directory_="alpine.3.9x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_1" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_2" ComponentId="{7F5E08CD-38C5-4B15-B06B-19976D817463}" Directory_="debianarm64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_2" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_3" ComponentId="{3C3270C3-3155-4C87-9508-3DA75A04B567}" Directory_="debian.9x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_3" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_4" ComponentId="{C8ECEF88-EF7E-41CD-B096-63A127E8EA86}" Directory_="fedorax64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_4" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_5" ComponentId="{AF241129-A015-49D0-8235-1DC392831CBF}" Directory_="linuxx64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_5" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_6" ComponentId="{3631727D-7F4D-4790-B843-A22D9A7ACD8A}" Directory_="rhelx64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_6" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_7" ComponentId="{DADA6055-E0A4-40CF-A68B-9539D7B5F3DE}" Directory_="ubuntu.16.04arm64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_7" Type="0"/>
+    <ROW Component="libgit2106a5f2.so_8" ComponentId="{EC200D68-EA0F-4188-A631-5D0FAA7B529B}" Directory_="ubuntu.18.04x64_Dir" Attributes="0" KeyPath="libgit2106a5f2.so_8" Type="0"/>
     <ROW Component="mscoree.dll" ComponentId="{85F439D0-8FD0-4B99-888D-336C7A125E3D}" Directory_="APPDIR" Attributes="0" KeyPath="mscoree.dll"/>
     <ROW Component="msvcp140d.dll" ComponentId="{69E32675-9ACF-4C23-A495-300B78913B66}" Directory_="APPDIR" Attributes="0" KeyPath="msvcp140d.dll"/>
-    <ROW Component="osx" ComponentId="{C9425955-B858-4319-B6B3-93005A0A76B5}" Directory_="osx_Dir" Attributes="0"/>
     <ROW Component="protobufnet.dll" ComponentId="{163F1E17-6462-4ABE-BC86-E055F7690139}" Directory_="APPDIR" Attributes="0" KeyPath="protobufnet.dll"/>
-    <ROW Component="rhelx64" ComponentId="{E98FE073-E117-46A9-89FF-FEB7A3BC77C2}" Directory_="rhelx64_Dir" Attributes="0"/>
-    <ROW Component="ubuntu.16.04arm64" ComponentId="{7B04535E-413D-47FE-B3E2-4B65DD78F6C0}" Directory_="ubuntu.16.04arm64_Dir" Attributes="0"/>
-    <ROW Component="ubuntu.18.04x64" ComponentId="{2E6C0775-C1D6-4FBE-B1C4-374769E84B01}" Directory_="ubuntu.18.04x64_Dir" Attributes="0"/>
+    <ROW Component="turbojpeg.dll" ComponentId="{A46C81B7-627E-4493-8AAE-071A649795BD}" Directory_="win7x64_Dir" Attributes="256" KeyPath="turbojpeg.dll"/>
+    <ROW Component="turbojpeg.dll.meta" ComponentId="{D02BE769-2478-40E5-87F6-72F9118F1F66}" Directory_="win7x64_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta" Type="0"/>
+    <ROW Component="turbojpeg.dll.meta_1" ComponentId="{2E34E404-D1CB-4367-B793-B979811AA003}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll.meta_1" Type="0"/>
+    <ROW Component="turbojpeg.dll_1" ComponentId="{A1261149-D64C-43FD-902A-6F9A36BA420C}" Directory_="win7x86_Dir" Attributes="0" KeyPath="turbojpeg.dll_1"/>
     <ROW Component="ucrtbased.dll" ComponentId="{B8D025EA-CD16-4EE7-A3E7-713E2BE82BF3}" Directory_="APPDIR" Attributes="0" KeyPath="ucrtbased.dll"/>
     <ROW Component="vcruntime140.dll" ComponentId="{144594CC-D19B-45E4-A420-7A1BBB122EE3}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140.dll"/>
     <ROW Component="vcruntime140d.dll" ComponentId="{7653420C-C6C3-4F31-97E8-D6DE417D3DF2}" Directory_="APPDIR" Attributes="0" KeyPath="vcruntime140d.dll"/>
-    <ROW Component="win7x64" ComponentId="{20905EE5-E632-4244-8A37-EBBEFE9D125C}" Directory_="win7x64_Dir" Attributes="0"/>
-    <ROW Component="win7x86" ComponentId="{9E360B32-0E79-48FD-8007-AA9092F9F3A4}" Directory_="win7x86_Dir" Attributes="0"/>
-    <ROW Component="x64" ComponentId="{E9796616-E412-4356-A6F7-C5413418C2FE}" Directory_="x64_Dir" Attributes="0"/>
-    <ROW Component="x86" ComponentId="{029008D6-F96C-47DC-9199-FAF06A70527E}" Directory_="x86_Dir" Attributes="0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
     <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0"/>
@@ -312,7 +318,6 @@
     <ROW File="System.Reactive.Interfaces.dll" Component_="System.Reactive.Interfaces.dll" FileName="SYSTEM~8.DLL|System.Reactive.Interfaces.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Reactive.Interfaces.dll" SelfReg="false"/>
     <ROW File="System.Reactive.Linq.dll" Component_="System.Reactive.Linq.dll" FileName="SYSTEM~9.DLL|System.Reactive.Linq.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Reactive.Linq.dll" SelfReg="false"/>
     <ROW File="System.Reactive.PlatformServices.dll" Component_="System.Reactive.PlatformServices.dll" FileName="SYSTE~10.DLL|System.Reactive.PlatformServices.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Reactive.PlatformServices.dll" SelfReg="false"/>
-    <ROW File="System.Spatial.dll" Component_="System.Spatial.dll" FileName="SYSTE~11.DLL|System.Spatial.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Spatial.dll" SelfReg="false"/>
     <ROW File="System.Web.Http.dll" Component_="System.Web.Http.dll" FileName="SYSTE~12.DLL|System.Web.Http.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Web.Http.dll" SelfReg="false"/>
     <ROW File="System.Web.Http.WebHost.dll" Component_="System.Web.Http.WebHost.dll" FileName="SYSTE~13.DLL|System.Web.Http.WebHost.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Web.Http.WebHost.dll" SelfReg="false"/>
     <ROW File="System.Windows.Interactivity.dll" Component_="System.Windows.Interactivity.dll" FileName="SYSTE~14.DLL|System.Windows.Interactivity.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\System.Windows.Interactivity.dll" SelfReg="false"/>
@@ -502,6 +507,38 @@
     <ROW File="LibGit2Sharp.pdb" Component_="LibGit2Sharp.dll" FileName="LIBGIT~1.PDB|LibGit2Sharp.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\LibGit2Sharp.pdb" SelfReg="false"/>
     <ROW File="Tango.Git.dll" Component_="Tango.Git.dll" FileName="TANGOG~1.DLL|Tango.Git.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Git.dll" SelfReg="false"/>
     <ROW File="Tango.Git.pdb" Component_="Tango.Git.dll" FileName="TANGOG~1.PDB|Tango.Git.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Tango.Git.pdb" SelfReg="false"/>
+    <ROW File="libgit2106a5f2.so" Component_="libgit2106a5f2.so" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\alpine-x64\libgit2-106a5f2.so" SelfReg="false"/>
+    <ROW File="libgit2106a5f2.so_1" Component_="libgit2106a5f2.so_1" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\alpine.3.9-x64\libgit2-106a5f2.so" SelfReg="false"/>
+    <ROW File="libgit2106a5f2.so_2" Component_="libgit2106a5f2.so_2" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\debian-arm64\libgit2-106a5f2.so" SelfReg="false"/>
+    <ROW File="libgit2106a5f2.so_3" Component_="libgit2106a5f2.so_3" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\debian.9-x64\libgit2-106a5f2.so" SelfReg="false"/>
+    <ROW File="libgit2106a5f2.so_4" Component_="libgit2106a5f2.so_4" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\fedora-x64\libgit2-106a5f2.so" SelfReg="false"/>
+    <ROW File="libgit2106a5f2.so_5" Component_="libgit2106a5f2.so_5" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\linux-x64\libgit2-106a5f2.so" SelfReg="false"/>
+    <ROW File="libgit2106a5f2.dylib" Component_="libgit2106a5f2.dylib" FileName="LIBGIT~1.DYL|libgit2-106a5f2.dylib" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\osx\libgit2-106a5f2.dylib" SelfReg="false"/>
+    <ROW File="libgit2106a5f2.so_6" Component_="libgit2106a5f2.so_6" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\rhel-x64\libgit2-106a5f2.so" SelfReg="false"/>
+    <ROW File="libgit2106a5f2.so_7" Component_="libgit2106a5f2.so_7" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\ubuntu.16.04-arm64\libgit2-106a5f2.so" SelfReg="false"/>
+    <ROW File="libgit2106a5f2.so_8" Component_="libgit2106a5f2.so_8" FileName="LIBGIT~1.SO|libgit2-106a5f2.so" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\ubuntu.18.04-x64\libgit2-106a5f2.so" SelfReg="false"/>
+    <ROW File="git2106a5f2.dll" Component_="git2106a5f2.dll" FileName="GIT2-1~1.DLL|git2-106a5f2.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\win32\x64\git2-106a5f2.dll" SelfReg="false"/>
+    <ROW File="git2106a5f2.pdb" Component_="git2106a5f2.dll" FileName="GIT2-1~1.PDB|git2-106a5f2.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\win32\x64\git2-106a5f2.pdb" SelfReg="false"/>
+    <ROW File="git2106a5f2.dll_1" Component_="git2106a5f2.dll_1" FileName="GIT2-1~1.DLL|git2-106a5f2.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\win32\x86\git2-106a5f2.dll" SelfReg="false"/>
+    <ROW File="git2106a5f2.pdb_1" Component_="git2106a5f2.dll_1" FileName="GIT2-1~1.PDB|git2-106a5f2.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\lib\win32\x86\git2-106a5f2.pdb" SelfReg="false"/>
+    <ROW File="LibGit2Sharp.dll.config" Component_="CommandLine.xml" FileName="LIBGIT~1.CON|LibGit2Sharp.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\LibGit2Sharp.dll.config" SelfReg="false"/>
+    <ROW File="EntityFramework.dll_1" Component_="EntityFramework.dll_1" FileName="ENTITY~1.DLL|EntityFramework.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\EntityFramework.dll" SelfReg="false"/>
+    <ROW File="EntityFramework.SqlServer.dll_1" Component_="EntityFramework.SqlServer.dll_1" FileName="ENTITY~2.DLL|EntityFramework.SqlServer.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\EntityFramework.SqlServer.dll" SelfReg="false"/>
+    <ROW File="EntityFramework.SqlServer.xml" Component_="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" FileName="ENTITY~1.XML|EntityFramework.SqlServer.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\EntityFramework.SqlServer.xml" SelfReg="false"/>
+    <ROW File="EntityFramework.xml" Component_="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" FileName="ENTITY~2.XML|EntityFramework.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\EntityFramework.xml" SelfReg="false"/>
+    <ROW File="Tango.BL.dll_1" Component_="Tango.BL.dll_1" FileName="TANGOB~1.DLL|Tango.BL.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.BL.dll" SelfReg="false"/>
+    <ROW File="Tango.BL.dll.config_1" Component_="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" FileName="TANGOB~1.CON|Tango.BL.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.BL.dll.config" SelfReg="false"/>
+    <ROW File="Tango.BL.pdb_1" Component_="Tango.BL.dll_1" FileName="TANGOB~1.PDB|Tango.BL.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.BL.pdb" SelfReg="false"/>
+    <ROW File="Tango.PPC.Packages.Auth2.dll" Component_="Tango.PPC.Packages.Auth2.dll" FileName="TANGOP~5.DLL|Tango.PPC.Packages.Auth2.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.Auth2.dll" SelfReg="false"/>
+    <ROW File="Tango.PPC.Packages.Auth2.dll.config" Component_="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" FileName="TANGOP~2.CON|Tango.PPC.Packages.Auth2.dll.config" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.Auth2.dll.config" SelfReg="false"/>
+    <ROW File="Tango.PPC.Packages.Auth2.pdb" Component_="Tango.PPC.Packages.Auth2.dll" FileName="TANGOP~5.PDB|Tango.PPC.Packages.Auth2.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Packages.Auth2.pdb" SelfReg="false"/>
+    <ROW File="Tango.PPC.Shared.dll_1" Component_="Tango.PPC.Shared.dll_1" FileName="TANGOP~6.DLL|Tango.PPC.Shared.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Shared.dll" SelfReg="false"/>
+    <ROW File="Tango.PPC.Shared.pdb_1" Component_="Tango.PPC.Shared.dll_1" FileName="TANGOP~6.PDB|Tango.PPC.Shared.pdb" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Shared.pdb" SelfReg="false"/>
+    <ROW File="Tango.PPC.Shared.xml" Component_="Tango.PPC.Packages.JobRunsStartTimePatch.dll.config" FileName="TANGOP~1.XML|Tango.PPC.Shared.xml" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\Packages\Tango.PPC.Shared.xml" SelfReg="false"/>
+    <ROW File="turbojpeg.dll" Component_="turbojpeg.dll" FileName="TURBOJ~1.DLL|turbojpeg.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x64\turbojpeg.dll" SelfReg="false"/>
+    <ROW File="turbojpeg.dll.meta" Component_="turbojpeg.dll.meta" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x64\turbojpeg.dll.meta" SelfReg="false"/>
+    <ROW File="turbojpeg.dll_1" Component_="turbojpeg.dll_1" FileName="TURBOJ~1.DLL|turbojpeg.dll" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x86\turbojpeg.dll" SelfReg="false"/>
+    <ROW File="turbojpeg.dll.meta_1" Component_="turbojpeg.dll.meta_1" FileName="TURBOJ~1.MET|turbojpeg.dll.meta" Version="65535.65535.65535.65535" Attributes="0" SourcePath="..\Build\PPC\Release\win7-x86\turbojpeg.dll.meta" SelfReg="false"/>
     <ATTRIBUTE name="DontAddFileAttributes" value="true"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
@@ -511,7 +548,7 @@
     <ROW Action="AI_DetectSoftware" Sequence="101"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer v1.0.3" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.1.28"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" PackageFolder="..\Build\Installers\PPC" PackageFileName="PPC Installer_v1.2.0" Languages="en" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" UseLargeSchema="true" ExeName="PPC Installer_v1.2.0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
     <ROW Path="&lt;AI_DICTS&gt;ui.ail"/>
@@ -579,20 +616,6 @@
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCreateFolderComponent">
     <ROW Directory_="SHORTCUTDIR" Component_="SHORTCUTDIR" ManualDelete="false"/>
     <ROW Directory_="APPDIR" Component_="APPDIR" ManualDelete="true"/>
-    <ROW Directory_="alpinex64_Dir" Component_="alpinex64" ManualDelete="false"/>
-    <ROW Directory_="alpine.3.9x64_Dir" Component_="alpine.3.9x64" ManualDelete="false"/>
-    <ROW Directory_="debianarm64_Dir" Component_="debianarm64" ManualDelete="false"/>
-    <ROW Directory_="debian.9x64_Dir" Component_="debian.9x64" ManualDelete="false"/>
-    <ROW Directory_="fedorax64_Dir" Component_="fedorax64" ManualDelete="false"/>
-    <ROW Directory_="linuxx64_Dir" Component_="linuxx64" ManualDelete="false"/>
-    <ROW Directory_="osx_Dir" Component_="osx" ManualDelete="false"/>
-    <ROW Directory_="rhelx64_Dir" Component_="rhelx64" ManualDelete="false"/>
-    <ROW Directory_="ubuntu.16.04arm64_Dir" Component_="ubuntu.16.04arm64" ManualDelete="false"/>
-    <ROW Directory_="ubuntu.18.04x64_Dir" Component_="ubuntu.18.04x64" ManualDelete="false"/>
-    <ROW Directory_="x64_Dir" Component_="x64" ManualDelete="false"/>
-    <ROW Directory_="x86_Dir" Component_="x86" ManualDelete="false"/>
-    <ROW Directory_="win7x64_Dir" Component_="win7x64" ManualDelete="false"/>
-    <ROW Directory_="win7x86_Dir" Component_="win7x86" ManualDelete="false"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCustActComponent">
     <ROW Action="AI_BACKUP_AI_SETUPEXEPATH" Type="51" Source="AI_SETUPEXEPATH_ORIGINAL" Target="[AI_SETUPEXEPATH]"/>
@@ -707,7 +730,6 @@
     <ROW Feature_="MainFeature" Component_="System.Reactive.Interfaces.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Reactive.Linq.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Reactive.PlatformServices.dll"/>
-    <ROW Feature_="MainFeature" Component_="System.Spatial.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Web.Http.WebHost.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Web.Http.dll"/>
     <ROW Feature_="MainFeature" Component_="System.Web.Razor.dll"/>
@@ -791,20 +813,27 @@
     <ROW Feature_="MainFeature" Component_="Tango.Insights.dll"/>
     <ROW Feature_="MainFeature" Component_="LibGit2Sharp.dll"/>
     <ROW Feature_="MainFeature" Component_="Tango.Git.dll"/>
-    <ROW Feature_="MainFeature" Component_="alpinex64"/>
-    <ROW Feature_="MainFeature" Component_="alpine.3.9x64"/>
-    <ROW Feature_="MainFeature" Component_="debianarm64"/>
-    <ROW Feature_="MainFeature" Component_="debian.9x64"/>
-    <ROW Feature_="MainFeature" Component_="fedorax64"/>
-    <ROW Feature_="MainFeature" Component_="linuxx64"/>
-    <ROW Feature_="MainFeature" Component_="osx"/>
-    <ROW Feature_="MainFeature" Component_="rhelx64"/>
-    <ROW Feature_="MainFeature" Component_="ubuntu.16.04arm64"/>
-    <ROW Feature_="MainFeature" Component_="ubuntu.18.04x64"/>
-    <ROW Feature_="MainFeature" Component_="x64"/>
-    <ROW Feature_="MainFeature" Component_="x86"/>
-    <ROW Feature_="MainFeature" Component_="win7x64"/>
-    <ROW Feature_="MainFeature" Component_="win7x86"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_1"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_2"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_3"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_4"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_5"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.dylib"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_6"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_7"/>
+    <ROW Feature_="MainFeature" Component_="libgit2106a5f2.so_8"/>
+    <ROW Feature_="MainFeature" Component_="git2106a5f2.dll"/>
+    <ROW Feature_="MainFeature" Component_="git2106a5f2.dll_1"/>
+    <ROW Feature_="MainFeature" Component_="EntityFramework.dll_1"/>
+    <ROW Feature_="MainFeature" Component_="EntityFramework.SqlServer.dll_1"/>
+    <ROW Feature_="MainFeature" Component_="Tango.BL.dll_1"/>
+    <ROW Feature_="MainFeature" Component_="Tango.PPC.Packages.Auth2.dll"/>
+    <ROW Feature_="MainFeature" Component_="Tango.PPC.Shared.dll_1"/>
+    <ROW Feature_="MainFeature" Component_="turbojpeg.dll"/>
+    <ROW Feature_="MainFeature" Component_="turbojpeg.dll.meta"/>
+    <ROW Feature_="MainFeature" Component_="turbojpeg.dll_1"/>
+    <ROW Feature_="MainFeature" Component_="turbojpeg.dll.meta_1"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstExSeqComponent">
     <ROW Action="AI_STORE_LOCATION" Condition="(Not Installed) OR REINSTALL" Sequence="1502"/>
diff --git a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
index c7e1d4130..a3d2dbd68 100644
--- a/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
+++ b/Software/Visual_Studio/MachineStudio/Modules/Tango.MachineStudio.Developer/Views/MachineJobSelectionView.xaml
@@ -193,7 +193,7 @@
                                         <DataGridTemplateColumn Header="CREATED BY" Width="100" CanUserSort="True" SortMemberPath="User.Contact.FirstName">
                                             <DataGridTemplateColumn.CellTemplate>
                                                 <DataTemplate>
-                                                    <TextBlock Text="{Binding User.Contact.FirstName,TargetNullValue='N/A',FallbackValue='N/A'}" VerticalAlignment="Center" FontSize="14"></TextBlock>
+                                                    <TextBlock Text="{Binding User.Contact.FirstName,TargetNullValue='PPC',FallbackValue='PPC'}" VerticalAlignment="Center" FontSize="14"></TextBlock>
                                                 </DataTemplate>
                                             </DataGridTemplateColumn.CellTemplate>
                                         </DataGridTemplateColumn>
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
index de58aa679..b95219ad0 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/Properties/AssemblyInfo.cs
@@ -8,4 +8,4 @@ using System.Windows;
 // set of attributes. Change these attribute values to modify the information
 // associated with an assembly.
 [assembly: AssemblyTitle("Tango PPC Application")]
-[assembly: AssemblyVersion("1.1.28.0")]
+[assembly: AssemblyVersion("1.2.3.0")]
diff --git a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
index efc5f8179..d72e75011 100644
--- a/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
+++ b/Software/Visual_Studio/PPC/Tango.PPC.UI/app.manifest
@@ -16,7 +16,7 @@
             Remove this element if your application requires this virtualization for backwards
             compatibility.
         -->
-        <!--<requestedExecutionLevel level="requireAdministrator" uiAccess="false" />-->
+        <requestedExecutionLevel level="requireAdministrator" uiAccess="false" />
       </requestedPrivileges>
     </security>
   </trustInfo>
diff --git a/Software/Visual_Studio/PPC/UpdatePackages/Tango.PPC.Packages.Auth2/Auth2.cs b/Software/Visual_Studio/PPC/UpdatePackages/Tango.PPC.Packages.Auth2/Auth2.cs
index c27391d90..6ba278511 100644
--- a/Software/Visual_Studio/PPC/UpdatePackages/Tango.PPC.Packages.Auth2/Auth2.cs
+++ b/Software/Visual_Studio/PPC/UpdatePackages/Tango.PPC.Packages.Auth2/Auth2.cs
@@ -2,6 +2,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Text;
+using System.Threading;
 using System.Threading.Tasks;
 using Tango.BL;
 using Tango.Core;
@@ -10,7 +11,7 @@ using Tango.PPC.Shared.Updates;
 
 namespace Tango.PPC.Packages.Auth2
 {
-    [PPCPackage(PackageType.Pre, "Auth 2", false)]
+    [PPCPackage(PackageType.Pre, "Applying Auth2 Patch", false)]
     public class Auth2 : ExtendedObject, IPPCPackage
     {
         public Task Run(PackageContext context)
@@ -23,23 +24,49 @@ namespace Tango.PPC.Packages.Auth2
                 {
                     using (var transaction = db.Database.BeginTransaction())
                     {
-                        LogManager.Log("Removing all users...");
-                        context.ReportProgress("Modifying users...");
-                        db.Database.ExecuteSqlCommand("DELETE FROM USERS");
-
                         LogManager.Log("Setting all jobs users to null...");
                         context.ReportProgress("Modifying jobs...");
                         db.Database.ExecuteSqlCommand("ALTER TABLE JOBS ALTER COLUMN USER_GUID VARCHAR(36) NULL");
                         db.Database.ExecuteSqlCommand("UPDATE JOBS SET USER_GUID = NULL");
 
+                        Thread.Sleep(1000);
+
                         LogManager.Log("Setting all job runs users to null...");
                         context.ReportProgress("Modifying job runs...");
                         db.Database.ExecuteSqlCommand("UPDATE JOB_RUNS SET USER_GUID = NULL");
 
+                        Thread.Sleep(1000);
+
                         LogManager.Log("Setting all events users to null...");
                         context.ReportProgress("Modifying events...");
                         db.Database.ExecuteSqlCommand("UPDATE MACHINES_EVENTS SET USER_GUID = NULL");
 
+                        Thread.Sleep(1000);
+
+                        LogManager.Log("Removing all users...");
+                        context.ReportProgress("Modifying users...");
+                        db.Database.ExecuteSqlCommand("DELETE FROM USERS");
+
+                        Thread.Sleep(1000);
+
+                        LogManager.Log("Removing redundant addresses...");
+                        context.ReportProgress("Modifying addresses...");
+                        db.Database.ExecuteSqlCommand(@"
+DELETE ADDRESSES FROM ADDRESSES
+FULL JOIN ORGANIZATIONS ON ORGANIZATIONS.ADDRESS_GUID = ADDRESSES.GUID
+WHERE ORGANIZATIONS.ADDRESS_GUID IS NULL");
+
+                        Thread.Sleep(1000);
+
+                        LogManager.Log("Removing redundant contacts...");
+                        context.ReportProgress("Modifying contacts...");
+                        db.Database.ExecuteSqlCommand(@"
+DELETE CONTACTS FROM CONTACTS
+FULL JOIN ORGANIZATIONS ON ORGANIZATIONS.CONTACT_GUID = CONTACTS.GUID
+WHERE ORGANIZATIONS.CONTACT_GUID IS NULL");
+
+                        Thread.Sleep(1000);
+
                         LogManager.Log("Committing transaction...");
                         context.ReportProgress("Committing transaction...");
                         transaction.Commit();
diff --git a/Software/Visual_Studio/PPC/UpdatePackages/Tango.PPC.Packages.Auth2/Tango.PPC.Packages.Auth2.csproj b/Software/Visual_Studio/PPC/UpdatePackages/Tango.PPC.Packages.Auth2/Tango.PPC.Packages.Auth2.csproj
index 721c61654..bd91c2b60 100644
--- a/Software/Visual_Studio/PPC/UpdatePackages/Tango.PPC.Packages.Auth2/Tango.PPC.Packages.Auth2.csproj
+++ b/Software/Visual_Studio/PPC/UpdatePackages/Tango.PPC.Packages.Auth2/Tango.PPC.Packages.Auth2.csproj
@@ -33,9 +33,11 @@
   <ItemGroup>
     <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\EntityFramework.6.2.0\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+      <Private>False</Private>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
@@ -55,6 +57,7 @@
     <ProjectReference Include="..\..\..\Tango.BL\Tango.BL.csproj">
       <Project>{F441FEEE-322A-4943-B566-110E12FD3B72}</Project>
       <Name>Tango.BL</Name>
+      <Private>False</Private>
     </ProjectReference>
     <ProjectReference Include="..\..\..\Tango.Core\Tango.Core.csproj">
       <Project>{A34EE0F0-649D-41C8-8489-B6F1CC6924EE}</Project>
@@ -74,6 +77,7 @@
     <ProjectReference Include="..\..\Tango.PPC.Shared\Tango.PPC.Shared.csproj">
       <Project>{208c8bd8-72c6-4e3c-acaa-351091a2acc7}</Project>
       <Name>Tango.PPC.Shared</Name>
+      <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
diff --git a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml
index 260448394..b70bc1ff4 100644
Binary files a/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml and b/Software/Visual_Studio/Tango.SQLExaminer/SQLExaminer/Configurations/UpdateMachine.xml differ
diff --git a/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs b/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs
index 3fd3d469e..b3df0373e 100644
--- a/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs
+++ b/Software/Visual_Studio/Tango.Web/Controllers/TangoController.cs
@@ -84,7 +84,7 @@ namespace Tango.Web.Controllers
 
                     if (expandedExceptionValues != null)
                     {
-                        expandedExceptionValues["StackTrace"] = "StackTrace not provided.";
+                        expandedExceptionValues["StackTrace"] = "";
                     }
                 }
 #endif
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
index 601438d67..2c1c27f52 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Controllers/PPCController.cs
@@ -533,7 +533,6 @@ namespace Tango.MachineService.Controllers
                             var job = dto.ToObservable();
 
                             job.ID = 0;
-                            job.UserGuid = dto.UserGuid;
                             job.CustomerGuid = null;
                             job.IsSynchronized = true;
 
@@ -546,6 +545,7 @@ namespace Tango.MachineService.Controllers
                             }
                             else if (job.LastUpdated > existingJob.LastUpdated)
                             {
+                                job.UserGuid = existingJob.UserGuid;
                                 existingJob.Delete(db);
                                 db.Jobs.Add(job);
                                 db.SaveChanges();
@@ -571,7 +571,6 @@ namespace Tango.MachineService.Controllers
                         {
                             var run = dto.ToObservable();
                             run.ID = 0;
-                            run.UserGuid = dto.UserGuid;
                             run.IsSynchronized = true;
 
                             if (db.JobRuns.SingleOrDefault(x => x.Guid == run.Guid) == null)
@@ -600,7 +599,6 @@ namespace Tango.MachineService.Controllers
                         {
                             var ev = dto.ToObservable();
                             ev.ID = 0;
-                            ev.UserGuid = dto.UserGuid;
                             ev.IsSynchronized = true;
 
                             if (db.MachinesEvents.SingleOrDefault(x => x.Guid == ev.Guid) == null)
diff --git a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
index efa53fcdd..11c9ee72a 100644
--- a/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
+++ b/Software/Visual_Studio/Web/Tango.MachineService/Properties/AssemblyInfo.cs
@@ -24,4 +24,4 @@ using System.Runtime.InteropServices;
 //
 // You can specify all the values or you can default the Revision and Build Numbers
 // by using the '*' as shown below:
-[assembly: AssemblyVersion("3.0.4.0")]
+[assembly: AssemblyVersion("3.0.5.0")]
-- 
cgit v1.3.1