C#: Start using 'options' files in tests

2025-12-16 16:53:25 +01:00 · 2021-06-29 14:51:02 +02:00
parent d325d2ae81
commit c29d11087b
285 changed files with 323 additions and 166 deletions
--- a/csharp/ql/test/experimental/Security
+++ b/csharp/ql/test/experimental/Security
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Data.Common.dll /r:System.Xml.XmlSerializer.dll /r:System.Runtime.Serialization.Xml.dll /r:System.Runtime.Serialization.Xml.dll /r:System.Collections.dll /r:System.Private.Xml.dll /r:System.Private.DataContractSerialization.dll /r:System.Runtime.Extensions.dll /r:System.ComponentModel.TypeConverter.dll /r:System.Xml.ReaderWriter.dll /r:System.IO.FileSystem.dll
--- a/csharp/ql/test/experimental/Security
+++ b/csharp/ql/test/experimental/Security
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /r:System.Data.Common.dll /r:System.Xml.XmlSerializer.dll /r:System.Runtime.Serialization.Xml.dll /r:System.Runtime.Serialization.Xml.dll /r:System.Collections.dll /r:System.Private.Xml.dll /r:System.Private.DataContractSerialization.dll /r:System.Runtime.Extensions.dll /r:System.ComponentModel.TypeConverter.dll /r:System.Xml.ReaderWriter.dll /r:System.IO.FileSystem.dll
+

 using System;
 using System.Data;
@@ -98,4 +98,4 @@ namespace DataSetSerializationTest
            Console.WriteLine("Hello World!");
        }
    }
-}
+}
--- a/csharp/ql/test/experimental/ir/ir/options
+++ b/csharp/ql/test/experimental/ir/ir/options
@@ -0,0 +1 @@
+semmle-extractor-options: /langversion:preview
--- a/csharp/ql/test/experimental/ir/ir/using.cs
+++ b/csharp/ql/test/experimental/ir/ir/using.cs
@@ -27,4 +27,4 @@ class UsingStmt
    }
 }

-// semmle-extractor-options: /langversion:preview
+
--- a/csharp/ql/test/library-tests/aliases/Program.cs
+++ b/csharp/ql/test/library-tests/aliases/Program.cs
@@ -1,5 +1,5 @@
 /*
-  semmle-extractor-options: /r:asm1=${testdir}/Assembly1.dll /r:asm2=${testdir}/Assembly2.dll
+

  Class is defined in three places, and requires the alias to disambiguate them.
 */
--- a/csharp/ql/test/library-tests/aliases/options
+++ b/csharp/ql/test/library-tests/aliases/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:asm1=${testdir}/Assembly1.dll /r:asm2=${testdir}/Assembly2.dll
--- a/csharp/ql/test/library-tests/asp/basic/Test.cs
+++ b/csharp/ql/test/library-tests/asp/basic/Test.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: ${testdir}/../../../resources/stubs/System.Web.cs /r:System.Collections.Specialized.dll
+

 using System;
 using System.Web;
--- a/csharp/ql/test/library-tests/asp/basic/options
+++ b/csharp/ql/test/library-tests/asp/basic/options
@@ -0,0 +1 @@
+semmle-extractor-options: ${testdir}/../../../resources/stubs/System.Web.cs /r:System.Collections.Specialized.dll
--- a/csharp/ql/test/library-tests/assemblies/Assemblies.cs
+++ b/csharp/ql/test/library-tests/assemblies/Assemblies.cs
@@ -15,4 +15,4 @@ namespace TestAssemblies
    }
 }

-// semmle-extractor-options: /r:System.Runtime.Extensions.dll
+
--- a/csharp/ql/test/library-tests/assemblies/AssemblyInfo.cs
+++ b/csharp/ql/test/library-tests/assemblies/AssemblyInfo.cs
@@ -1,4 +1,4 @@
-//  semmle-extractor-options: /out:Locations.dll
+

 using System.Reflection;

--- a/csharp/ql/test/library-tests/assemblies/options
+++ b/csharp/ql/test/library-tests/assemblies/options
@@ -0,0 +1,2 @@
+semmle-extractor-options: /out:Locations.dll
+semmle-extractor-options: /r:System.Runtime.Extensions.dll
--- a/csharp/ql/test/library-tests/assignables/Assignables.cs
+++ b/csharp/ql/test/library-tests/assignables/Assignables.cs
@@ -139,4 +139,4 @@ class Assignables
    }
 }

