Skip to content
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.

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

Bring in Chocolatey patchset. #8

Merged
merged 13 commits into from Nov 21, 2022
Merged

Bring in Chocolatey patchset. #8

merged 13 commits into from Nov 21, 2022

Conversation

AdmiringWorm
Copy link
Member

@AdmiringWorm AdmiringWorm commented Nov 15, 2022

This brings in the Chocolatey patch set of changes to NuGet.Client.
This no longer includes modifications for side by side installs, or the prototype for adding actions into the package manager class.
It includes the extra two commits from #1 relating to building in Team City

Note that the current develop branch build.ps1 is broken, but is fixed in the upstream dev branch by these commits:
NuGet@c543930
NuGet@d1620d3

Re-creation of the PR made by @TheCakeIsNaOH in PR #7

https://app.clickup.com/t/20540031/PROJ-311

@AdmiringWorm AdmiringWorm self-assigned this Nov 15, 2022
Copy link
Member

@gep13 gep13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall, this looks great to me. Just a few suggestions, and minor changes!

@gep13 gep13 force-pushed the forked-choco-develop branch 6 times, most recently from da6cae1 to 0c54d9a Compare November 21, 2022 08:03
@choco-bot
Copy link

@AdmiringWorm AdmiringWorm force-pushed the forked-choco-develop branch 2 times, most recently from d9ad474 to 116bdec Compare November 21, 2022 12:24
TheCakeIsNaOH and others added 6 commits November 21, 2022 13:33
Extend Nuspec metadata to include:

- Project source url
- Package source url
- Docs url
- Wiki Url
- Mailing List Url
- Bug Tracker Url

Adding the following elements, reserving for future use with respect to
package relationships.
- Replaces
- Provides
- Conflicts

This brings forward these commits:
chocolatey/nuget-chocolatey@9b703a8
chocolatey/nuget-chocolatey@4e28997
chocolatey/nuget-chocolatey@b9c4bc5

Co-Authored-By: Rob Reynolds <63502+ferventcoder@users.noreply.github.com>
Along with moderation related information, provide other data that is
provided by the server metadata.

- PackageHash
- PackageHashAlgorithm
- PackageSize
- VersionDownloadCount
- IsApproved
- PackageStatus
- PackageSubmittedStatus
- PackageTestResultStatus
- PackageTestResultStatusDate
- PackageValidationResultStatus
- PackageValidationResultDate
- PackageCleanupResultDate
- PackageReviewedDate
- PackageApprovedDate
- PackageReviewer
- IsDownloadCacheAvailable
- DownloadCacheDate
- DownloadCache

Based on these commits:
chocolatey/nuget-chocolatey@3866411
chocolatey/nuget-chocolatey@133552a

Co-Authored-By: Rob Reynolds <63502+ferventcoder@users.noreply.github.com>
Allow passing a specific proxy into the proxy cache that is used no
matter what.

Based on these commits:
chocolatey/nuget-chocolatey@4b206ed
chocolatey/nuget-chocolatey@26559a4

Co-Authored-By: Rob Reynolds <63502+ferventcoder@users.noreply.github.com>
Co-Authored-By: Jakub Cisło <8983541+Cubix651@users.noreply.github.com>
Exposing these allows more efficient direct usage.
TheCakeIsNaOH and others added 7 commits November 21, 2022 13:45
As Chocolatey, we never want to create the NuGet.Config file, as this is
not used by Chocolatey at all. As such, rather than GetOrCreateDocument,
if the filepath doesn't exist, simply return the default empty
XDocument, which is exactly what would have been returned after creating
the file.

A few tests have to be skipped, as they rely on the config being
automatically created.

Based on this commit:
chocolatey/nuget-chocolatey@a211f19

Co-Authored-By: Gary Ewan Park <1271146+gep13@users.noreply.github.com>
Converts the path separator character in the nuspec file source to the
character that is correct for the OS that is running the packing
operation. Changes "\" to "/" on Linux and MacOS systems, and
changes "/" to "\" on Windows systems.

Keeps chocolatey/choco#2166 fixed

Based on this commit:
chocolatey/nuget-chocolatey@979a47d
This adds the Chocolatey strongname keypair used for nuget-chocolatey and
switches the sign.target to use it. This requires that the InternalsVisibleTo properties
be updated with the new public key.

Keyfile from:
chocolatey/nuget-chocolatey@7e8d686
This strips empty entries from a string with multiple entries split
by a separator.

Brought forward from:
chocolatey/nuget-chocolatey@d344d47

Co-Authored-By: Rob Reynolds <63502+ferventcoder@users.noreply.github.com>
This pulls an interface out of HttpSource called IHttpSource, and
switches usages to use the interface. Additionally, it adds a method
to HttpSourceResource to allow the IHttpSource to be switched out if
needed, so alternative implementations can be used.

Based on these commits:
chocolatey/nuget-chocolatey@19986e7
chocolatey/nuget-chocolatey@ee5f731e

Co-Authored-By: Rob Reynolds <63502+ferventcoder@users.noreply.github.com>
…g directory

This allows added files to be not deleted during package upgrades.
If you don't set it specifically, after ILMerge the NuGet libraries
will show up as having Chocolatey's version. This affects the user
agent, and other uses of the library version.

Brought forward from this commit:
chocolatey/nuget-chocolatey@2a0aa36

Co-Authored-By: Rob Reynolds <63502+ferventcoder@users.noreply.github.com>
Copy link
Member

@gep13 gep13 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@gep13 gep13 merged commit 48ae8fd into develop Nov 21, 2022
@gep13
Copy link
Member

gep13 commented Nov 21, 2022

@AdmiringWorm and @TheCakeIsNaOH thanks for getting this to where it is! Now let's take this for a spin, and see what we can figure out within chocolatey/choco!

@gep13 gep13 deleted the forked-choco-develop branch November 21, 2022 14:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants