Skip to content

Bug fix in Publish-PSResource when creating nuspec #693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Aug 15, 2022
Merged

Bug fix in Publish-PSResource when creating nuspec #693

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fc0db14
Change url to uri in publish
alerickson Jul 7, 2022
4e24e10
Move module manifest properties that are found under PSData
alerickson Jul 7, 2022
d4096f7
Change licenseUrl to license
alerickson Jul 8, 2022
853ffb8
Update src/code/PublishPSResource.cs
alerickson Aug 2, 2022
be4228d
Update src/code/PublishPSResource.cs
alerickson Aug 11, 2022
17ddc1f
Add handling for 'releaseNotes' as a string[]
alerickson Aug 11, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
63 changes: 37 additions & 26 deletions src/code/PublishPSResource.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -540,10 +540,45 @@ 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("license", 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"))
{
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"].ToString() : "false";

metadataElementsDictionary.Add("requireLicenseAcceptance", requireLicenseAcceptance);


if (psData.ContainsKey("Tags") && psData["Tags"] is Array manifestTags)
{
var tagArr = new List<string>();
Expand Down Expand Up @@ -572,21 +607,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());
Expand All @@ -602,20 +627,6 @@ private string CreateNuspec(
}
metadataElementsDictionary.Add("tags", tags);

if (parsedMetadataHash.ContainsKey("licenseurl"))
{
metadataElementsDictionary.Add("licenseUrl", parsedMetadataHash["licenseurl"].ToString().Trim());
}

if (parsedMetadataHash.ContainsKey("projecturl"))
{
metadataElementsDictionary.Add("projectUrl", parsedMetadataHash["projecturl"].ToString().Trim());
}

if (parsedMetadataHash.ContainsKey("iconurl"))
{
metadataElementsDictionary.Add("iconUrl", parsedMetadataHash["iconurl"].ToString().Trim());
}

// Example nuspec:
/*
Expand All @@ -628,7 +639,7 @@ private string CreateNuspec(
<owners>Microsoft,PowerShell</owners>
<requireLicenseAcceptance>false</requireLicenseAcceptance>
<license type="expression">MIT</license>
<licenseUrl>https://licenses.nuget.org/MIT</licenseUrl>
<license>https://licenses.nuget.org/MIT</license>
<icon>Powershell_black_64.png</icon>
<projectUrl>https://github.com/PowerShell/PowerShell</projectUrl>
<description>Example description here</description>
Expand Down