Improved Git merge performance of exported files
The exported entries appear now in a deterministic order, which made merges a lot easier.
This commit is contained in:
parent
28db843a3a
commit
bafb325880
@ -160,10 +160,10 @@ public sealed class DataContext : DbContext, IDataContext
|
||||
await JsonSerializer.SerializeAsync(fileStream,
|
||||
new JsonData
|
||||
{
|
||||
Settings = this.Settings.Select(n => n.ToJsonSetting()).ToList(),
|
||||
Sections = this.Sections.Select(n => n.ToJsonSection()).ToList(),
|
||||
TextElements = this.TextElements.Select(n => n.ToJsonTextElement()).ToList(),
|
||||
Translations = this.Translations.Select(n => n.ToJsonTranslation()).ToList(),
|
||||
Settings = this.Settings.OrderBy(n => n.UniqueId).Select(n => n.ToJsonSetting()).ToList(),
|
||||
Sections = this.Sections.OrderBy(n => n.UniqueId).Select(n => n.ToJsonSection()).ToList(),
|
||||
TextElements = this.TextElements.OrderBy(n => n.UniqueId).Select(n => n.ToJsonTextElement()).ToList(),
|
||||
Translations = this.Translations.OrderBy(n => n.UniqueId).Select(n => n.ToJsonTranslation()).ToList(),
|
||||
}, jsonSettings);
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user