Merge branch 'master' of https://twinetfs.visualstudio.com/_git/Tango

1 files changed, 3 insertions, 3 deletions

diff --git a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
index 49521fb1d..9ec234449 100644
--- a/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
+++ b/Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService/MachineStudioUpdateService.svc.cs
@@ -64,7 +64,7 @@ namespace Tango.MachineStudio.UpdateService
 
                     if (user != null && user.HasPermission(Permissions.RunMachineStudio) || (request.Email == "ForceUpdate"))
                     {
-                        var latestVersion = db.MachineStudioVersions.FirstOrDefault();
+                        var latestVersion = db.MachineStudioVersions.ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
                         Version currentVersion = Version.Parse(request.Version);
 
                         if (latestVersion != null && Version.Parse(latestVersion.Version) > currentVersion)
@@ -114,7 +114,7 @@ namespace Tango.MachineStudio.UpdateService
 
                     if (user != null && user.HasPermission(Permissions.PublishMachineStudioVersion))
                     {
-                        var latestVersion = db.MachineStudioVersions.FirstOrDefault();
+                        var latestVersion = db.MachineStudioVersions.ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault();
                         Version currentVersion = Version.Parse(request.Version);
 
                         String newVersionFileName = Path.GetRandomFileName() + ".zip";
@@ -204,7 +204,7 @@ namespace Tango.MachineStudio.UpdateService
             {
                 using (ObservablesContext db = ObservablesContext.CreateDefault(GetServerAddress()))
                 {
-                    return db.MachineStudioVersions.FirstOrDefault().Version;
+                    return db.MachineStudioVersions.ToList().OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault().Version;
                 }
             }
             catch (Exception ex)