-// semmle-extractor-options: /langversion:8.0
+
--- a/csharp/ql/test/library-tests/assignables/options
+++ b/csharp/ql/test/library-tests/assignables/options
@@ -0,0 +1 @@
+semmle-extractor-options: /langversion:8.0
--- a/csharp/ql/test/library-tests/async/async.cs
+++ b/csharp/ql/test/library-tests/async/async.cs
@@ -55,4 +55,4 @@ namespace Semmle
    }
 }

-// semmle-extractor-options: /r:System.Runtime.Extensions.dll /r:System.IO.FileSystem.dll
+
--- a/csharp/ql/test/library-tests/async/options
+++ b/csharp/ql/test/library-tests/async/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Runtime.Extensions.dll /r:System.IO.FileSystem.dll
--- a/csharp/ql/test/library-tests/cil/attributes/Test.cs
+++ b/csharp/ql/test/library-tests/cil/attributes/Test.cs
@@ -1,7 +1,7 @@
-// semmle-extractor-options: --cil
+

 using System;

 class Test
 {
-}
+}
--- a/csharp/ql/test/library-tests/cil/attributes/options
+++ b/csharp/ql/test/library-tests/cil/attributes/options
@@ -0,0 +1 @@
+semmle-extractor-options: --cil
--- a/csharp/ql/test/library-tests/cil/consistency/Program.cs
+++ b/csharp/ql/test/library-tests/cil/consistency/Program.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --cil
+

 using System;

--- a/csharp/ql/test/library-tests/cil/consistency/options
+++ b/csharp/ql/test/library-tests/cil/consistency/options
@@ -0,0 +1 @@
+semmle-extractor-options: --cil
--- a/csharp/ql/test/library-tests/cil/dataflow/dataflow.cs
+++ b/csharp/ql/test/library-tests/cil/dataflow/dataflow.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --cil
+

 using System;

--- a/csharp/ql/test/library-tests/cil/dataflow/options
+++ b/csharp/ql/test/library-tests/cil/dataflow/options
@@ -0,0 +1 @@
+semmle-extractor-options: --cil
--- a/csharp/ql/test/library-tests/cil/enums/Program.cs
+++ b/csharp/ql/test/library-tests/cil/enums/Program.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --cil
+

 using System;

--- a/csharp/ql/test/library-tests/cil/enums/options
+++ b/csharp/ql/test/library-tests/cil/enums/options
@@ -0,0 +1 @@
+semmle-extractor-options: --cil
--- a/csharp/ql/test/library-tests/cil/functionPointers/Test.cs
+++ b/csharp/ql/test/library-tests/cil/functionPointers/Test.cs
@@ -1,7 +1,7 @@
-// semmle-extractor-options: --cil
+

 using System;

 class Test
 {
-}
+}
--- a/csharp/ql/test/library-tests/cil/functionPointers/options
+++ b/csharp/ql/test/library-tests/cil/functionPointers/options
@@ -0,0 +1 @@
+semmle-extractor-options: --cil
--- a/csharp/ql/test/library-tests/cil/init-only-prop/Program.cs
+++ b/csharp/ql/test/library-tests/cil/init-only-prop/Program.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --cil
+

 using System;

--- a/csharp/ql/test/library-tests/cil/init-only-prop/options
+++ b/csharp/ql/test/library-tests/cil/init-only-prop/options
@@ -0,0 +1 @@
+semmle-extractor-options: --cil
--- a/csharp/ql/test/library-tests/cil/pdbs/Pdbs.cs
+++ b/csharp/ql/test/library-tests/cil/pdbs/Pdbs.cs
@@ -1 +1 @@
-// semmle-extractor-options: --cil --pdb
+
--- a/csharp/ql/test/library-tests/cil/pdbs/options
+++ b/csharp/ql/test/library-tests/cil/pdbs/options
@@ -0,0 +1 @@
+semmle-extractor-options: --cil --pdb
--- a/csharp/ql/test/library-tests/cil/regressions/Methods.cs
+++ b/csharp/ql/test/library-tests/cil/regressions/Methods.cs
@@ -1,10 +1,10 @@
-/*
+/*
 * A regression test for the CIL extractor - compiled into Methods.dll
 * This tests the correct extraction of F<T>, and we should end up with
 * 2 constructed methods of F<T>.
 */

