From cf895518f2575a3cfc6ce453d0eab13e144cbdf6 Mon Sep 17 00:00:00 2001 From: Roy Date: Thu, 26 Oct 2023 09:49:06 +0300 Subject: Fixed bug in PPC/Eureka Release Step --- .../Azure/Tango.AzureUtils/Database/DatabaseManager.cs | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'Software/Visual_Studio/Azure/Tango.AzureUtils/Database/DatabaseManager.cs') diff --git a/Software/Visual_Studio/Azure/Tango.AzureUtils/Database/DatabaseManager.cs b/Software/Visual_Studio/Azure/Tango.AzureUtils/Database/DatabaseManager.cs index 2ed20e91e..8f250a083 100644 --- a/Software/Visual_Studio/Azure/Tango.AzureUtils/Database/DatabaseManager.cs +++ b/Software/Visual_Studio/Azure/Tango.AzureUtils/Database/DatabaseManager.cs @@ -357,8 +357,9 @@ namespace Tango.AzureUtils.Database using (var db = ObservablesContext.CreateDefault(dataSource)) { - var versions = await db.TangoVersions.Include(x => x.MachineVersion).Where(x => x.Tag == versionTag).ToListAsync(); - versions = versions.Where(x => x.MachineVersion.MachineType == MachineTypes.TS1800).ToList(); + var ts_version_guid = (await db.MachineVersions.ToListAsync()).SingleOrDefault(x => x.MachineType == MachineTypes.TS1800).Guid; + var versions = await db.TangoVersions.Where(x => x.Tag == versionTag).ToListAsync(); + versions = versions.Where(x => x.MachineVersionGuid == ts_version_guid).ToList(); var latest_version = versions.OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault(); return latest_version; } @@ -390,8 +391,9 @@ namespace Tango.AzureUtils.Database using (var db = ObservablesContext.CreateDefault(dataSource)) { - var versions = await db.TangoVersions.Include(x => x.MachineVersion).Where(x => x.Tag == versionTag).ToListAsync(); - versions = versions.Where(x => x.MachineVersion.MachineType == MachineTypes.Eureka).ToList(); + var eureka_version_guid = (await db.MachineVersions.ToListAsync()).SingleOrDefault(x => x.MachineType == MachineTypes.Eureka).Guid; + var versions = await db.TangoVersions.Where(x => x.Tag == versionTag).ToListAsync(); + versions = versions.Where(x => x.MachineVersionGuid == eureka_version_guid).ToList(); var latest_version = versions.OrderByDescending(x => Version.Parse(x.Version)).FirstOrDefault(); return latest_version; } -- cgit v1.3.1