Improve composability of verifyBaseline/verifyILBaseline (#18777)

Author: KevinRansom

tests/FSharp.Compiler.ComponentTests/CompilerDirectives/Nowarn.fs

@@ -113,7 +113,7 @@ module Nowarn =
         || (List.zip expected actual |> List.exists(fun((error, line), d) -> error <> d.Error || line <> d.Range.StartLine))
 
     let private withDiags testId langVersion flags (sources: SourceCodeFileKind list) (expected: (ErrorType * int) list) (result: CompilationResult) =
-        let actual = result.Output.Diagnostics
+        let actual = result.Output.Diagnostics |> List.distinctBy (fun ei -> ei.Range.StartLine, ei.Range.StartColumn, ei.Range.EndLine, ei.Range.EndColumn, ei.Message)
         if testFailed expected actual then
             let sb = new StringBuilder()
             let print (s: string) = sb.AppendLine s |> ignore

tests/FSharp.Compiler.ComponentTests/Conformance/BasicGrammarElements/MethodResolution/MethodResolution.fs

@@ -39,6 +39,7 @@ if returnvalue2<> true && value2 <> 7 then
         compilation
         |> getCompilation
         |> ignoreWarnings
+        |> compile
         |> verifyILBaseline
 
     [<Fact>]

tests/FSharp.Compiler.ComponentTests/Conformance/LexicalFiltering/OffsideExceptions/OffsideExceptions.fs

@@ -38,8 +38,8 @@ module OffsideExceptions =
         |> getCompilation 
         |> asFsx
         |> withLangVersion60
+        |> typecheck
         |> verifyBaseline
-        |> ignore
 
     [<Fact>]
     let RelaxWhitespace2_Indentation() =

tests/FSharp.Compiler.ComponentTests/ConstraintSolver/PrimitiveConstraints.fs

@@ -17,6 +17,7 @@ module PrimitiveConstraints =
     let ``Invalid object constructor`` compilation = // Regression test for FSharp1.0:4189
         compilation
         |> getCompilation
+        |> typecheck
         |> verifyBaseline
 
     [<Fact>]

tests/FSharp.Compiler.ComponentTests/EmittedIL/AsyncExpressionStepping/AsyncExpressionStepping.fs

@@ -14,6 +14,7 @@ module AsyncExpressionStepping =
         |> withEmbeddedPdb
         |> withEmbedAllSource
         |> ignoreWarnings
+        |> compile
         |> verifyBaseline
         |> verifyILBaseline
 

tests/FSharp.Compiler.ComponentTests/EmittedIL/AttributeTargets/AttributeTargets.fs

@@ -14,6 +14,7 @@ module AttributeTargets =
         |> withEmbeddedPdb
         |> withEmbedAllSource
         |> ignoreWarnings
+        |> compile
         |> verifyBaseline
         |> verifyILBaseline
 

tests/FSharp.Compiler.ComponentTests/EmittedIL/CCtorDUWithMember/CCtorDUWithMember.fs

@@ -9,11 +9,13 @@ module CCtorDUWithMember =
     let verifyCompilation compilation =
         compilation
         |> withOptions [ "--test:EmitFeeFeeAs100001" ]
+        |> withNoWarn 988
         |> asExe
         |> withNoOptimize
         |> withEmbeddedPdb
         |> withEmbedAllSource
         |> ignoreWarnings
+        |> compile
         |> verifyBaseline
         |> verifyILBaseline
 
@@ -71,7 +73,7 @@ type ILArrayShape =
         |> asLibrary
         |> withRealInternalSignature realSig
         |> compile
-        |> withILContains [
+        |> verifyILContains [
             """
   .method public hidebysig instance bool 
           Equals(class RealInternalSignature.ILArrayShape obj,
@@ -97,7 +99,7 @@ type ILArrayShape =
         |> asLibrary
         |> withRealInternalSignature realSig
         |> compile
-        |> withILContains [
+        |> verifyILContains [
             """
   .method public hidebysig instance bool 
           Equals(class RealInternalSignature.ILArrayShape obj,
@@ -125,7 +127,7 @@ Module.publicFunction () |> printfn "%b"
         |> asExe
         |> withRealInternalSignature realSig
         |> compileAndRun
-        |> withILContains [
+        |> verifyILContains [
             $$"""
       .method {{expected}} hidebysig instance bool Equals(class RealInternalSignature/Module/DU obj, class [runtime]System.Collections.IEqualityComparer comp) cil managed
       {

tests/FSharp.Compiler.ComponentTests/EmittedIL/CompiledNameAttribute/CompiledNameAttribute.fs

@@ -10,11 +10,13 @@ module CompiledNameAttribute =
         compilation
         |> asFs
         |> withOptions [ "--test:EmitFeeFeeAs100001" ]
+        |> withNoWarn 988
         |> asExe
         |> withNoOptimize
         |> withEmbeddedPdb
         |> withEmbedAllSource
         |> ignoreWarnings
+        |> compile
         |> verifyBaseline
         |> verifyILBaseline
 

tests/FSharp.Compiler.ComponentTests/EmittedIL/ComputationExpressions/ComputationExpressions.fs

@@ -30,6 +30,7 @@ module ComputationExpressions =
         |> withEmbeddedPdb
         |> withEmbedAllSource
         |> ignoreWarnings
+        |> typecheck
         |> verifyILBaseline
 
     [<Theory; FileInlineData("ComputationExpr01.fs", Realsig=BooleanOptions.Both)>]
@@ -85,4 +86,5 @@ module ComputationExpressions =
         ]
         |> withEmbeddedPdb
         |> withEmbedAllSource
+        |> typecheck
         |> verifyILBaseline

tests/FSharp.Compiler.ComponentTests/EmittedIL/ComputedCollections/ComputedCollections.fs

@@ -11,6 +11,7 @@ module ComputedCollections =
         |> withEmbeddedPdb
         |> withEmbedAllSource
         |> ignoreWarnings
+        |> compile
         |> verifyILBaseline
 
     [<Theory; FileInlineData("Int32RangeArrays.fs", Realsig = BooleanOptions.Both, Optimize = BooleanOptions.True)>]