-// semmle-extractor-options: --cil
+

 namespace Methods
 {
--- a/csharp/ql/test/library-tests/cil/regressions/options
+++ b/csharp/ql/test/library-tests/cil/regressions/options
@@ -0,0 +1 @@
+semmle-extractor-options: --cil
--- a/csharp/ql/test/library-tests/cil/typeAnnotations/Program.cs
+++ b/csharp/ql/test/library-tests/cil/typeAnnotations/Program.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --cil
+

 using System;

--- a/csharp/ql/test/library-tests/cil/typeAnnotations/options
+++ b/csharp/ql/test/library-tests/cil/typeAnnotations/options
@@ -0,0 +1 @@
+semmle-extractor-options: --cil
--- a/csharp/ql/test/library-tests/commons/Assertions/Assertions.cs
+++ b/csharp/ql/test/library-tests/commons/Assertions/Assertions.cs
@@ -52,4 +52,4 @@ class Assertions
    }
 }

-// semmle-extractor-options: ${testdir}/../../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs /r:System.Diagnostics.Contracts.dll
+
--- a/csharp/ql/test/library-tests/commons/Assertions/options
+++ b/csharp/ql/test/library-tests/commons/Assertions/options
@@ -0,0 +1 @@
+semmle-extractor-options: ${testdir}/../../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs /r:System.Diagnostics.Contracts.dll
--- a/csharp/ql/test/library-tests/commons/Disposal/Disposal.cs
+++ b/csharp/ql/test/library-tests/commons/Disposal/Disposal.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --cil /r:System.Net.Http.dll /r:System.Runtime.Extensions.dll /r:System.Private.Xml.dll
+

 using System;

--- a/csharp/ql/test/library-tests/commons/Disposal/options
+++ b/csharp/ql/test/library-tests/commons/Disposal/options
@@ -0,0 +1 @@
+semmle-extractor-options: --cil /r:System.Net.Http.dll /r:System.Runtime.Extensions.dll /r:System.Private.Xml.dll
--- a/csharp/ql/test/library-tests/commons/GeneratedCode/NonGeneratedCode.cs
+++ b/csharp/ql/test/library-tests/commons/GeneratedCode/NonGeneratedCode.cs
@@ -2,4 +2,4 @@ using System;

 class NonGeneratedCode { }

-// semmle-extractor-options: /r:System.Diagnostics.Tools.dll
+
--- a/csharp/ql/test/library-tests/commons/GeneratedCode/options
+++ b/csharp/ql/test/library-tests/commons/GeneratedCode/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Diagnostics.Tools.dll
--- a/csharp/ql/test/library-tests/controlflow/graph/ExitMethods.cs
+++ b/csharp/ql/test/library-tests/controlflow/graph/ExitMethods.cs
@@ -147,4 +147,4 @@ class ExitMethods
    }
 }

-// semmle-extractor-options: ${testdir}/../../../resources/stubs/System.Windows.cs  ${testdir}/../../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs
+
--- a/csharp/ql/test/library-tests/controlflow/graph/cflow.cs
+++ b/csharp/ql/test/library-tests/controlflow/graph/cflow.cs
@@ -301,4 +301,4 @@ class NegationInConstructor
    }
 }

-// semmle-extractor-options: /r:System.Linq.dll /r:System.Runtime.Extensions.dll
+
--- a/csharp/ql/test/library-tests/controlflow/graph/options
+++ b/csharp/ql/test/library-tests/controlflow/graph/options
@@ -0,0 +1,2 @@
+semmle-extractor-options: /r:System.Linq.dll /r:System.Runtime.Extensions.dll
+semmle-extractor-options: ${testdir}/../../../resources/stubs/System.Windows.cs  ${testdir}/../../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs
--- a/csharp/ql/test/library-tests/controlflow/guards/Assert.cs
+++ b/csharp/ql/test/library-tests/controlflow/guards/Assert.cs
@@ -95,4 +95,4 @@ class AssertTests
    }
 }

-// semmle-extractor-options: ${testdir}/../../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs
+
--- a/csharp/ql/test/library-tests/controlflow/guards/Collections.cs
+++ b/csharp/ql/test/library-tests/controlflow/guards/Collections.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /r:System.Collections.Specialized.dll /r:System.Collections.dll /r:System.Linq.dll
+
 using System;
 using System.Collections;
 using System.Collections.Generic;
