some cleanup and ensure the package file is deleted after install
This commit is contained in:
@@ -50,7 +50,7 @@ namespace Umbraco.Core.Packaging
|
||||
Url = package.Element("url")?.Value,
|
||||
IconUrl = package.Element("iconUrl")?.Value,
|
||||
UmbracoVersion = new Version((int)requirements.Element("major"), (int)requirements.Element("minor"), (int)requirements.Element("patch")),
|
||||
UmbracoVersionRequirementsType = requirements.AttributeValue<string>("type").IsNullOrWhiteSpace() ? RequirementsType.Legacy : Enum<RequirementsType>.Parse(requirements.AttributeValue<string>("type")),
|
||||
UmbracoVersionRequirementsType = requirements.AttributeValue<string>("type").IsNullOrWhiteSpace() ? RequirementsType.Legacy : Enum<RequirementsType>.Parse(requirements.AttributeValue<string>("type"), true),
|
||||
Control = package.Element("control")?.Value,
|
||||
Actions = xml.Root.Element("Actions")?.ToString(SaveOptions.None) ?? "<Actions></Actions>", //take the entire outer xml value
|
||||
Files = xml.Root.Element("files")?.Elements("file")?.Select(CompiledPackageFile.Create).ToList() ?? new List<CompiledPackageFile>(),
|
||||
|
||||
@@ -287,7 +287,6 @@ namespace Umbraco.Web.Editors
|
||||
var model = new LocalPackageInstallModel
|
||||
{
|
||||
PackageGuid = Guid.Parse(packageGuid),
|
||||
//RepositoryGuid = Guid.Parse("65194810-1f85-11dd-bd0b-0800200c9a66"),
|
||||
ZipFileName = fileName
|
||||
};
|
||||
|
||||
@@ -415,7 +414,7 @@ namespace Umbraco.Web.Editors
|
||||
var clientDependencyUpdated = clientDependencyConfig.UpdateVersionNumber(
|
||||
UmbracoVersion.SemanticVersion, DateTime.UtcNow, "yyyyMMdd");
|
||||
|
||||
//fixme: when do we delete the zip file?
|
||||
zipFile.Delete();
|
||||
|
||||
var redirectUrl = "";
|
||||
if (packageInfo.Control.IsNullOrWhiteSpace() == false)
|
||||
@@ -431,7 +430,6 @@ namespace Umbraco.Web.Editors
|
||||
Id = model.Id,
|
||||
ZipFileName = model.ZipFileName,
|
||||
PackageGuid = model.PackageGuid,
|
||||
//RepositoryGuid = model.RepositoryGuid,
|
||||
PostInstallationPath = redirectUrl
|
||||
};
|
||||
|
||||
|
||||
@@ -15,11 +15,6 @@ namespace Umbraco.Web.Models
|
||||
[DataMember(Name = "packageGuid")]
|
||||
public Guid PackageGuid { get; set; }
|
||||
|
||||
////TODO: Do we need this?
|
||||
//[DataMember(Name = "repositoryGuid")]
|
||||
//public Guid RepositoryGuid { get; set; }
|
||||
|
||||
|
||||
[DataMember(Name = "zipFileName")]
|
||||
public string ZipFileName { get; set; }
|
||||
|
||||
|
||||
Reference in New Issue
Block a user