From 9830c561b9d809b9c584630640621e240e3a3908 Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Wed, 15 Jun 2016 17:52:27 +0200 Subject: [PATCH 1/3] Don't allow empty description --- 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 06464263ac..feb5a7d7ef 100644 --- a/src/Paket.Core/PackageProcess.fs +++ b/src/Paket.Core/PackageProcess.fs @@ -53,7 +53,7 @@ let private merge buildConfig buildPlatform versionFromAssembly specificVersions [ if merged.Id = None then yield "Id" if merged.Version = None then yield "Version" if merged.Authors = None || merged.Authors = Some [] then yield "Authors" - if merged.Description = None then yield "Description" ] + if merged.Description = None || merged.Description = Some "" then yield "Description" ] |> fun xs -> String.Join(", ",xs) failwithf From 8567a352b666d796e387ed1a7bf77d7551bc524d Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Wed, 15 Jun 2016 17:58:28 +0200 Subject: [PATCH 2/3] Don't return empty string as author --- src/Paket.Core/PackageMetaData.fs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Paket.Core/PackageMetaData.fs b/src/Paket.Core/PackageMetaData.fs index e5493336de..0bfa9f7b20 100644 --- a/src/Paket.Core/PackageMetaData.fs +++ b/src/Paket.Core/PackageMetaData.fs @@ -49,8 +49,8 @@ let getVersion versionFromAssembly attributes = let getAuthors attributes = attributes - |> Seq.tryPick (function Company a -> Some a | _ -> None) - |> Option.map (fun a -> + |> Seq.tryPick (function Company a when notNullOrEmpty a -> Some a | _ -> None) + |> Option.map (fun a -> a.Split(',') |> Array.map (fun s -> s.Trim()) |> List.ofArray) From 08b7d3bea4dc6767702b8a5df331eba209afa50d Mon Sep 17 00:00:00 2001 From: Ilja Nosik Date: Mon, 13 Jun 2016 19:12:33 +0200 Subject: [PATCH 3/3] Add missing metadata to integration tests --- .../before/PaketBug/paket.templatetemplate | 1 + .../before/PaketBug/paket.templatetemplate | 1 + .../before/PaketBug/paket.templatetemplate | 1 + .../before/PaketBug/paket.templatetemplate | 1 + .../before/PaketBug/paket.templatetemplate | 1 + .../before/PaketBug2/paket.templatetemplate | 1 + .../before/PaketBug/paket.templatetemplate | 1 + .../before/PaketBug2/paket.templatetemplate | 1 + .../i001429-pack-deps/before/PaketBug/paket.templatetemplate | 1 + .../i001429-pack-deps/before/PaketBug2/paket.templatetemplate | 1 + .../before/PaketBug/paket.templatetemplate | 1 + .../before/PaketBug2/paket.templatetemplate | 1 + .../scenarios/i001594-pack/before/paket.templatetemplate | 2 ++ 13 files changed, 14 insertions(+) diff --git a/integrationtests/scenarios/i001234-missing-assemblyname/before/PaketBug/paket.templatetemplate b/integrationtests/scenarios/i001234-missing-assemblyname/before/PaketBug/paket.templatetemplate index 732a71cf78..242eae2770 100644 --- a/integrationtests/scenarios/i001234-missing-assemblyname/before/PaketBug/paket.templatetemplate +++ b/integrationtests/scenarios/i001234-missing-assemblyname/before/PaketBug/paket.templatetemplate @@ -2,3 +2,4 @@ type project description Silly empty demo project +authors Paket team diff --git a/integrationtests/scenarios/i001375-pack-specific/before/PaketBug/paket.templatetemplate b/integrationtests/scenarios/i001375-pack-specific/before/PaketBug/paket.templatetemplate index 595dbf5ec8..9bc014634b 100644 --- a/integrationtests/scenarios/i001375-pack-specific/before/PaketBug/paket.templatetemplate +++ b/integrationtests/scenarios/i001375-pack-specific/before/PaketBug/paket.templatetemplate @@ -2,3 +2,4 @@ type project id PaketBug description Silly empty demo project +authors Paket team diff --git a/integrationtests/scenarios/i001376-pack-template-plus/before/PaketBug/paket.templatetemplate b/integrationtests/scenarios/i001376-pack-template-plus/before/PaketBug/paket.templatetemplate index 60cb0ad48e..d52daba43e 100644 --- a/integrationtests/scenarios/i001376-pack-template-plus/before/PaketBug/paket.templatetemplate +++ b/integrationtests/scenarios/i001376-pack-template-plus/before/PaketBug/paket.templatetemplate @@ -2,5 +2,6 @@ type project id PaketBug description Silly empty demo project +authors Paket team files paket.references => content/net45+net451 diff --git a/integrationtests/scenarios/i001376-pack-template/before/PaketBug/paket.templatetemplate b/integrationtests/scenarios/i001376-pack-template/before/PaketBug/paket.templatetemplate index 595dbf5ec8..9bc014634b 100644 --- a/integrationtests/scenarios/i001376-pack-template/before/PaketBug/paket.templatetemplate +++ b/integrationtests/scenarios/i001376-pack-template/before/PaketBug/paket.templatetemplate @@ -2,3 +2,4 @@ type project id PaketBug description Silly empty demo project +authors Paket team diff --git a/integrationtests/scenarios/i001429-pack-deps-minimum-from-lock/before/PaketBug/paket.templatetemplate b/integrationtests/scenarios/i001429-pack-deps-minimum-from-lock/before/PaketBug/paket.templatetemplate index 595dbf5ec8..9bc014634b 100644 --- a/integrationtests/scenarios/i001429-pack-deps-minimum-from-lock/before/PaketBug/paket.templatetemplate +++ b/integrationtests/scenarios/i001429-pack-deps-minimum-from-lock/before/PaketBug/paket.templatetemplate @@ -2,3 +2,4 @@ type project id PaketBug description Silly empty demo project +authors Paket team diff --git a/integrationtests/scenarios/i001429-pack-deps-minimum-from-lock/before/PaketBug2/paket.templatetemplate b/integrationtests/scenarios/i001429-pack-deps-minimum-from-lock/before/PaketBug2/paket.templatetemplate index 14eb596b77..799b5f5d65 100644 --- a/integrationtests/scenarios/i001429-pack-deps-minimum-from-lock/before/PaketBug2/paket.templatetemplate +++ b/integrationtests/scenarios/i001429-pack-deps-minimum-from-lock/before/PaketBug2/paket.templatetemplate @@ -2,3 +2,4 @@ type project id PaketBug2 description Silly empty demo project +authors Paket team diff --git a/integrationtests/scenarios/i001429-pack-deps-specific/before/PaketBug/paket.templatetemplate b/integrationtests/scenarios/i001429-pack-deps-specific/before/PaketBug/paket.templatetemplate index 595dbf5ec8..9bc014634b 100644 --- a/integrationtests/scenarios/i001429-pack-deps-specific/before/PaketBug/paket.templatetemplate +++ b/integrationtests/scenarios/i001429-pack-deps-specific/before/PaketBug/paket.templatetemplate @@ -2,3 +2,4 @@ type project id PaketBug description Silly empty demo project +authors Paket team diff --git a/integrationtests/scenarios/i001429-pack-deps-specific/before/PaketBug2/paket.templatetemplate b/integrationtests/scenarios/i001429-pack-deps-specific/before/PaketBug2/paket.templatetemplate index 14eb596b77..799b5f5d65 100644 --- a/integrationtests/scenarios/i001429-pack-deps-specific/before/PaketBug2/paket.templatetemplate +++ b/integrationtests/scenarios/i001429-pack-deps-specific/before/PaketBug2/paket.templatetemplate @@ -2,3 +2,4 @@ type project id PaketBug2 description Silly empty demo project +authors Paket team diff --git a/integrationtests/scenarios/i001429-pack-deps/before/PaketBug/paket.templatetemplate b/integrationtests/scenarios/i001429-pack-deps/before/PaketBug/paket.templatetemplate index 595dbf5ec8..9bc014634b 100644 --- a/integrationtests/scenarios/i001429-pack-deps/before/PaketBug/paket.templatetemplate +++ b/integrationtests/scenarios/i001429-pack-deps/before/PaketBug/paket.templatetemplate @@ -2,3 +2,4 @@ type project id PaketBug description Silly empty demo project +authors Paket team diff --git a/integrationtests/scenarios/i001429-pack-deps/before/PaketBug2/paket.templatetemplate b/integrationtests/scenarios/i001429-pack-deps/before/PaketBug2/paket.templatetemplate index 14eb596b77..799b5f5d65 100644 --- a/integrationtests/scenarios/i001429-pack-deps/before/PaketBug2/paket.templatetemplate +++ b/integrationtests/scenarios/i001429-pack-deps/before/PaketBug2/paket.templatetemplate @@ -2,3 +2,4 @@ type project id PaketBug2 description Silly empty demo project +authors Paket team diff --git a/integrationtests/scenarios/i001586-pack-referenced/before/PaketBug/paket.templatetemplate b/integrationtests/scenarios/i001586-pack-referenced/before/PaketBug/paket.templatetemplate index 595dbf5ec8..9bc014634b 100644 --- a/integrationtests/scenarios/i001586-pack-referenced/before/PaketBug/paket.templatetemplate +++ b/integrationtests/scenarios/i001586-pack-referenced/before/PaketBug/paket.templatetemplate @@ -2,3 +2,4 @@ type project id PaketBug description Silly empty demo project +authors Paket team diff --git a/integrationtests/scenarios/i001586-pack-referenced/before/PaketBug2/paket.templatetemplate b/integrationtests/scenarios/i001586-pack-referenced/before/PaketBug2/paket.templatetemplate index 14eb596b77..799b5f5d65 100644 --- a/integrationtests/scenarios/i001586-pack-referenced/before/PaketBug2/paket.templatetemplate +++ b/integrationtests/scenarios/i001586-pack-referenced/before/PaketBug2/paket.templatetemplate @@ -2,3 +2,4 @@ type project id PaketBug2 description Silly empty demo project +authors Paket team diff --git a/integrationtests/scenarios/i001594-pack/before/paket.templatetemplate b/integrationtests/scenarios/i001594-pack/before/paket.templatetemplate index c604ca1eb2..2ff02d6391 100644 --- a/integrationtests/scenarios/i001594-pack/before/paket.templatetemplate +++ b/integrationtests/scenarios/i001594-pack/before/paket.templatetemplate @@ -1,2 +1,4 @@ type project +description Test project. +authors Paket team licenseUrl http://opensource.org/licenses/MIT