--- a/csharp/ql/test/library-tests/controlflow/guards/ExtractorOptions.cs
+++ b/csharp/ql/test/library-tests/controlflow/guards/ExtractorOptions.cs
@@ -1,2 +1,2 @@
-// semmle-extractor-options: --cil
+
 #nullable enable
--- a/csharp/ql/test/library-tests/controlflow/guards/options
+++ b/csharp/ql/test/library-tests/controlflow/guards/options
@@ -0,0 +1,3 @@
+semmle-extractor-options: --cil
+semmle-extractor-options: ${testdir}/../../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs
+semmle-extractor-options: /r:System.Collections.Specialized.dll /r:System.Collections.dll /r:System.Linq.dll
--- a/csharp/ql/test/library-tests/conversion/boxing/Boxing.cs
+++ b/csharp/ql/test/library-tests/conversion/boxing/Boxing.cs
@@ -46,4 +46,4 @@ class C<T1, T2, T3, T4, T5, T6>
    }
 }

-// semmle-extractor-options: /r:System.Dynamic.Runtime.dll /r:System.Linq.Expressions.dll
+
--- a/csharp/ql/test/library-tests/conversion/boxing/options
+++ b/csharp/ql/test/library-tests/conversion/boxing/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Dynamic.Runtime.dll /r:System.Linq.Expressions.dll
--- a/csharp/ql/test/library-tests/conversion/identity/Identity.cs
+++ b/csharp/ql/test/library-tests/conversion/identity/Identity.cs
@@ -29,4 +29,4 @@ class C<T>
    }
 }

-// semmle-extractor-options: /r:System.Dynamic.Runtime.dll /r:System.Linq.Expressions.dll
+
--- a/csharp/ql/test/library-tests/conversion/identity/options
+++ b/csharp/ql/test/library-tests/conversion/identity/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Dynamic.Runtime.dll /r:System.Linq.Expressions.dll
--- a/csharp/ql/test/library-tests/conversion/reftype/RefType.cs
+++ b/csharp/ql/test/library-tests/conversion/reftype/RefType.cs
@@ -92,4 +92,4 @@ class C3<T5, T6> where T5 : C1
    public I4<T5, T6> M(I4<C1, T6> x) => x;
 }

-// semmle-extractor-options: /r:System.Dynamic.Runtime.dll /r:System.Linq.Expressions.dll
+
--- a/csharp/ql/test/library-tests/conversion/reftype/options
+++ b/csharp/ql/test/library-tests/conversion/reftype/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Dynamic.Runtime.dll /r:System.Linq.Expressions.dll
--- a/csharp/ql/test/library-tests/csharp6/csharp6.cs
+++ b/csharp/ql/test/library-tests/csharp6/csharp6.cs
@@ -1,4 +1,4 @@
-/*
+/*
  Testcase covering C# 6.0 features
 */

@@ -80,4 +80,4 @@ class IndexInitializers
    }
 }

