Cope with multiple CompilationMappingAttribute (#115)

Author: Smaug123

ApiSurface/DocCoverage.fs

@@ -128,9 +128,12 @@ module DocCoverage =
                 let isUnion = FSharpType.IsUnion (t, true)
 
                 let typeConstruct =
-                    t.GetCustomAttribute<CompilationMappingAttribute> () |> getSourceConstructFlags
+                    t.GetCustomAttributes<CompilationMappingAttribute> ()
+                    |> Seq.map getSourceConstructFlags
+                    |> List.ofSeq
 
                 t,
+                typeConstruct,
                 t.GetMembers (
                     BindingFlags.Public
                     ||| BindingFlags.NonPublic
@@ -143,7 +146,7 @@ module DocCoverage =
                     &&
 
                     // Exception fields are impossible to document - skip them all
-                    typeConstruct <> SourceConstructFlags.Exception
+                    not (List.contains SourceConstructFlags.Exception typeConstruct)
                     &&
 
                     // Skip code generated members
@@ -176,12 +179,9 @@ module DocCoverage =
                     | _ -> true
                 )
             )
-            |> Seq.collect (fun (t, mis) ->
+            |> Seq.collect (fun (t, typeConstruct, mis) ->
                 let isUnion = FSharpType.IsUnion (t, true)
 
-                let typeConstruct =
-                    t.GetCustomAttribute<CompilationMappingAttribute> () |> getSourceConstructFlags
-
                 // Skip modules which have a corresponding type
                 let optionalTypeDoc =
                     let searchName =
@@ -191,7 +191,7 @@ module DocCoverage =
                             t.FullName
 
                     if
-                        typeConstruct = SourceConstructFlags.Module
+                        List.contains SourceConstructFlags.Module typeConstruct
                         && typeWithNonGenericNameExists t searchName
                     then
                         []

ApiSurface/Test/ApiSurface.Test.fsproj

@@ -20,11 +20,11 @@
   </ItemGroup>
   <ItemGroup>
     <PackageReference Update="System.Text.Json" Version="8.0.4" />
-    <PackageReference Include="FsCheck" Version="2.16.6" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.10.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
-    <PackageReference Include="FsUnit" Version="6.0.0" />
-    <PackageReference Include="NUnit" Version="4.1.0" />
+    <PackageReference Include="FsCheck" Version="3.3.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
+    <PackageReference Include="NUnit3TestAdapter" Version="5.0.0" />
+    <PackageReference Include="FsUnit" Version="7.1.1" />
+    <PackageReference Include="NUnit" Version="4.3.2" />
     <PackageReference Include="System.IO.Abstractions.TestingHelpers" Version="4.2.13" />
     <PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
     <PackageReference Include="System.Net.Primitives" Version="4.3.0" />

ApiSurface/Test/TestVersionFile.fs

@@ -3,6 +3,7 @@
 open System.IO
 open System.IO.Abstractions.TestingHelpers
 open ApiSurface
+open FsCheck.FSharp
 open NUnit.Framework
 open FsUnitTyped
 open FsCheck
@@ -125,12 +126,12 @@ module TestVersionFile =
 
     let versionFileGen : Gen<VersionFile> =
         gen {
-            let! major = Arb.generate<int>
+            let! major = ArbMap.defaults |> ArbMap.generate<int>
             let major = abs major
-            let! minor = Arb.generate<int>
+            let! minor = ArbMap.defaults |> ArbMap.generate<int>
             let minor = abs minor
-            let! releaseRefSpec = Arb.generate<NonNull<string> list>
-            let! pathFilters = Arb.generate<NonNull<string> list option>
+            let! releaseRefSpec = ArbMap.defaults |> ArbMap.generate<NonNull<string> list>
+            let! pathFilters = ArbMap.defaults |> ArbMap.generate<NonNull<string> list option>
 
             return
                 {