Merge branch 'main' of https://github.com/github/codeql

csharp/ql/campaigns/Solorigate/lib/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.6.3
+version: 1.6.4-dev
 groups:
     - csharp
     - solorigate

csharp/ql/campaigns/Solorigate/publish.sh

@@ -1,7 +1,7 @@
 #!/bin/sh
 set -e
 
-SOLORIGATE_ROOT="$(dirname $0)"
+SOLORIGATE_ROOT="$(readlink -f "$(dirname $0)")"
 WORKSPACE_ROOT="$SOLORIGATE_ROOT/../../../.."
 GRPS="solorigate,-test"
 

csharp/ql/campaigns/Solorigate/src/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.6.3
+version: 1.6.4-dev
 groups:
     - csharp
     - solorigate

csharp/ql/integration-tests/posix-only/dotnet_test/dotnet_test.csproj

@@ -8,10 +8,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
     <PackageReference Include="NUnit" Version="3.13.3" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.3.0" />
-    <PackageReference Include="coverlet.collector" Version="3.2.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
   </ItemGroup>
 
 </Project>

csharp/ql/integration-tests/posix-only/dotnet_test_mstest/dotnet_test_mstest.csproj

@@ -10,10 +10,10 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.3.2" />
-    <PackageReference Include="MSTest.TestAdapter" Version="2.2.10" />
-    <PackageReference Include="MSTest.TestFramework" Version="2.2.10" />
-    <PackageReference Include="coverlet.collector" Version="3.1.2" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.7.1" />
+    <PackageReference Include="MSTest.TestAdapter" Version="3.1.1" />
+    <PackageReference Include="MSTest.TestFramework" Version="3.1.1" />
+    <PackageReference Include="coverlet.collector" Version="6.0.0" />
   </ItemGroup>
 
 </Project>

csharp/ql/lib/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 0.7.3
+version: 0.7.4-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp

csharp/ql/lib/semmle/code/csharp/Unification.qll

@@ -538,7 +538,8 @@ module Unification {
      *
      * Note: This predicate is inlined.
      */
-    bindingset[t]
+    bindingset[this]
+    pragma[inline_late]
     predicate unifiable(Type t) { none() }
 
     /**
@@ -546,7 +547,8 @@ module Unification {
      *
      * Note: This predicate is inlined.
      */
-    bindingset[t]
+    bindingset[this]
+    pragma[inline_late]
     predicate subsumes(Type t) { none() }
   }
 
