Fix reading packagetype attributes

mhutch · mhutch · commit d3c403e897b3 · 2022-07-18T17:52:33.000-04:00
diff --git a/src/ProjectFileTools.NuGetSearch/Contracts/PackageType.cs b/src/ProjectFileTools.NuGetSearch/Contracts/PackageType.cs
@@ -26,7 +26,9 @@ public override int GetHashCode()
         {
             int hashCode = -612338121;
             hashCode = hashCode * -1521134295 + StringComparer.Ordinal.GetHashCode(Name);
-            hashCode = hashCode * -1521134295 + StringComparer.Ordinal.GetHashCode(Version);
+			if (Version is not null) {
+				hashCode = hashCode * -1521134295 + StringComparer.Ordinal.GetHashCode(Version);
+			}
             return hashCode;
         }
     }
diff --git a/src/ProjectFileTools.NuGetSearch/Feeds/NuSpecReader.cs b/src/ProjectFileTools.NuGetSearch/Feeds/NuSpecReader.cs
@@ -28,8 +28,8 @@ internal static IPackageInfo Read(string nuspec, FeedKind kind)
             XElement packageTypesEl = metadata?.Element(XName.Get("packageTypes", ns.NamespaceName));
             if (packageTypesEl != null)
             {
-                var nameName = XName.Get("name", ns.NamespaceName);
-                var versionName = XName.Get("name", ns.NamespaceName);
+                var nameName = XName.Get("name");
+                var versionName = XName.Get("version");
                 packageTypes = new List<PackageType>();
                 foreach (var packageType in packageTypesEl.Elements(XName.Get("packageType", ns.NamespaceName)))
                 {

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,9 @@ public override int GetHashCode()`
`26`	`26`	`{`
`27`	`27`	`int hashCode = -612338121;`
`28`	`28`	`hashCode = hashCode * -1521134295 + StringComparer.Ordinal.GetHashCode(Name);`
`29`		`- hashCode = hashCode * -1521134295 + StringComparer.Ordinal.GetHashCode(Version);`
	`29`	`+ if (Version is not null) {`
	`30`	`+ hashCode = hashCode * -1521134295 + StringComparer.Ordinal.GetHashCode(Version);`
	`31`	`+ }`
`30`	`32`	`return hashCode;`
`31`	`33`	`}`
`32`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,8 +28,8 @@ internal static IPackageInfo Read(string nuspec, FeedKind kind)`
`28`	`28`	`XElement packageTypesEl = metadata?.Element(XName.Get("packageTypes", ns.NamespaceName));`
`29`	`29`	`if (packageTypesEl != null)`
`30`	`30`	`{`
`31`		`- var nameName = XName.Get("name", ns.NamespaceName);`
`32`		`- var versionName = XName.Get("name", ns.NamespaceName);`
	`31`	`+ var nameName = XName.Get("name");`
	`32`	`+ var versionName = XName.Get("version");`
`33`	`33`	`packageTypes = new List<PackageType>();`
`34`	`34`	`foreach (var packageType in packageTypesEl.Elements(XName.Get("packageType", ns.NamespaceName)))`
`35`	`35`	`{`