Fix the null refs in the refrence message

#584
aspnet · Aug 27, 2014 · c3ab9e1 · c3ab9e1
1 parent 8081af8
commit c3ab9e1
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/Microsoft.Framework.DesignTimeHost/Models/OutgoingMessages/ReferenceDescription.cs b/src/Microsoft.Framework.DesignTimeHost/Models/OutgoingMessages/ReferenceDescription.cs
@@ -23,10 +23,10 @@ public override bool Equals(object obj)
             var other = obj as ReferenceDescription;
 
             return other != null &&
-                   Name.Equals(other.Name) &&
-                   Version.Equals(other.Version) &&
-                   Path.Equals(other.Path) &&
-                   Type.Equals(other.Type) &&
+                   string.Equals(Name, other.Name) &&
+                   object.Equals(Version, other.Version) &&
+                   string.Equals(Path, other.Path) &&
+                   string.Equals(Type, other.Type) &&
                    Enumerable.SequenceEqual(Dependencies, other.Dependencies);
         }
 

diff --git a/src/Microsoft.Framework.DesignTimeHost/Models/OutgoingMessages/ReferenceItem.cs b/src/Microsoft.Framework.DesignTimeHost/Models/OutgoingMessages/ReferenceItem.cs
@@ -15,8 +15,8 @@ public override bool Equals(object obj)
         {
             var other = obj as ReferenceItem;
             return other != null &&
-                   Name.Equals(other.Name) &&
-                   Version.Equals(other.Version);
+                   string.Equals(Name, other.Name) &&
+                   object.Equals(Version, other.Version);
         }
         public override int GetHashCode()
         {

diff --git a/src/Microsoft.Framework.DesignTimeHost/Models/OutgoingMessages/ReferencesMessage.cs b/src/Microsoft.Framework.DesignTimeHost/Models/OutgoingMessages/ReferencesMessage.cs
@@ -21,9 +21,9 @@ public override bool Equals(object obj)
             var other = obj as ReferencesMessage;
 
             return other != null &&
-                   RootDependency.Equals(other.RootDependency) &&
-                   LongFrameworkName.Equals(other.LongFrameworkName) &&
-                   FriendlyFrameworkName.Equals(other.FriendlyFrameworkName) &&
+                   string.Equals(RootDependency, other.RootDependency) &&
+                   string.Equals(LongFrameworkName, other.LongFrameworkName) &&
+                   string.Equals(FriendlyFrameworkName, other.FriendlyFrameworkName) &&
                    Enumerable.SequenceEqual(ProjectReferences, other.ProjectReferences) &&
                    Enumerable.SequenceEqual(FileReferences, other.FileReferences) &&
                    Enumerable.SequenceEqual(Dependencies, other.Dependencies) &&