-// semmle-extractor-options: /r:System.Linq.dll /langerversion:6.0
+
--- a/csharp/ql/test/library-tests/csharp6/options
+++ b/csharp/ql/test/library-tests/csharp6/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Linq.dll /langerversion:6.0
--- a/csharp/ql/test/library-tests/csharp7.1/csharp71.cs
+++ b/csharp/ql/test/library-tests/csharp7.1/csharp71.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /langversion:latest
+

 class DefaultLiterals
 {
--- a/csharp/ql/test/library-tests/csharp7.1/options
+++ b/csharp/ql/test/library-tests/csharp7.1/options
@@ -0,0 +1 @@
+semmle-extractor-options: /langversion:latest
--- a/csharp/ql/test/library-tests/csharp7.2/csharp72.cs
+++ b/csharp/ql/test/library-tests/csharp7.2/csharp72.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /langversion:latest
+

 using System;

--- a/csharp/ql/test/library-tests/csharp7.2/options
+++ b/csharp/ql/test/library-tests/csharp7.2/options
@@ -0,0 +1 @@
+semmle-extractor-options: /langversion:latest
--- a/csharp/ql/test/library-tests/csharp7.3/csharp73.cs
+++ b/csharp/ql/test/library-tests/csharp7.3/csharp73.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /langversion:latest
+

 using System;

--- a/csharp/ql/test/library-tests/csharp7.3/options
+++ b/csharp/ql/test/library-tests/csharp7.3/options
@@ -0,0 +1 @@
+semmle-extractor-options: /langversion:latest
--- a/csharp/ql/test/library-tests/csharp7/CSharp7.cs
+++ b/csharp/ql/test/library-tests/csharp7/CSharp7.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /r:System.Linq.dll
+

 using System;
 using System.Linq;
--- a/csharp/ql/test/library-tests/csharp7/options
+++ b/csharp/ql/test/library-tests/csharp7/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Linq.dll
--- a/csharp/ql/test/library-tests/csharp8/AsyncStreams.cs
+++ b/csharp/ql/test/library-tests/csharp8/AsyncStreams.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /r:System.Threading.Tasks.dll /r:System.Threading.Tasks.Extensions.dll /r:netstandard.dll /langversion:preview
+

 using System;
 using System.Collections.Generic;
--- a/csharp/ql/test/library-tests/csharp8/StaticLocalFunctions.cs
+++ b/csharp/ql/test/library-tests/csharp8/StaticLocalFunctions.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /langversion:8.0
+

 using System;

--- a/csharp/ql/test/library-tests/csharp8/options
+++ b/csharp/ql/test/library-tests/csharp8/options
@@ -0,0 +1,3 @@
+semmle-extractor-options: /langversion:8.0
+semmle-extractor-options: /r:System.Threading.Tasks.dll /r:System.Threading.Tasks.Extensions.dll /r:netstandard.dll /langversion:preview
+semmle-extractor-options: /langversion:8.0
--- a/csharp/ql/test/library-tests/csharp8/ranges.cs
+++ b/csharp/ql/test/library-tests/csharp8/ranges.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /langversion:8.0
+

 using System;

--- a/csharp/ql/test/library-tests/csharp9/GlobalStmt.cs
+++ b/csharp/ql/test/library-tests/csharp9/GlobalStmt.cs
@@ -1,7 +1,7 @@
 /*
  Global statements are not allowed in 'library' target.

-  semmle-extractor-options: --standalone
+
 */

 using System;
@@ -22,4 +22,4 @@ public class Attr : Attribute
  {
    Console.WriteLine("3");
  }
-}
+}
--- a/csharp/ql/test/library-tests/csharp9/options
+++ b/csharp/ql/test/library-tests/csharp9/options
@@ -0,0 +1 @@
+semmle-extractor-options: --standalone
--- a/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.cs
+++ b/csharp/ql/test/library-tests/dataflow/collections/CollectionFlow.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /r:System.Linq.dll
+
 using System;
 using System.Collections.Generic;
 using System.Linq;
--- a/csharp/ql/test/library-tests/dataflow/collections/options
+++ b/csharp/ql/test/library-tests/dataflow/collections/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Linq.dll
--- a/csharp/ql/test/library-tests/dataflow/flowsources/remote/Controller.cs
+++ b/csharp/ql/test/library-tests/dataflow/flowsources/remote/Controller.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /r:System.Net.dll /r:System.Web.dll /r:System.Net.HttpListener.dll /r:System.Collections.Specialized.dll /r:System.Private.Uri.dll /r:System.Security.Cryptography.X509Certificates.dll ${testdir}/../../../../resources/stubs/System.Web.cs
+

 using System.Web.Http;
 using System.Web.Mvc;
--- a/csharp/ql/test/library-tests/dataflow/flowsources/remote/options
+++ b/csharp/ql/test/library-tests/dataflow/flowsources/remote/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Net.dll /r:System.Web.dll /r:System.Net.HttpListener.dll /r:System.Collections.Specialized.dll /r:System.Private.Uri.dll /r:System.Security.Cryptography.X509Certificates.dll ${testdir}/../../../../resources/stubs/System.Web.cs
--- a/csharp/ql/test/library-tests/dataflow/global/GlobalDataFlow.cs
+++ b/csharp/ql/test/library-tests/dataflow/global/GlobalDataFlow.cs
@@ -503,4 +503,4 @@ static class IEnumerableExtensions
    }
 }

