Bring in Chocolatey patchset. #6
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
… migrations (release-6.4.x) (NuGet#4895)
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 efficent direct usage.
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.
There is a scenario where only the BuildTools are installed on a build agent, rather than a complete installation of Visual Studio. In this scenario, VSWhere by default doesn't include BuildTools when querying. This is "by design". As such, if the first attempt at finding MSBuild return nothing, additionally check specifically for the BuildTools version, and then gracefully fail if nothing is found.
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>
|
Closing as invalid target and base. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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
This follows the proposed branch structure from: chocolatey/choco#2740 (comment)
It is based on
6.4.x. Then any future changes from upstreamrelease-6.4.xcan be merged in, and any further modifications can be added to this branch. Once version6.5is released upstream, and branchrelease-6.5.xis available upstream, the patchset onrelease-6.4.xcan be cherry-picked and put on top ofrelease-6.5.xas a concise set of commits. This allows rebasing the modifications regularly on upstream code, while avoiding rewriting history or large numbers of merge commits with a complex history.In terms of updating the the patchset on top of upstream, I rebased this from code at 6.3.x, and the only merge issues where in the
PublicAPIUnshippped.txtfiles and the strongname keys inAssemblyInfo.csfiles, both of which were simple fixes. Also, looking at the commit history for most of the touched files, it seems like code changes are in some of the lower velocity areas, so hopefully it will continue to be easy to bring this forward.