From cfd58c084a2b489cba0f39e91107a9f4851d5412 Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Mon, 25 Jul 2016 14:57:58 +0200 Subject: [PATCH 1/2] Don't return empty string as description --- src/Paket.Core/PackageMetaData.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Paket.Core/PackageMetaData.fs b/src/Paket.Core/PackageMetaData.fs index 62bc48e938..f2a5ff40a2 100644 --- a/src/Paket.Core/PackageMetaData.fs +++ b/src/Paket.Core/PackageMetaData.fs @@ -61,7 +61,7 @@ let getTitle attributes = let getDescription attributes = attributes - |> Seq.tryPick (function Description d -> Some d | _ -> None) + |> Seq.tryPick (function Description d when notNullOrEmpty d -> Some d | _ -> None) let readAssembly fileName = traceVerbose <| sprintf "Loading assembly metadata for %s" fileName From 0080050589ff38f9a051b6575f0be295e34542bc Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Mon, 25 Jul 2016 15:00:46 +0200 Subject: [PATCH 2/2] Fix error message for missing metadata With this change, the error message will show the merged (template file and assembly infos) metadata, not only the information from the template file. --- src/Paket.Core/PackageProcess.fs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Paket.Core/PackageProcess.fs b/src/Paket.Core/PackageProcess.fs index c10d5411af..bc8950353b 100644 --- a/src/Paket.Core/PackageProcess.fs +++ b/src/Paket.Core/PackageProcess.fs @@ -59,7 +59,7 @@ let private merge buildConfig buildPlatform versionFromAssembly specificVersions failwithf "Incomplete mandatory metadata in template file %s (even including assembly attributes)%sTemplate: %A%sMissing: %s" templateFile.FileName - Environment.NewLine md + Environment.NewLine merged Environment.NewLine missing | Valid completeCore -> { templateFile with Contents = CompleteInfo(completeCore, mergedOpt) }