-// semmle-extractor-options: /r:System.Diagnostics.Process.dll /r:System.Linq.dll /r:System.Linq.Expressions.dll /r:System.Linq.Queryable.dll /r:System.ComponentModel.Primitives.dll
+
--- a/csharp/ql/test/library-tests/dataflow/global/options
+++ b/csharp/ql/test/library-tests/dataflow/global/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Diagnostics.Process.dll /r:System.Linq.dll /r:System.Linq.Expressions.dll /r:System.Linq.Queryable.dll /r:System.ComponentModel.Primitives.dll
--- a/csharp/ql/test/library-tests/dataflow/library/LibraryTypeDataFlow.cs
+++ b/csharp/ql/test/library-tests/dataflow/library/LibraryTypeDataFlow.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /r:System.Net.dll /r:System.Web.dll /r:System.Net.HttpListener.dll /r:System.Collections.Specialized.dll /r:System.Private.Uri.dll /r:System.Runtime.Extensions.dll /r:System.Linq.Parallel.dll /r:System.Collections.Concurrent.dll /r:System.Linq.Expressions.dll /r:System.Collections.dll /r:System.Linq.Queryable.dll /r:System.Linq.dll /r:System.Collections.NonGeneric.dll /r:System.ObjectModel.dll /r:System.ComponentModel.TypeConverter.dll /r:System.IO.Compression.dll /r:System.IO.Pipes.dll /r:System.Net.Primitives.dll /r:System.Net.Security.dll /r:System.Security.Cryptography.Primitives.dll /r:System.Text.RegularExpressions.dll ${testdir}/../../../resources/stubs/System.Web.cs /r:System.Runtime.Serialization.Primitives.dll
+
 using System;
 using System.IO;
 using System.Text;
--- a/csharp/ql/test/library-tests/dataflow/library/options
+++ b/csharp/ql/test/library-tests/dataflow/library/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Net.dll /r:System.Web.dll /r:System.Net.HttpListener.dll /r:System.Collections.Specialized.dll /r:System.Private.Uri.dll /r:System.Runtime.Extensions.dll /r:System.Linq.Parallel.dll /r:System.Collections.Concurrent.dll /r:System.Linq.Expressions.dll /r:System.Collections.dll /r:System.Linq.Queryable.dll /r:System.Linq.dll /r:System.Collections.NonGeneric.dll /r:System.ObjectModel.dll /r:System.ComponentModel.TypeConverter.dll /r:System.IO.Compression.dll /r:System.IO.Pipes.dll /r:System.Net.Primitives.dll /r:System.Net.Security.dll /r:System.Security.Cryptography.Primitives.dll /r:System.Text.RegularExpressions.dll ${testdir}/../../../resources/stubs/System.Web.cs /r:System.Runtime.Serialization.Primitives.dll
--- a/csharp/ql/test/library-tests/dataflow/local/SSA.cs
+++ b/csharp/ql/test/library-tests/dataflow/local/SSA.cs
@@ -181,4 +181,4 @@ public class Ssa
    }
 }

-// semmle-extractor-options: /r:System.Collections.dll /r:System.Collections.Specialized.dll /r:System.Linq.dll /r:System.Private.Uri.dll /r:System.Runtime.Extensions.dll
+
--- a/csharp/ql/test/library-tests/dataflow/local/options
+++ b/csharp/ql/test/library-tests/dataflow/local/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Collections.dll /r:System.Collections.Specialized.dll /r:System.Linq.dll /r:System.Private.Uri.dll /r:System.Runtime.Extensions.dll
--- a/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.cs
+++ b/csharp/ql/test/library-tests/dataflow/signanalysis/SignAnalysis.cs
@@ -488,4 +488,4 @@ class SignAnalysis
    }
 }

-// semmle-extractor-options: /r:System.Linq.dll
+
--- a/csharp/ql/test/library-tests/dataflow/signanalysis/options
+++ b/csharp/ql/test/library-tests/dataflow/signanalysis/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Linq.dll
--- a/csharp/ql/test/library-tests/dataflow/ssa/Tuples.cs
+++ b/csharp/ql/test/library-tests/dataflow/ssa/Tuples.cs
@@ -36,4 +36,4 @@ class Tuples
    static void Use<T>(T u) { }
 }

-// semmle-extractor-options: /r:System.Diagnostics.Process.dll /r:System.Linq.dll /r:System.Linq.Expressions.dll /r:System.Linq.Queryable.dll /r:System.ComponentModel.Primitives.dll
+
--- a/csharp/ql/test/library-tests/dataflow/ssa/options
+++ b/csharp/ql/test/library-tests/dataflow/ssa/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Diagnostics.Process.dll /r:System.Linq.dll /r:System.Linq.Expressions.dll /r:System.Linq.Queryable.dll /r:System.ComponentModel.Primitives.dll
--- a/csharp/ql/test/library-tests/diagnostics/Program.cs
+++ b/csharp/ql/test/library-tests/diagnostics/Program.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --standalone
+

 using System;

