Fix msbuild parsing with lowercase version field (#1473)

This fixes an issue where the `.csproj` parser would ignore uppercase version fields on `PackageReference`.
phylum-dev · Jul 12, 2024 · 10a427d · 10a427d
1 parent 0524039
commit 10a427d
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 8 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -12,6 +12,10 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 
 - `phylum init` will infer the repository URL from `git`
 
+### Fixed
+
+- `msbuild` parser ignoring uppercase `Version` fields on `PackageReference`
+
 ## 6.6.5 - 2024-07-09
 
 ### Fixed

diff --git a/lockfile/src/csharp.rs b/lockfile/src/csharp.rs
@@ -97,7 +97,7 @@ pub struct PackageReference {
     #[serde(alias = "@Include", default)]
     pub name: String,
 
-    #[serde(alias = "@Version", alias = "@version", default)]
+    #[serde(alias = "@Version", alias = "@version", alias = "Version", default)]
     pub version: String,
 }
 
@@ -248,14 +248,34 @@ mod tests {
     #[test]
     fn lock_parse_csproj() {
         let pkgs = CSProj.parse(include_str!("../../tests/fixtures/sample.csproj")).unwrap();
+        assert_eq!(pkgs.len(), 6);
 
-        assert_eq!(pkgs.len(), 5);
-        assert_eq!(pkgs[0].name, "Microsoft.NETFramework.ReferenceAssemblies");
-        assert_eq!(pkgs[0].version, PackageVersion::FirstParty("1.0.0".into()));
+        let expected_pkgs = [
+            Package {
+                name: "Microsoft.NETFramework.ReferenceAssemblies".into(),
+                version: PackageVersion::FirstParty("1.0.0".into()),
+                package_type: PackageType::Nuget,
+            },
+            Package {
+                name: "System.ValueTuple".into(),
+                version: PackageVersion::FirstParty("4.5.0".into()),
+                package_type: PackageType::Nuget,
+            },
+            Package {
+                name: "Microsoft.NETCore.UniversalWindowsPlatform".into(),
+                version: PackageVersion::FirstParty("6.2.10".into()),
+                package_type: PackageType::Nuget,
+            },
+            Package {
+                name: "System.Collections.Immutable".into(),
+                version: PackageVersion::FirstParty("1.5.0".into()),
+                package_type: PackageType::Nuget,
+            },
+        ];
 
-        let last = pkgs.last().unwrap();
-        assert_eq!(last.name, "System.ValueTuple");
-        assert_eq!(last.version, PackageVersion::FirstParty("4.5.0".into()));
+        for expected_pkg in expected_pkgs {
+            assert!(pkgs.contains(&expected_pkg));
+        }
     }
 
     #[test]

diff --git a/tests/fixtures/sample.csproj b/tests/fixtures/sample.csproj
@@ -13,8 +13,13 @@
     <PackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" />
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="3.13.0" />
-    <PackageReference Include="System.Collections.Immutable" Version="1.5.0" />
     <PackageReference Include="System.ValueTuple" version="4.5.0" />
+    <PackageReference Include="Microsoft.NETCore.UniversalWindowsPlatform">
+      <Version>6.2.10</Version>
+    </PackageReference>
+    <PackageReference Include="System.Collections.Immutable">
+      <version>1.5.0</version>
+    </PackageReference>
   </ItemGroup>
 
   <ItemGroup>