diff options
| author | Roy <Roy.mail.net@gmail.com> | 2022-11-02 04:49:10 +0200 |
|---|---|---|
| committer | Roy <Roy.mail.net@gmail.com> | 2022-11-02 04:49:10 +0200 |
| commit | 992208add11db73cb1ffb48c5ccedb0c883aafd0 (patch) | |
| tree | e8b753bca8f341c105b8b1cb7761e2282a13881e /Software/Visual_Studio/FSE/Tango.FSE.BL | |
| parent | 5ab455fb09c659e92ad4de41ec7472e2b8e48499 (diff) | |
| download | Tango-992208add11db73cb1ffb48c5ccedb0c883aafd0.tar.gz Tango-992208add11db73cb1ffb48c5ccedb0c883aafd0.zip | |
PPC multi version support completed on PPC,FSE,MS,DB.
Diffstat (limited to 'Software/Visual_Studio/FSE/Tango.FSE.BL')
| -rw-r--r-- | Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs | 4 | ||||
| -rw-r--r-- | Software/Visual_Studio/FSE/Tango.FSE.BL/Services/TangoVersionsService.cs | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs index 3ed02b0ac..3b33719d0 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/MachineConfigurationService.cs @@ -70,8 +70,8 @@ namespace Tango.FSE.BL.Services composition.HardwareVersions = db.HardwareVersions.OrderByDescending(x => x.Version).ToList(); //Tags - composition.Tags = db.TangoVersions.Select(x => x.Tag).Distinct().ToList(); - composition.Tags.Insert(0, null); + composition.Tags = db.TangoVersions.Select(x => x.Tag).Where(x => x != null).Distinct().ToList(); + composition.Tags.Insert(0, String.Empty); //Counters var jobRuns = db.JobRuns.Where(x => x.MachineGuid == machineGuid).Select(x => new { x.StartDate, x.EndDate, x.EndPosition }).ToList(); diff --git a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/TangoVersionsService.cs b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/TangoVersionsService.cs index 091fa24d5..32c7b5b04 100644 --- a/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/TangoVersionsService.cs +++ b/Software/Visual_Studio/FSE/Tango.FSE.BL/Services/TangoVersionsService.cs @@ -173,7 +173,7 @@ namespace Tango.FSE.BL.Services private String CreateCachedTangoVersionFileName(TangoVersion version) { - return $"$/TangoVersions/application_package_v{version.Version}.tup"; + return $"$/TangoVersions/application_package_v{version.VersionAndTag}.tup"; } private String CreateCachedFirmwareVersionFileName(TangoVersion version) |