Skip to content

Commit 8b853b1

Browse files
Include installed media to package definition on install
1 parent c2a1844 commit 8b853b1

File tree

2 files changed

+15
-9
lines changed

2 files changed

+15
-9
lines changed

src/Umbraco.Core/Packaging/PackageDefinition.cs

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public class PackageDefinition
2828
public string Name { get; set; } = string.Empty;
2929

3030
/// <summary>
31-
/// The full path to the package's xml file
31+
/// The full path to the package's XML file.
3232
/// </summary>
3333
[ReadOnly(true)]
3434
[DataMember(Name = "packagePath")]
@@ -71,12 +71,9 @@ public class PackageDefinition
7171
public IList<string> DataTypes { get; set; } = new List<string>();
7272

7373
[DataMember(Name = "mediaUdis")]
74-
public IList<GuidUdi> MediaUdis { get; set; } = Array.Empty<GuidUdi>();
74+
public IList<GuidUdi> MediaUdis { get; set; } = new List<GuidUdi>();
7575

7676
[DataMember(Name = "mediaLoadChildNodes")]
7777
public bool MediaLoadChildNodes { get; set; }
78-
79-
8078
}
81-
8279
}

src/Umbraco.Infrastructure/Packaging/PackageInstallation.cs

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -44,20 +44,29 @@ public InstallationSummary InstallPackageData(CompiledPackage compiledPackage, i
4444
//make sure the definition is up to date with everything
4545
foreach (var x in installationSummary.DataTypesInstalled)
4646
packageDefinition.DataTypes.Add(x.Id.ToInvariantString());
47+
4748
foreach (var x in installationSummary.LanguagesInstalled)
4849
packageDefinition.Languages.Add(x.Id.ToInvariantString());
50+
4951
foreach (var x in installationSummary.DictionaryItemsInstalled)
5052
packageDefinition.DictionaryItems.Add(x.Id.ToInvariantString());
53+
5154
foreach (var x in installationSummary.MacrosInstalled)
5255
packageDefinition.Macros.Add(x.Id.ToInvariantString());
56+
5357
foreach (var x in installationSummary.TemplatesInstalled)
5458
packageDefinition.Templates.Add(x.Id.ToInvariantString());
59+
5560
foreach (var x in installationSummary.DocumentTypesInstalled)
5661
packageDefinition.DocumentTypes.Add(x.Id.ToInvariantString());
57-
foreach (var x in installationSummary.StylesheetsInstalled)
58-
packageDefinition.Stylesheets.Add(x.Id.ToInvariantString());
59-
var contentInstalled = installationSummary.ContentInstalled.ToList();
60-
packageDefinition.ContentNodeId = contentInstalled.Count > 0 ? contentInstalled[0].Id.ToInvariantString() : null;
62+
63+
foreach (var x in installationSummary.MediaTypesInstalled)
64+
packageDefinition.MediaTypes.Add(x.Id.ToInvariantString());
65+
66+
packageDefinition.ContentNodeId = installationSummary.ContentInstalled.FirstOrDefault()?.Id.ToInvariantString();
67+
68+
foreach (var x in installationSummary.MediaInstalled)
69+
packageDefinition.MediaUdis.Add(x.GetUdi());
6170

6271
return installationSummary;
6372
}

0 commit comments

Comments
 (0)