From 0b804fd5df94b66c6be119660581ab3978d31d59 Mon Sep 17 00:00:00 2001 From: Roy Ben-Shabat Date: Wed, 4 Jul 2018 11:58:10 +0300 Subject: Fixed issue with machine studio update service version sorting. Added about dialog to machine studio with version information. Fixed issue with Stubs UI installer. Stubs UI v3.1 Machine Studio v1.0.0.10 --- .../MachineStudioUpdateService.svc.cs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'Software/Visual_Studio/MachineStudio/Tango.MachineStudio.UpdateService') 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) -- cgit v1.3.1