Include PackageSpec in assets (lock) file #1025
Merged
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
emgarten
approved these changes
Nov 18, 2016
| @@ -20,7 +19,7 @@ public static PackageSpec GetSpec(string projectFilePath, string id, VersionRang | |||
| { | |||
| var name = $"{id}-{Guid.NewGuid().ToString()}"; | |||
|
|
|||
| return new PackageSpec(new JObject()) | |||
| return new PackageSpec() | |||
|
|
||
| namespace NuGet.LibraryModel | ||
| { | ||
| public class ToolDependency | ||
| public class ToolDependency : IEquatable<ToolDependency> |
There was a problem hiding this comment.
This could be removed from PackageSpec instead, I must have missed it when removing the rest of the XProj support.
There was a problem hiding this comment.
Decided to do this as a separate item:
NuGet/Home#3986
| @@ -46,6 +47,7 @@ public class LockFileFormat | |||
| private const string ToolsProperty = "tools"; | |||
| private const string ProjectFileToolGroupsProperty = "projectFileToolGroups"; | |||
| private const string PackageFoldersProperty = "packageFolders"; | |||
| private const string PackageSpecProperty = "packageSpec"; | |||
There was a problem hiding this comment.
Should this have a different name? packageSpec is a bit confusing already, maybe: restoreSpec, project, or projectMetadata, thoughts?
Internally the PackageSpec name makes sense, just not for anyone else viewing this file.
There was a problem hiding this comment.
project is best, I think. Good idea.
This reverts commit 81491a5. # Conflicts: # test/NuGet.Core.FuncTests/NuGet.Commands.FuncTest/compiler/resources/uwpBlankAppV2.json # test/NuGet.Core.Tests/NuGet.ProjectModel.Test/LockFileFormatTests.cs
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.
During the commit step of a restore operation, we write out a
project.lock.jsonfile or aproject.assets.jsonfile. I have added a property to this JSON object"packageSpec". The value is the input package spec.The .dg file already has serialized
PackageSpecinstances.Notable accomplishments:
PackageSpecproperty to the lock file model, serialization, and deserializationEqualsandGetHashCodeimplementations toPackageSpecand all of its child modelsPackageSpecinstances, I did not take theNameandFilePathproperties into account. These are not serialized so I figured anything that did not round trip should not be considered part of the equality logic. Additionally the file path that your read aPackageSpecfrom should not matter.EqualityUtilityand hash code helpers toHashCodeCombinerGetJObjectmethod toJsonObjectWriterto avoid unnecessary serializationPropertiesproperty fromPackageSpecHashCodeCombinerimplementationPackageSpecReferenceDependencyProviderto cloneLibraryDependencyinstances.Completes the second item in NuGet/Home#3891 (comment).
/cc @emgarten @alpaix @dtivel