From fc0db1470c9f16f7e1b07262d3d143e988a4615c Mon Sep 17 00:00:00 2001 From: Amber Erickson Date: Thu, 7 Jul 2022 14:06:30 -0700 Subject: [PATCH 1/6] Change url to uri in publish --- src/code/PublishPSResource.cs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/code/PublishPSResource.cs b/src/code/PublishPSResource.cs index f10648451..33ee241e2 100644 --- a/src/code/PublishPSResource.cs +++ b/src/code/PublishPSResource.cs @@ -602,19 +602,19 @@ private string CreateNuspec( } metadataElementsDictionary.Add("tags", tags); - if (parsedMetadataHash.ContainsKey("licenseurl")) + if (parsedMetadataHash.ContainsKey("licenseuri")) { - metadataElementsDictionary.Add("licenseUrl", parsedMetadataHash["licenseurl"].ToString().Trim()); + metadataElementsDictionary.Add("licenseUrl", parsedMetadataHash["licenseuri"].ToString().Trim()); } - if (parsedMetadataHash.ContainsKey("projecturl")) + if (parsedMetadataHash.ContainsKey("projecturi")) { - metadataElementsDictionary.Add("projectUrl", parsedMetadataHash["projecturl"].ToString().Trim()); + metadataElementsDictionary.Add("projectUrl", parsedMetadataHash["projecturi"].ToString().Trim()); } - if (parsedMetadataHash.ContainsKey("iconurl")) + if (parsedMetadataHash.ContainsKey("iconuri")) { - metadataElementsDictionary.Add("iconUrl", parsedMetadataHash["iconurl"].ToString().Trim()); + metadataElementsDictionary.Add("iconUrl", parsedMetadataHash["iconuri"].ToString().Trim()); } // Example nuspec: From 4e24e1081febb65ffb4eef034a9fdc0f5cfca61a Mon Sep 17 00:00:00 2001 From: Amber Erickson Date: Thu, 7 Jul 2022 15:33:11 -0700 Subject: [PATCH 2/6] Move module manifest properties that are found under PSData --- src/code/PublishPSResource.cs | 52 ++++++++++++++++++----------------- 1 file changed, 27 insertions(+), 25 deletions(-) diff --git a/src/code/PublishPSResource.cs b/src/code/PublishPSResource.cs index 33ee241e2..696c1845c 100644 --- a/src/code/PublishPSResource.cs +++ b/src/code/PublishPSResource.cs @@ -540,10 +540,36 @@ private string CreateNuspec( { if (privateData["PSData"] is Hashtable psData) { - if (psData.ContainsKey("Prerelease") && psData["Prerelease"] is string preReleaseVersion) + if (psData.ContainsKey("prerelease") && psData["prerelease"] is string preReleaseVersion) { version = string.Format(@"{0}-{1}", version, preReleaseVersion); } + + if (psData.ContainsKey("licenseUri") && psData["licenseuri"] is string licenseUri) + { + metadataElementsDictionary.Add("licenseUrl", licenseUri.Trim()); + } + + if (psData.ContainsKey("projecturi") && psData["projecturi"] is string projectUri) + { + metadataElementsDictionary.Add("projectUrl", projectUri.Trim()); + } + + if (psData.ContainsKey("iconuri") && psData["iconuri"] is string iconUri) + { + metadataElementsDictionary.Add("iconUrl", iconUri.Trim()); + } + + if (psData.ContainsKey("releasenotes") && psData["releasenotes"] is string releaseNotes) + { + metadataElementsDictionary.Add("releaseNotes", releaseNotes.Trim()); + } + + // defaults to false + string requireLicenseAcceptance = psData.ContainsKey("requirelicenseacceptance") ? psData["ReleaseNotes"] as string : "false"; + metadataElementsDictionary.Add("requireLicenseAcceptance", requireLicenseAcceptance); + + if (psData.ContainsKey("Tags") && psData["Tags"] is Array manifestTags) { var tagArr = new List(); @@ -572,21 +598,11 @@ private string CreateNuspec( metadataElementsDictionary.Add("owners", parsedMetadataHash["companyname"].ToString().Trim()); } - // defaults to false - var requireLicenseAcceptance = parsedMetadataHash.ContainsKey("requirelicenseacceptance") ? parsedMetadataHash["requirelicenseacceptance"].ToString().ToLower().Trim() - : "false"; - metadataElementsDictionary.Add("requireLicenseAcceptance", requireLicenseAcceptance); - if (parsedMetadataHash.ContainsKey("description")) { metadataElementsDictionary.Add("description", parsedMetadataHash["description"].ToString().Trim()); } - if (parsedMetadataHash.ContainsKey("releasenotes")) - { - metadataElementsDictionary.Add("releaseNotes", parsedMetadataHash["releasenotes"].ToString().Trim()); - } - if (parsedMetadataHash.ContainsKey("copyright")) { metadataElementsDictionary.Add("copyright", parsedMetadataHash["copyright"].ToString().Trim()); @@ -602,20 +618,6 @@ private string CreateNuspec( } metadataElementsDictionary.Add("tags", tags); - if (parsedMetadataHash.ContainsKey("licenseuri")) - { - metadataElementsDictionary.Add("licenseUrl", parsedMetadataHash["licenseuri"].ToString().Trim()); - } - - if (parsedMetadataHash.ContainsKey("projecturi")) - { - metadataElementsDictionary.Add("projectUrl", parsedMetadataHash["projecturi"].ToString().Trim()); - } - - if (parsedMetadataHash.ContainsKey("iconuri")) - { - metadataElementsDictionary.Add("iconUrl", parsedMetadataHash["iconuri"].ToString().Trim()); - } // Example nuspec: /* From d4096f7a408a41f557edf81e0dc4cae9ff9db330 Mon Sep 17 00:00:00 2001 From: Amber Erickson Date: Thu, 7 Jul 2022 17:13:49 -0700 Subject: [PATCH 3/6] Change licenseUrl to license --- src/code/PublishPSResource.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/code/PublishPSResource.cs b/src/code/PublishPSResource.cs index 696c1845c..26a012cb3 100644 --- a/src/code/PublishPSResource.cs +++ b/src/code/PublishPSResource.cs @@ -547,7 +547,7 @@ private string CreateNuspec( if (psData.ContainsKey("licenseUri") && psData["licenseuri"] is string licenseUri) { - metadataElementsDictionary.Add("licenseUrl", licenseUri.Trim()); + metadataElementsDictionary.Add("license", licenseUri.Trim()); } if (psData.ContainsKey("projecturi") && psData["projecturi"] is string projectUri) @@ -630,7 +630,7 @@ private string CreateNuspec( Microsoft,PowerShell false MIT - https://licenses.nuget.org/MIT + https://licenses.nuget.org/MIT Powershell_black_64.png https://github.com/PowerShell/PowerShell Example description here From 853ffb832852f70b3e3fb8433c79492bcf0a75e3 Mon Sep 17 00:00:00 2001 From: alerickson <25858831+alerickson@users.noreply.github.com> Date: Tue, 2 Aug 2022 16:53:22 -0700 Subject: [PATCH 4/6] Update src/code/PublishPSResource.cs Co-authored-by: Paul Higinbotham --- src/code/PublishPSResource.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/code/PublishPSResource.cs b/src/code/PublishPSResource.cs index 26a012cb3..ee002f7ef 100644 --- a/src/code/PublishPSResource.cs +++ b/src/code/PublishPSResource.cs @@ -566,7 +566,8 @@ private string CreateNuspec( } // defaults to false - string requireLicenseAcceptance = psData.ContainsKey("requirelicenseacceptance") ? psData["ReleaseNotes"] as string : "false"; + string requireLicenseAcceptance = psData.ContainsKey("requirelicenseacceptance") ? psData["requirelicenseacceptance"] : "false"; + metadataElementsDictionary.Add("requireLicenseAcceptance", requireLicenseAcceptance); From be4228d1d69db47f6137ca18d052bbafe8b904d9 Mon Sep 17 00:00:00 2001 From: alerickson <25858831+alerickson@users.noreply.github.com> Date: Thu, 11 Aug 2022 14:33:45 -0700 Subject: [PATCH 5/6] Update src/code/PublishPSResource.cs Co-authored-by: Anam Navied --- src/code/PublishPSResource.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/code/PublishPSResource.cs b/src/code/PublishPSResource.cs index ee002f7ef..7be24faf1 100644 --- a/src/code/PublishPSResource.cs +++ b/src/code/PublishPSResource.cs @@ -545,7 +545,8 @@ private string CreateNuspec( version = string.Format(@"{0}-{1}", version, preReleaseVersion); } - if (psData.ContainsKey("licenseUri") && psData["licenseuri"] is string licenseUri) + if (psData.ContainsKey("licenseuri") && psData["licenseuri"] is string licenseUri) + { metadataElementsDictionary.Add("license", licenseUri.Trim()); } From 17ddc1f44f91aa823612e1f255762fd2a7d78724 Mon Sep 17 00:00:00 2001 From: Amber Erickson Date: Thu, 11 Aug 2022 14:57:36 -0700 Subject: [PATCH 6/6] Add handling for 'releaseNotes' as a string[] --- src/code/PublishPSResource.cs | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/src/code/PublishPSResource.cs b/src/code/PublishPSResource.cs index 7be24faf1..5ec41742b 100644 --- a/src/code/PublishPSResource.cs +++ b/src/code/PublishPSResource.cs @@ -561,13 +561,20 @@ private string CreateNuspec( metadataElementsDictionary.Add("iconUrl", iconUri.Trim()); } - if (psData.ContainsKey("releasenotes") && psData["releasenotes"] is string releaseNotes) + if (psData.ContainsKey("releasenotes")) { - metadataElementsDictionary.Add("releaseNotes", releaseNotes.Trim()); + if (psData["releasenotes"] is string releaseNotes) + { + metadataElementsDictionary.Add("releaseNotes", releaseNotes.Trim()); + } + else if (psData["releasenotes"] is string[] releaseNotesArr) + { + metadataElementsDictionary.Add("releaseNotes", string.Join("\n", releaseNotesArr)); + } } // defaults to false - string requireLicenseAcceptance = psData.ContainsKey("requirelicenseacceptance") ? psData["requirelicenseacceptance"] : "false"; + string requireLicenseAcceptance = psData.ContainsKey("requirelicenseacceptance") ? psData["requirelicenseacceptance"].ToString() : "false"; metadataElementsDictionary.Add("requireLicenseAcceptance", requireLicenseAcceptance);