yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

some cleanup

Browse Source
This commit is contained in:
Shannon
2019-01-14 18:03:06 +11:00
parent aa6342cc30
commit b3585b0083
5 changed files with 2 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Packaging/PackageDefinitionXmlParser.cs
View File

@@ -28,7 +28,6 @@ namespace Umbraco.Core.Packaging
{
Id = xml.AttributeValue<int>("id"),
Name = xml.AttributeValue<string>("name") ?? string.Empty,
FolderId = xml.AttributeValue<Guid>("folder"),
PackagePath = xml.AttributeValue<string>("packagePath") ?? string.Empty,
Version = xml.AttributeValue<string>("version") ?? string.Empty,
Url = xml.AttributeValue<string>("url") ?? string.Empty,
@@ -74,7 +73,6 @@ namespace Umbraco.Core.Packaging
new XAttribute("version", def.Version ?? string.Empty),
new XAttribute("url", def.Url ?? string.Empty),
new XAttribute("name", def.Name ?? string.Empty),
new XAttribute("folder", def.FolderId),
new XAttribute("packagePath", def.PackagePath ?? string.Empty),
new XAttribute("iconUrl", def.IconUrl ?? string.Empty),
new XAttribute("umbVersion", def.UmbracoVersion),

4
src/Umbraco.Core/Packaging/PackagesRepository.cs
View File

@@ -131,7 +131,6 @@ namespace Umbraco.Core.Packaging
var newId = maxId + 1;
definition.Id = newId;
definition.PackageId = definition.PackageId == default ? Guid.NewGuid() : definition.PackageId;
definition.FolderId = Guid.NewGuid();
var packageXml = _parser.ToXml(definition);
packagesXml.Root.Add(packageXml);
}
@@ -155,13 +154,12 @@ namespace Umbraco.Core.Packaging
{
if (definition.Id == default) throw new ArgumentException("The package definition does not have an ID, it must be saved before being exported");
if (definition.PackageId == default) throw new ArgumentException("the package definition does not have a GUID, it must be saved before being exported");
if (definition.FolderId == default) throw new ArgumentException("the package definition does not have a folder GUID, it must be saved before being exported");
//ensure it's valid
ValidatePackage(definition);
//Create a folder for building this package
var temporaryPath = IOHelper.MapPath(_tempFolderPath.EnsureEndsWith('/') + definition.FolderId);
var temporaryPath = IOHelper.MapPath(_tempFolderPath.EnsureEndsWith('/') + Guid.NewGuid());
if (Directory.Exists(temporaryPath) == false)
Directory.CreateDirectory(temporaryPath);