Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Resolve compatibility conflicts after multi-host merge #3991

Merged
merged 1 commit into from
Jan 2, 2024
Merged

Resolve compatibility conflicts after multi-host merge #3991

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion Netkan/Model/Metadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
using CKAN.Versioning;
using CKAN.NetKAN.Extensions;
using CKAN.NetKAN.Transformers;
using CKAN.NetKAN.Services;

namespace CKAN.NetKAN.Model
{
Expand Down Expand Up @@ -155,7 +156,12 @@ private static JObject MergeJson(JObject[] jsons)
}
first.Merge(other, mergeSettings);
}
first[DownloadPropertyName] = JArray.FromObject(downloads);
// Merge game version compatibility
ModuleService.ApplyVersions(first, null, null, null);
// Only generate array if multiple URLs
first[DownloadPropertyName] = downloads.Length == 1
? downloads.First()
: JArray.FromObject(downloads);
return first;
}

Expand Down
Loading