diff --git a/src/Umbraco.Core/Packaging/PackageDefinition.cs b/src/Umbraco.Core/Packaging/PackageDefinition.cs index 345d669b15..ae12a914b3 100644 --- a/src/Umbraco.Core/Packaging/PackageDefinition.cs +++ b/src/Umbraco.Core/Packaging/PackageDefinition.cs @@ -28,7 +28,7 @@ namespace Umbraco.Cms.Core.Packaging public string Name { get; set; } = string.Empty; /// - /// The full path to the package's xml file + /// The full path to the package's XML file. /// [ReadOnly(true)] [DataMember(Name = "packagePath")] @@ -71,12 +71,9 @@ namespace Umbraco.Cms.Core.Packaging public IList DataTypes { get; set; } = new List(); [DataMember(Name = "mediaUdis")] - public IList MediaUdis { get; set; } = Array.Empty(); + public IList MediaUdis { get; set; } = new List(); [DataMember(Name = "mediaLoadChildNodes")] public bool MediaLoadChildNodes { get; set; } - - } - } diff --git a/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs b/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs index 5138a4c630..e09bdf3e18 100644 --- a/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs +++ b/src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs @@ -44,20 +44,29 @@ namespace Umbraco.Cms.Infrastructure.Packaging //make sure the definition is up to date with everything foreach (var x in installationSummary.DataTypesInstalled) packageDefinition.DataTypes.Add(x.Id.ToInvariantString()); + foreach (var x in installationSummary.LanguagesInstalled) packageDefinition.Languages.Add(x.Id.ToInvariantString()); + foreach (var x in installationSummary.DictionaryItemsInstalled) packageDefinition.DictionaryItems.Add(x.Id.ToInvariantString()); + foreach (var x in installationSummary.MacrosInstalled) packageDefinition.Macros.Add(x.Id.ToInvariantString()); + foreach (var x in installationSummary.TemplatesInstalled) packageDefinition.Templates.Add(x.Id.ToInvariantString()); + foreach (var x in installationSummary.DocumentTypesInstalled) packageDefinition.DocumentTypes.Add(x.Id.ToInvariantString()); - foreach (var x in installationSummary.StylesheetsInstalled) - packageDefinition.Stylesheets.Add(x.Id.ToInvariantString()); - var contentInstalled = installationSummary.ContentInstalled.ToList(); - packageDefinition.ContentNodeId = contentInstalled.Count > 0 ? contentInstalled[0].Id.ToInvariantString() : null; + + foreach (var x in installationSummary.MediaTypesInstalled) + packageDefinition.MediaTypes.Add(x.Id.ToInvariantString()); + + packageDefinition.ContentNodeId = installationSummary.ContentInstalled.FirstOrDefault()?.Id.ToInvariantString(); + + foreach (var x in installationSummary.MediaInstalled) + packageDefinition.MediaUdis.Add(x.GetUdi()); return installationSummary; }