--- a/csharp/ql/test/library-tests/diagnostics/options
+++ b/csharp/ql/test/library-tests/diagnostics/options
@@ -0,0 +1 @@
+semmle-extractor-options: --standalone
--- a/csharp/ql/test/library-tests/dispatch/Dynamic.cs
+++ b/csharp/ql/test/library-tests/dispatch/Dynamic.cs
@@ -1,4 +1,4 @@
-using System; // semmle-extractor-options: /r:System.Dynamic.Runtime.dll /r:System.Linq.Expressions.dll
+
 using System.Collections.Generic;
 using System.Reflection;

--- a/csharp/ql/test/library-tests/dispatch/options
+++ b/csharp/ql/test/library-tests/dispatch/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.Dynamic.Runtime.dll /r:System.Linq.Expressions.dll
--- a/csharp/ql/test/library-tests/encoding/SBCS.cs
+++ b/csharp/ql/test/library-tests/encoding/SBCS.cs
@@ -1,6 +1,6 @@
-//  semmle-extractor-options: /codepage:1252
+

 class SBCS
 {
-    string sbcs = "<22>";
+    string sbcs = "<22>";
 }
--- a/csharp/ql/test/library-tests/encoding/options
+++ b/csharp/ql/test/library-tests/encoding/options
@@ -0,0 +1 @@
+semmle-extractor-options: /codepage:1252
--- a/csharp/ql/test/library-tests/exprorstmtparent/B.cs
+++ b/csharp/ql/test/library-tests/exprorstmtparent/B.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /out:test.dll
+

 class C1
 {
--- a/csharp/ql/test/library-tests/exprorstmtparent/options
+++ b/csharp/ql/test/library-tests/exprorstmtparent/options
@@ -0,0 +1 @@
+semmle-extractor-options: /out:test.dll
--- a/csharp/ql/test/library-tests/filters/ClassifyFiles/VisualStudioTest.cs
+++ b/csharp/ql/test/library-tests/filters/ClassifyFiles/VisualStudioTest.cs
@@ -25,4 +25,4 @@ namespace VisualStudioTests
    }
 }

-// semmle-extractor-options: ${testdir}/../../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs
+
--- a/csharp/ql/test/library-tests/filters/ClassifyFiles/options
+++ b/csharp/ql/test/library-tests/filters/ClassifyFiles/options
@@ -0,0 +1 @@
+semmle-extractor-options: ${testdir}/../../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs
--- a/csharp/ql/test/library-tests/frameworks/EntityFramework/EntityFramework.cs
+++ b/csharp/ql/test/library-tests/frameworks/EntityFramework/EntityFramework.cs
@@ -1,5 +1,5 @@
-// semmle-extractor-options: /r:System.Data.dll /r:System.ComponentModel.Primitives.dll /r:System.ComponentModel.TypeConverter.dll ${testdir}/../../../resources/stubs/EntityFramework.cs ${testdir}/../../../resources/stubs/System.Data.cs /r:System.ComponentModel.TypeConverter.dll /r:System.Data.Common.dll /r:System.Linq.dll
-// semmle-extractor-options: ${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/System.ComponentModel.Annotations.cs ${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/System.ComponentModel.cs
+
+
 using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Data.Entity;
@@ -225,4 +225,4 @@ namespace EFTests
        {
        }
    }
