Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #3202 from sbwalker/dev

Browse Source 
improve solution related to module installation issue where ModuleDefinition Version property was not being populated correctly (#3175)
This commit is contained in:
Shaun Walker 2023-08-28 15:20:29 -04:00 committed by GitHub
commit 9f859f024c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Oqtane.Server/Repository/ModuleDefinitionRepository.cs
View File

@ -138,14 +138,21 @@ namespace Oqtane.Repository
// sync module assemblies with database
foreach (ModuleDefinition ModuleDefinition in ModuleDefinitions)
{
// manage releaseversions in cases where it was not provided or is lower than the module version
if (string.IsNullOrEmpty(ModuleDefinition.ReleaseVersions) || (!string.IsNullOrEmpty(ModuleDefinition.Version) && Version.Parse(ModuleDefinition.Version).CompareTo(Version.Parse(ModuleDefinition.ReleaseVersions.Split(',').Last())) > 0))
{
ModuleDefinition.ReleaseVersions = ModuleDefinition.Version;
}
ModuleDefinition moduledefinition = moduledefinitions.Where(item => item.ModuleDefinitionName == ModuleDefinition.ModuleDefinitionName).FirstOrDefault();
if (moduledefinition == null)
{
// new module definition
moduledefinition = new ModuleDefinition { ModuleDefinitionName = ModuleDefinition.ModuleDefinitionName, Version = ModuleDefinition.Version };
// new module definition (version is explicitly not set because it is updated as part of module migrations at startup)
moduledefinition = new ModuleDefinition { ModuleDefinitionName = ModuleDefinition.ModuleDefinitionName };
_db.ModuleDefinition.Add(moduledefinition);
_db.SaveChanges();
ModuleDefinition.Version = ""; // ensure migrations are executed during startup for new module installations
ModuleDefinition.Version = "";
}
else
{
@ -158,12 +165,6 @@ namespace Oqtane.Repository
moduledefinitions.Remove(moduledefinition);
}
// manage releaseversions in cases where it was not provided or is lower than the module version
if (string.IsNullOrEmpty(ModuleDefinition.ReleaseVersions) || (!string.IsNullOrEmpty(ModuleDefinition.Version) && Version.Parse(ModuleDefinition.Version).CompareTo(Version.Parse(ModuleDefinition.ReleaseVersions.Split(',').Last())) > 0))
{
ModuleDefinition.ReleaseVersions = ModuleDefinition.Version;
}
// load db properties
ModuleDefinition.ModuleDefinitionId = moduledefinition.ModuleDefinitionId;
ModuleDefinition.CreatedBy = moduledefinition.CreatedBy;