Also check for version as child element

fossas · Jun 4, 2021 · 702dea4 · 702dea4
1 parent 0eb90c6
commit 702dea4
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/src/Strategy/NuGet/PackageReference.hs b/src/Strategy/NuGet/PackageReference.hs
@@ -12,7 +12,7 @@ module Strategy.NuGet.PackageReference
   , Package(..)
   ) where
 
-import Control.Applicative (optional)
+import Control.Applicative (optional, (<|>))
 import Control.Effect.Diagnostics
 import Data.Foldable (find)
 import qualified Data.List as L
@@ -90,7 +90,7 @@ instance FromXML ItemGroup where
 instance FromXML Package where
   parseElement el =
     Package <$> attr "Include" el
-            <*> optional (attr "Version" el)
+            <*> optional (attr "Version" el <|> child "Version" el)
 
 buildGraph :: PackageReference -> Graphing Dependency
 buildGraph project = Graphing.fromList (map toDependency direct)

diff --git a/test/NuGet/testdata/test.csproj b/test/NuGet/testdata/test.csproj
@@ -19,7 +19,9 @@
     <PackageReference Include="two" Version="2.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="three" Version="3.0.0" />
+    <PackageReference Include="three">
+      <Version>3.0.0</Version>
+    </PackageReference>
     <PackageReference Include="four">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>