-}
+}
--- a/csharp/ql/test/library-tests/frameworks/EntityFramework/options
+++ b/csharp/ql/test/library-tests/frameworks/EntityFramework/options
@@ -0,0 +1,2 @@
+semmle-extractor-options: /r:System.Data.dll /r:System.ComponentModel.Primitives.dll /r:System.ComponentModel.TypeConverter.dll ${testdir}/../../../resources/stubs/EntityFramework.cs ${testdir}/../../../resources/stubs/System.Data.cs /r:System.ComponentModel.TypeConverter.dll /r:System.Data.Common.dll /r:System.Linq.dll
+semmle-extractor-options: ${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/System.ComponentModel.Annotations.cs ${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/System.ComponentModel.cs
--- a/csharp/ql/test/library-tests/frameworks/JsonNET/Json.cs
+++ b/csharp/ql/test/library-tests/frameworks/JsonNET/Json.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /nostdlib /noconfig --load-sources-from-project:../../../resources/stubs/Newtonsoft.Json/13.0.1/Newtonsoft.Json.csproj
+

 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
--- a/csharp/ql/test/library-tests/frameworks/JsonNET/options
+++ b/csharp/ql/test/library-tests/frameworks/JsonNET/options
@@ -0,0 +1 @@
+semmle-extractor-options: /nostdlib /noconfig --load-sources-from-project:../../../resources/stubs/Newtonsoft.Json/13.0.1/Newtonsoft.Json.csproj
--- a/csharp/ql/test/library-tests/frameworks/NHibernate/nhibernate.cs
+++ b/csharp/ql/test/library-tests/frameworks/NHibernate/nhibernate.cs
@@ -1,4 +1,4 @@
-// semmle-extractor-options: /nostdlib /noconfig --load-sources-from-project:../../../resources/stubs/NHibernate/5.3.8/NHibernate.csproj
+


 using NHibernate;
--- a/csharp/ql/test/library-tests/frameworks/NHibernate/options
+++ b/csharp/ql/test/library-tests/frameworks/NHibernate/options
@@ -0,0 +1 @@
+semmle-extractor-options: /nostdlib /noconfig --load-sources-from-project:../../../resources/stubs/NHibernate/5.3.8/NHibernate.csproj
--- a/csharp/ql/test/library-tests/frameworks/system/Dispose/Dispose.cs
+++ b/csharp/ql/test/library-tests/frameworks/system/Dispose/Dispose.cs
@@ -33,4 +33,4 @@ struct Dispose1Struct : IDisposable
    public void Dispose() { }
 }

-// semmle-extractor-options: /r:System.ComponentModel.Primitives.dll
+
--- a/csharp/ql/test/library-tests/frameworks/system/Dispose/options
+++ b/csharp/ql/test/library-tests/frameworks/system/Dispose/options
@@ -0,0 +1 @@
+semmle-extractor-options: /r:System.ComponentModel.Primitives.dll
--- a/Show More
+++ b/Show More
				`@@ -0,0 +1 @@`
				`semmle-extractor-options: /r:System.Data.Common.dll /r:System.Xml.XmlSerializer.dll /r:System.Runtime.Serialization.Xml.dll /r:System.Runtime.Serialization.Xml.dll /r:System.Collections.dll /r:System.Private.Xml.dll /r:System.Private.DataContractSerialization.dll /r:System.Runtime.Extensions.dll /r:System.ComponentModel.TypeConverter.dll /r:System.Xml.ReaderWriter.dll /r:System.IO.FileSystem.dll`
				`@@ -0,0 +1 @@`
				`semmle-extractor-options: /langversion:preview`
				`@@ -0,0 +1 @@`
				`semmle-extractor-options: /r:asm1=${testdir}/Assembly1.dll /r:asm2=${testdir}/Assembly2.dll`
				`@@ -0,0 +1 @@`
				`semmle-extractor-options: ${testdir}/../../../resources/stubs/System.Web.cs /r:System.Collections.Specialized.dll`
				`@@ -0,0 +1 @@`
				`semmle-extractor-options: /r:System.Runtime.Extensions.dll /r:System.IO.FileSystem.dll`
				`@@ -0,0 +1 @@`
				`semmle-extractor-options: --cil /r:System.Net.Http.dll /r:System.Runtime.Extensions.dll /r:System.Private.Xml.dll`
				`@@ -0,0 +1 @@`
				`semmle-extractor-options: /r:System.Diagnostics.Tools.dll`
				`@@ -0,0 +1 @@`
				`semmle-extractor-options: /r:System.Dynamic.Runtime.dll /r:System.Linq.Expressions.dll`
				`@@ -0,0 +1 @@`
				`semmle-extractor-options: /r:System.Linq.dll /langerversion:6.0`
				`@@ -0,0 +1 @@`
				`semmle-extractor-options: /r:System.Net.dll /r:System.Web.dll /r:System.Net.HttpListener.dll /r:System.Collections.Specialized.dll /r:System.Private.Uri.dll /r:System.Security.Cryptography.X509Certificates.dll ${testdir}/../../../../resources/stubs/System.Web.cs`