Skip to content

Commit

Permalink
Rename PackageReference.Identity -> PackageReference.Dependency
Browse files Browse the repository at this point in the history
  • Loading branch information
DustinCampbell committed Apr 6, 2017
1 parent 758df61 commit 573400a
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 9 deletions.
8 changes: 4 additions & 4 deletions src/OmniSharp.MSBuild/MSBuildProjectSystem.cs
Original file line number Diff line number Diff line change
Expand Up @@ -573,8 +573,8 @@ private List<PackageDependency> CreatePackageDependencies(IEnumerable<PackageRef
{
var dependency = new PackageDependency
{
Name = packageReference.Identity.Id,
Version = packageReference.Identity.VersionRange.ToNormalizedString()
Name = packageReference.Dependency.Id,
Version = packageReference.Dependency.VersionRange.ToNormalizedString()
};

list.Add(dependency);
Expand All @@ -587,8 +587,8 @@ private static bool ContainsPackageReference(LockFile lockFile, PackageReference
{
foreach (var library in lockFile.Libraries)
{
if (string.Equals(library.Name, reference.Identity.Id) &&
reference.Identity.VersionRange.Satisfies(library.Version))
if (string.Equals(library.Name, reference.Dependency.Id) &&
reference.Dependency.VersionRange.Satisfies(library.Version))
{
return true;
}
Expand Down
10 changes: 5 additions & 5 deletions src/OmniSharp.MSBuild/ProjectFile/PackageReference.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,25 +5,25 @@ namespace OmniSharp.MSBuild.ProjectFile
{
public class PackageReference : IEquatable<PackageReference>
{
public PackageDependency Identity { get; }
public PackageDependency Dependency { get; }
public bool IsImplicitlyDefined { get; }

public PackageReference(PackageDependency dependency, bool isImplicitlyDefined)
{
this.Identity = dependency;
this.Dependency = dependency;
this.IsImplicitlyDefined = isImplicitlyDefined;
}

public override string ToString()
{
var implicitSuffix = IsImplicitlyDefined ? " (implicit)" : string.Empty;

return Identity.Id + ", " + Identity.VersionRange + implicitSuffix;
return Dependency.Id + ", " + Dependency.VersionRange + implicitSuffix;
}

public bool Equals(PackageReference other)
{
if (!Identity.Equals(other.Identity))
if (!Dependency.Equals(other.Dependency))
{
return false;
}
Expand All @@ -33,7 +33,7 @@ public bool Equals(PackageReference other)

public override int GetHashCode()
{
return this.Identity.GetHashCode() + (IsImplicitlyDefined ? 1 : 0);
return this.Dependency.GetHashCode() + (IsImplicitlyDefined ? 1 : 0);
}
}
}

0 comments on commit 573400a

Please sign in to comment.