[WIP] Add license expression and icon to template spec

integrationtests/Paket.IntegrationTests/PackSpecs.fs

@@ -927,3 +927,28 @@ let ``#3707 allows repositoryUrl``() =
     let expected = """<repository type="git" url="https://github.com/my-org/my-custom-repo" />"""
     if not (nuspec.Contains expected) then
         failwith nuspec
+
+[<Test>]
+let ``#3710 specify license expression and icon``() =
+    let scenario = "i003710-license-expression-and-icon"
+
+    let outPath = Path.Combine(scenarioTempPath scenario,"out")
+    let templatePath = Path.Combine(scenarioTempPath scenario,"src", "A.Source", "paket.template")
+    use __ = paket ("pack version 1.0.0 output \"" + outPath + "\" -v") scenario |> fst
+
+    let package = Path.Combine(outPath, "A.Source.1.0.0.nupkg")
+
+    let unzippedNupkgPath = Path.Combine(outPath, "Extracted")
+    ZipFile.ExtractToDirectory(package, unzippedNupkgPath)
+
+    let nuspecFile = FileInfo(Path.Combine(unzippedNupkgPath, "A.Source.nuspec"))
+    let nuspec = File.ReadAllText(nuspecFile.FullName)
+    let expectedLicense = """<license type="expression">MIT</license>"""
+    let expectedIcon = """<icon>guy-fieri.jpg</icon>"""
+    let expectedFile = """<file src="guy-fieri.jpg" target="img" />"""
+    if not (nuspec.Contains expectedLicense) then
+        failwith ("nuspec doesn't have the license expression.\n" + nuspec)
+    if not (nuspec.Contains expectedIcon) then
+        failwith ("nuspec doesn't have the icon.\n" + nuspec)
+    if not (nuspec.Contains expectedFile) then
+        failwith ("nuspec doesn't have the icon file.\n" + nuspec)

integrationtests/scenarios/i003710-license-expression-and-icon/before/paket.dependencies

@@ -0,0 +1 @@
+source https://www.nuget.org/api/v2

integrationtests/scenarios/i003710-license-expression-and-icon/before/paket.lock

@@ -0,0 +1 @@
+

integrationtests/scenarios/i003710-license-expression-and-icon/before/src/A.Source/paket.templatetemplate

@@ -0,0 +1,27 @@
+type file
+id A.Source
+owners Team
+authors Team
+projectUrl
+    https://github.com/
+icon
+    guy-fieri.jpg
+license
+    MIT
+repositoryType
+    git
+repositoryUrl
+    https://github.com/my-org/my-custom-repo
+requireLicenseAcceptance
+    false
+copyright
+    Copyright 2015
+tags
+    tag
+summary
+    summary
+description
+    Project has no description
+files
+   ../A/**/*.cs ==> ./A
+   guy-fieri.jpg ==> img/

integrationtests/scenarios/i003710-license-expression-and-icon/before/src/A/Folder/source.cs

@@ -0,0 +1 @@
+// just an empty file i expect to be packaged

src/Paket.Core/Packaging/NupkgWriter.fs

@@ -162,6 +162,20 @@ module internal NupkgWriter =
         !! "authors" (core.Authors |> String.concat ", ")
         if optional.Owners <> [] then !! "owners" (String.Join(", ",optional.Owners))
         (!!?) "licenseUrl" optional.LicenseUrl
+
+        match optional.License, optional.LicenseFile with
+        | Some l, None ->
+            let d = XElement(ns + "license", l)
+            d.SetAttributeValue(XName.Get "type", "expression")
+            metadataNode.Add d
+        | None, Some lf ->
+            let d = XElement(ns + "license", lf)
+            d.SetAttributeValue(XName.Get "type", "file")
+            metadataNode.Add d
+        | Some _, Some _ ->
+            raise (Exception("Cannot specify both a license and licenseFile attribute. Pick one or the other."))
+        | None, None -> ()
+
         match optional.RepositoryType, optional.RepositoryUrl with
         | Some t, Some url ->
             let d = XElement(ns + "repository")
@@ -172,6 +186,7 @@ module internal NupkgWriter =
 
         (!!?) "projectUrl" optional.ProjectUrl
         (!!?) "iconUrl" optional.IconUrl
+        (!!?) "icon" optional.Icon
         if optional.RequireLicenseAcceptance then
             !! "requireLicenseAcceptance" "true"
         !! "description" core.Description

src/Paket.Core/PaketConfigFiles/ProjectFile.fs

@@ -2068,7 +2068,10 @@ type ProjectFile with
             Language = prop "Langauge"
             ProjectUrl = prop "ProjectUrl"
             IconUrl = prop "IconUrl"
+            Icon = prop "IconUrl"
             LicenseUrl = prop "LicenseUrl"
+            License = prop "License"
+            LicenseFile = prop "LicenseFile"
             Copyright = prop "Copyright"
             RepositoryType = prop "RepositoryType"
             RepositoryUrl = prop "RepositoryUrl"

src/Paket.Core/PaketConfigFiles/TemplateFile.fs

@@ -145,7 +145,10 @@ type OptionalPackagingInfo =
       Language : string option
       ProjectUrl : string option
       IconUrl : string option
+      Icon : string option
       LicenseUrl : string option
+      License : string option
+      LicenseFile : string option
       RepositoryUrl : string option
       RepositoryType : string option
       Copyright : string option
@@ -173,9 +176,12 @@ type OptionalPackagingInfo =
           Language = None
           ProjectUrl = None
           LicenseUrl = None
+          License = None
+          LicenseFile = None
           RepositoryUrl = None
           RepositoryType = None
           IconUrl = None
+          Icon = None
           Copyright = None
           RequireLicenseAcceptance = false
           Tags = []
@@ -535,9 +541,12 @@ module internal TemplateFile =
           Language = get "language"
           ProjectUrl = get "projectUrl"
           IconUrl = get "iconUrl"
+          Icon = get "icon"
           RepositoryType = get "repositoryType"
           RepositoryUrl = get "repositoryUrl"
           LicenseUrl = get "licenseUrl"
+          License = get "license"
+          LicenseFile = get "licenseFile"
           Copyright = get "copyright"
           RequireLicenseAcceptance = requireLicenseAcceptance
           Tags = tags