From 20d6a3b4b496dfd61ca2e10b35faa5daa46d6eb3 Mon Sep 17 00:00:00 2001
From: Shannon <sdeminick@gmail.com>
Date: Wed, 16 Jan 2019 01:02:21 +1100
Subject: [PATCH] some cleanup and ensure the package file is deleted after
 install

---
 src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs | 2 +-
 src/Umbraco.Web/Editors/PackageInstallController.cs    | 4 +---
 src/Umbraco.Web/Models/PackageInstallModel.cs          | 5 -----
 3 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs b/src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs
index 4695ccb673..3dee5686ff 100644
--- a/src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs
+++ b/src/Umbraco.Core/Packaging/CompiledPackageXmlParser.cs
@@ -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>(),
diff --git a/src/Umbraco.Web/Editors/PackageInstallController.cs b/src/Umbraco.Web/Editors/PackageInstallController.cs
index 38b75a27f8..2dfb5e12e4 100644
--- a/src/Umbraco.Web/Editors/PackageInstallController.cs
+++ b/src/Umbraco.Web/Editors/PackageInstallController.cs
@@ -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
             };
 
diff --git a/src/Umbraco.Web/Models/PackageInstallModel.cs b/src/Umbraco.Web/Models/PackageInstallModel.cs
index 2decaeb098..1ec7ddd434 100644
--- a/src/Umbraco.Web/Models/PackageInstallModel.cs
+++ b/src/Umbraco.Web/Models/PackageInstallModel.cs
@@ -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; }