Skip to content

Commit 449e65d

Browse files
committed
C#: Update expected outputs.
1 parent d5a4dce commit 449e65d

File tree

5 files changed

+13
-14
lines changed

5 files changed

+13
-14
lines changed

csharp/ql/test/library-tests/cil/dataflow/CallableReturns.expected

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@ alwaysNonNull
2727
| System.Text.Encoder System.Text.ASCIIEncoding.GetEncoder() |
2828
| System.Text.Encoder System.Text.Encoding.GetEncoder() |
2929
| System.Text.Encoder System.Text.EncodingNLS.GetEncoder() |
30-
| System.Text.Encoder System.Text.OSEncoding.GetEncoder() |
3130
| System.Text.Encoder System.Text.UTF7Encoding.GetEncoder() |
3231
| System.Text.Encoder System.Text.UTF8Encoding.GetEncoder() |
3332
| System.Text.Encoder System.Text.UTF32Encoding.GetEncoder() |

csharp/ql/test/library-tests/cil/dataflow/CallableReturns.ql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import cil
22
import semmle.code.cil.CallableReturns
33

44
predicate relevantMethod(CIL::Method m) {
5-
m.getName() = "GetEncoder"
5+
m.getName() = "GetEncoder" and not m.getDeclaringType().getName() = "OSEncoding"
66
or
77
m.getName() = "get_Item"
88
or

csharp/ql/test/library-tests/cil/pdbs/InstructionLocations.expected

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,11 @@
3131
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:10:4:10:19 | 24: br.s 25: |
3232
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:11:3:11:4 | 25: ldloc.3 |
3333
| C:/dev/projects/Sandbox/PortablePdb/Class1.cs:11:3:11:4 | 26: ret |
34-
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral | 0: ldarg.0 |
35-
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral | 1: call System.Object..ctor |
36-
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral | 2: nop |
37-
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral | 3: ret |
38-
| PortablePdb, Version=1.0.0.0, Culture=neutral | 0: ldarg.0 |
39-
| PortablePdb, Version=1.0.0.0, Culture=neutral | 1: call System.Object..ctor |
40-
| PortablePdb, Version=1.0.0.0, Culture=neutral | 2: nop |
41-
| PortablePdb, Version=1.0.0.0, Culture=neutral | 3: ret |
34+
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 0: ldarg.0 |
35+
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 1: call System.Object..ctor |
36+
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 2: nop |
37+
| EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 3: ret |
38+
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 0: ldarg.0 |
39+
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 1: call System.Object..ctor |
40+
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 2: nop |
41+
| PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | 3: ret |
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
| System.Int32 EmbeddedPdb.Class1.Method() | C:/dev/projects/Sandbox/EmbeddedPdb/Class1.cs:6:3:6:4 | true |
2-
| System.Int32 EmbeddedPdb.Class1.Method() | EmbeddedPdb, Version=1.0.0.0, Culture=neutral | false |
2+
| System.Int32 EmbeddedPdb.Class1.Method() | EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | false |
33
| System.Int32 PortablePdb.Class1.Factorial(System.Int32) | C:/dev/projects/Sandbox/PortablePdb/Class1.cs:6:3:6:4 | true |
4-
| System.Int32 PortablePdb.Class1.Factorial(System.Int32) | PortablePdb, Version=1.0.0.0, Culture=neutral | false |
4+
| System.Int32 PortablePdb.Class1.Factorial(System.Int32) | PortablePdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null | false |
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
| EmbeddedPdb.dll:0:0:0:0 | EmbeddedPdb, Version=1.0.0.0, Culture=neutral |
2-
| PdbOnly.dll:0:0:0:0 | PdbOnly, Version=1.0.0.0, Culture=neutral |
1+
| EmbeddedPdb.dll:0:0:0:0 | EmbeddedPdb, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null |
2+
| PdbOnly.dll:0:0:0:0 | PdbOnly, Version=1.0.0.0, Culture=neutral, PublicKeyToken=null |

0 commit comments

Comments
 (0)