@@ -554,7 +556,8 @@ module Unification {
   private class SingleConstraintTypeParameter extends ConstrainedTypeParameter {
     SingleConstraintTypeParameter() { constraintCount = 1 }
 
-    bindingset[t]
+    bindingset[this]
+    pragma[inline_late]
     override predicate unifiable(Type t) {
       exists(TTypeParameterConstraint ttc | ttc = getATypeConstraint(this) |
         ttc = TRefTypeConstraint() and
@@ -567,7 +570,8 @@ module Unification {
       )
     }
 
-    bindingset[t]
+    bindingset[this]
+    pragma[inline_late]
     override predicate subsumes(Type t) {
       exists(TTypeParameterConstraint ttc | ttc = getATypeConstraint(this) |
         ttc = TRefTypeConstraint() and
@@ -585,9 +589,13 @@ module Unification {
   private class MultiConstraintTypeParameter extends ConstrainedTypeParameter {
     MultiConstraintTypeParameter() { constraintCount > 1 }
 
-    bindingset[t]
+    pragma[nomagic]
+    TTypeParameterConstraint getATypeConstraint() { result = getATypeConstraint(this) }
+
+    bindingset[this]
+    pragma[inline_late]
     override predicate unifiable(Type t) {
-      forex(TTypeParameterConstraint ttc | ttc = getATypeConstraint(this) |
+      forex(TTypeParameterConstraint ttc | ttc = this.getATypeConstraint() |
         ttc = TRefTypeConstraint() and
         t.isRefType()
         or
@@ -598,9 +606,10 @@ module Unification {
       )
     }
 
-    bindingset[t]
+    bindingset[this]
+    pragma[inline_late]
     override predicate subsumes(Type t) {
-      forex(TTypeParameterConstraint ttc | ttc = getATypeConstraint(this) |
+      forex(TTypeParameterConstraint ttc | ttc = this.getATypeConstraint() |
         ttc = TRefTypeConstraint() and
         t.isRefType()
         or

csharp/ql/lib/semmle/code/csharp/commons/Assertions.qll

@@ -299,6 +299,12 @@ class NUnitAssertNonNullMethod extends NullnessAssertMethod, NUnitAssertMethod {
   override int getAnAssertionIndex(boolean b) { result = this.getAnAssertionIndex() and b = false }
 }
 
+pragma[nomagic]
+private predicate parameterAssertion(Assertion a, int index, Parameter p) {
+  strictcount(AssignableDefinition def | def.getTarget() = p) = 1 and
+  a.getExpr(index) = p.getAnAccess()
+}
+
 /** A method that forwards to another assertion method. */
 class ForwarderAssertMethod extends AssertMethod {
   private Assertion a;
@@ -307,10 +313,9 @@ class ForwarderAssertMethod extends AssertMethod {
 
   ForwarderAssertMethod() {
     p = this.getAParameter() and
-    strictcount(AssignableDefinition def | def.getTarget() = p) = 1 and
     forex(ControlFlowElement body | body = this.getBody() |
       bodyAsserts(this, body, a) and
-      a.getExpr(forwarderIndex) = p.getAnAccess()
+      parameterAssertion(a, forwarderIndex, p)
     )
   }
 

csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImpl.qll

@@ -1159,6 +1159,7 @@ private predicate adjacentDefReachesUncertainRead(
   )
 }
 
+pragma[nomagic]
 private predicate adjacentDefReachesUncertainReadExt(
   DefinitionExt def, SsaInput::BasicBlock bb1, int i1, SsaInput::BasicBlock bb2, int i2
 ) {

csharp/ql/lib/semmle/code/csharp/dispatch/Dispatch.qll

@@ -862,9 +862,7 @@ private module Internal {
         or
         Unification::subsumes(t, qualifierType)
         or
-        t.(Unification::ConstrainedTypeParameter).unifiable(qualifierType)
-        or
-        qualifierType = t.(Unification::UnconstrainedTypeParameter).getAnUltimatelySuppliedType()
+        qualifierType = t.(TypeParameter).getAnUltimatelySuppliedType()
       )
     }
 

csharp/ql/src/Concurrency/UnsynchronizedStaticAccess.qhelp

@@ -12,7 +12,7 @@ invariants.
 
 <p>
 For example, the behavior of <code>Dictionary</code> when a write happens concurrently with another write or a read is 
-undefined, and frequently leads to data corruption and can lead to ​ issues as serious as livelock.
+undefined, and frequently leads to data corruption and can lead to issues as serious as livelock.
 </p>
 
 </overview>
@@ -35,6 +35,6 @@ dictionary. This means that multiple threads can access the dictionary, potentia
 
 </example>
 <references>
-  <li>MSDN, C# Reference: <a href="https://msdn.microsoft.com/en-us/library/xfhwa508.aspx#Anchor_10">Dictionary: Thread safety</a>.</li>
+  <li>MSDN, C# Reference: <a href="https://learn.microsoft.com/en-us/dotnet/api/system.collections.generic.dictionary-2?#thread-safety">Dictionary: Thread safety</a>.</li>
 </references>
 </qhelp>

csharp/ql/src/qlpack.yml

@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 0.7.3
+version: 0.7.4-dev
 groups: 
   - csharp
   - queries

csharp/ql/test/TestUtilities/InlineExpectationsTest.qll

@@ -3,19 +3,6 @@
  * See `shared/util/codeql/util/test/InlineExpectationsTest.qll`
  */
 
-private import csharp as CS
 private import codeql.util.test.InlineExpectationsTest
-
-private module Impl implements InlineExpectationsTestSig {
-  /**
-   * A class representing line comments in C# used by the InlineExpectations core code
-   */
-  class ExpectationComment extends CS::SinglelineComment {
-    /** Gets the contents of the given comment, _without_ the preceding comment marker (`//`). */
-    string getContents() { result = this.getText() }
-  }
-
-  class Location = CS::Location;
-}
-
+private import internal.InlineExpectationsTestImpl
 import Make<Impl>

csharp/ql/test/TestUtilities/InlineFlowTest.qll

@@ -1,120 +1,34 @@
 /**
- * Provides a simple base test for flow-related tests using inline expectations.
- *
- * Example for a test.ql:
- * ```ql
- * import csharp
- * import TestUtilities.InlineFlowTest
- * import DefaultFlowTest
- * import PathGraph
- *
- * from PathNode source, PathNode sink
- * where flowPath(source, sink)
- * select sink, source, sink, "$@", source, source.toString()
- *
- * ```
- *
- * To declare expectations, you can use the $hasTaintFlow or $hasValueFlow comments within the test source files.
- * Example of the corresponding test file, e.g. Test.cs
- * ```csharp
- * public class Test
- * {
- *     object Source() { return null; }
- *     string Taint() { return null; }
- *     void Sink(object o) { }
- *
- *     public void test()
- *     {
- *         var s = Source(1);
- *         Sink(s); // $ hasValueFlow=1
- *         var t = "foo" + Taint(2);
- *         Sink(t); // $ hasTaintFlow=2
- *     }
- * }
- * ```
- *
- * If you are only interested in value flow, then instead of importing `DefaultFlowTest`, you can import
- * `ValueFlowTest<DefaultFlowConfig>`. Similarly, if you are only interested in taint flow, then instead of
- * importing `DefaultFlowTest`, you can import `TaintFlowTest<DefaultFlowConfig>`. In both cases
- * `DefaultFlowConfig` can be replaced by another implementation of `DataFlow::ConfigSig`.
- *
- * If you need more fine-grained tuning, consider implementing a test using `InlineExpectationsTest`.
+ * Inline flow tests for CSharp.
+ * See `shared/util/codeql/dataflow/test/InlineFlowTest.qll`
  */
 
 import csharp
-import TestUtilities.InlineExpectationsTest
+private import codeql.dataflow.test.InlineFlowTest
+private import semmle.code.csharp.dataflow.internal.DataFlowImplSpecific
+private import semmle.code.csharp.dataflow.internal.TaintTrackingImplSpecific
+private import internal.InlineExpectationsTestImpl
 
-private predicate defaultSource(DataFlow::Node source) {
-  source.asExpr().(MethodCall).getTarget().getUndecoratedName() = ["Source", "Taint"]
-}
-
-private predicate defaultSink(DataFlow::Node sink) {
-  exists(MethodCall mc | mc.getTarget().hasUndecoratedName("Sink") |
-    sink.asExpr() = mc.getAnArgument()
-  )
-}
-
-module DefaultFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { defaultSource(source) }
-
-  predicate isSink(DataFlow::Node sink) { defaultSink(sink) }
-
-  int fieldFlowBranchLimit() { result = 1000 }
-}
-
-private module NoFlowConfig implements DataFlow::ConfigSig {
-  predicate isSource(DataFlow::Node source) { none() }
-
-  predicate isSink(DataFlow::Node sink) { none() }
-}
-
-private string getSourceArgString(DataFlow::Node src) {
-  defaultSource(src) and
-  src.asExpr().(MethodCall).getAnArgument().getValue() = result
-}
-
-module FlowTest<DataFlow::ConfigSig ValueFlowConfig, DataFlow::ConfigSig TaintFlowConfig> {
-  module ValueFlow = DataFlow::Global<ValueFlowConfig>;
-
-  module TaintFlow = TaintTracking::Global<TaintFlowConfig>;
-
-  private module InlineTest implements TestSig {
-    string getARelevantTag() { result = ["hasValueFlow", "hasTaintFlow"] }
-
-    predicate hasActualResult(Location location, string element, string tag, string value) {
-      tag = "hasValueFlow" and
-      exists(DataFlow::Node src, DataFlow::Node sink | ValueFlow::flow(src, sink) |
-        sink.getLocation() = location and
-        element = sink.toString() and
-        if exists(getSourceArgString(src)) then value = getSourceArgString(src) else value = ""
-      )
-      or
-      tag = "hasTaintFlow" and
-      exists(DataFlow::Node src, DataFlow::Node sink |
-        TaintFlow::flow(src, sink) and not ValueFlow::flow(src, sink)
-      |
-        sink.getLocation() = location and
-        element = sink.toString() and
-        if exists(getSourceArgString(src)) then value = getSourceArgString(src) else value = ""
-      )
-    }
+private module FlowTestImpl implements InputSig<CsharpDataFlow> {
+  predicate defaultSource(DataFlow::Node source) {
+    source.asExpr().(MethodCall).getTarget().getUndecoratedName() = ["Source", "Taint"]
   }
 
-  import MakeTest<InlineTest>
-  import DataFlow::MergePathGraph<ValueFlow::PathNode, TaintFlow::PathNode, ValueFlow::PathGraph, TaintFlow::PathGraph>
+  predicate defaultSink(DataFlow::Node sink) {
+    exists(MethodCall mc | mc.getTarget().hasUndecoratedName("Sink") |
+      sink.asExpr() = mc.getAnArgument()
+    )
+  }
 
-  predicate flowPath(PathNode source, PathNode sink) {
-    ValueFlow::flowPath(source.asPathNode1(), sink.asPathNode1()) or
-    TaintFlow::flowPath(source.asPathNode2(), sink.asPathNode2())
+  private string getSourceArgString(DataFlow::Node src) {
+    defaultSource(src) and
+    src.asExpr().(MethodCall).getAnArgument().getValue() = result
+  }
+
+  string getArgString(DataFlow::Node src, DataFlow::Node sink) {
+    (if exists(getSourceArgString(src)) then result = getSourceArgString(src) else result = "") and
+    exists(sink)
   }
 }
 
-module DefaultFlowTest = FlowTest<DefaultFlowConfig, DefaultFlowConfig>;
-
-module ValueFlowTest<DataFlow::ConfigSig ValueFlowConfig> {
-  import FlowTest<ValueFlowConfig, NoFlowConfig>
-}
-
-module TaintFlowTest<DataFlow::ConfigSig TaintFlowConfig> {
-  import FlowTest<NoFlowConfig, TaintFlowConfig>
-}
+import InlineFlowTestMake<CsharpDataFlow, CsharpTaintTracking, Impl, FlowTestImpl>

csharp/ql/test/TestUtilities/internal/InlineExpectationsTestImpl.qll

@@ -0,0 +1,14 @@
+private import csharp as CS
+private import codeql.util.test.InlineExpectationsTest
+
+module Impl implements InlineExpectationsTestSig {
+  /**
+   * A class representing line comments in C# used by the InlineExpectations core code
+   */
+  class ExpectationComment extends CS::SinglelineComment {
+    /** Gets the contents of the given comment, _without_ the preceding comment marker (`//`). */
+    string getContents() { result = this.getText() }
+  }
+
+  class Location = CS::Location;
+}

csharp/ql/test/library-tests/dataflow/fields/FieldFlow.expected

@@ -1,4 +1,3 @@
-failures
 testFailures
 edges
 | A.cs:5:17:5:28 | call to method Source<C> : C | A.cs:6:24:6:24 | access to local variable c : C |

csharp/ql/test/library-tests/dataflow/operators/operatorFlow.expected

@@ -1,4 +1,3 @@
-failures
 testFailures
 edges
 | Operator.cs:9:39:9:39 | x : C | Operator.cs:9:50:9:50 | access to parameter x : C |

csharp/ql/test/library-tests/dataflow/patterns/PatternFlow.expected

@@ -1,4 +1,3 @@
-failures
 testFailures
 edges
 nodes

csharp/ql/test/library-tests/dataflow/tuples/Tuples.expected

@@ -1,4 +1,3 @@
-failures
 testFailures
 edges
 | Tuples.cs:7:18:7:34 | call to method Source<Object> : Object | Tuples.cs:10:21:10:22 | access to local variable o1 : Object |

csharp/ql/test/query-tests/Dead Code/NonAssignedFields/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Dead Code/Tests/options

@@ -1 +1,3 @@
-semmle-extractor-options: /r:System.Dynamic.Runtime.dll /r:System.Linq.Expressions.dll ${testdir}/../../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
+semmle-extractor-options: ${testdir}/../../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs

csharp/ql/test/query-tests/Documentation/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/EmptyBlock/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/CatchOfGenericException/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/ChainedIs/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/DubiousTypeTestOfThis/options

@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Diagnostics.Debug.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/ForeachCapture/options

@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Runtime.Extensions.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/MissedReadonlyOpportunity/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/MissedTernaryOpportunity/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/NestedIf/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/RethrowException/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/SimplifyBoolExpr/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/UselessIsBeforeAs/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/UselessNullCoalescingExpression/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Language Abuse/UselessUpcast/options

@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Linq.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/BadCheckOdd/options

@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Runtime.Extensions.dll /r:System.Linq.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/Collections/ContainerLengthCmpOffByOne/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/Collections/ContainerSizeCmpZero/options

@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Runtime.Extensions.dll /r:System.Collections.dll /r:System.Diagnostics.Debug.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/DangerousNonShortCircuitLogic/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/Dynamic/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/EqualsArray/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/EqualsUsesAs/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/EqualsUsesIs/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/HashedButNoHash/options

@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Runtime.Extensions.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/IncomparableEquals/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/InconsistentCompareTo/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/MishandlingJapaneseEra/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/NestedLoopsSameVariable/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/ObjectComparison/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/RandomUsedOnce/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/RecursiveEquals/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/SelfAssignment/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/StaticFieldWrittenByInstance/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/StringBuilderCharInit/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/UncheckedCastInEquals/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Likely Bugs/UnsafeYearConstruction/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/MagicConstants/options

@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.ComponentModel.Primitives.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Metrics/Files/FLinesOfCommentedCode/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Metrics/RefTypes/TNumberOfFields/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Metrics/Summaries/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Nullness/Implications.ql

@@ -2,5 +2,7 @@ import csharp
 import semmle.code.csharp.controlflow.Guards
 
 query predicate impliesStep(Expr e1, AbstractValue v1, Expr e2, AbstractValue v2) {
+  e1.fromSource() and
+  e2.fromSource() and
   Internal::impliesStep(e1, v1, e2, v2)
 }

csharp/ql/test/query-tests/Nullness/options

@@ -1,2 +1,3 @@
-semmle-extractor-options: /r:System.Linq.dll /r:System.Drawing.Primitives.dll
-semmle-extractor-options: ${testdir}/../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj
+semmle-extractor-options: ${testdir}/../../resources/stubs/Microsoft.VisualStudio.TestTools.UnitTesting.cs

csharp/ql/test/query-tests/Performance/StringBuilderInLoop/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Performance/StringConcatenationInLoop/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Performance/UseTryGetValue/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/ReadOnlyContainer/options

@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Collections.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/UseBraces/options

@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Runtime.Extensions.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Useless Code/DefaultToString/DefaultToString.ql

@@ -8,7 +8,7 @@ class MyDefaultToStringType extends DefaultToStringType {
     string filepath, int startline, int startcolumn, int endline, int endcolumn
   ) {
     exists(Location l | l = this.getLocation() |
-      if l instanceof SourceLocation
+      if this.fromSource()
       then l.hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)
       else
         any(EmptyLocation el).hasLocationInfo(filepath, startline, startcolumn, endline, endcolumn)

csharp/ql/test/query-tests/Useless Code/DefaultToString/options

@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Runtime.Extensions.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Useless Code/IntGetHashCode/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Useless Code/PointlessForwardingMethod/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Useless Code/RedundantToStringCall/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/Useless Code/UnusedLabel/options

@@ -0,0 +1,2 @@
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj

csharp/ql/test/query-tests/WriteOnlyContainer/options

@@ -1 +1,2 @@
-semmle-extractor-options: /r:System.Collections.dll /r:System.Runtime.Extensions.dll /r:System.Linq.Expressions.dll /r:System.Collections.NonGeneric.dll
+semmle-extractor-options: /nostdlib /noconfig
+semmle-extractor-options: --load-sources-from-project:${testdir}/../../resources/stubs/_frameworks/Microsoft.NETCore.App/Microsoft.NETCore.App.csproj