Skip to content

Commit 63c6ddd

Browse files
authored
Merge pull request github#6000 from tamasvajk/feature/extract-non-public-symbols
C#: Change compilation settings to include all non-public symbols
2 parents 8d879fa + 1ce7c63 commit 63c6ddd

File tree

7 files changed

+93
-6
lines changed

7 files changed

+93
-6
lines changed

csharp/extractor/Semmle.Extraction.CSharp/Extractor/Extractor.cs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -416,9 +416,10 @@ private static ExitCode AnalyseTracing(
416416
compilerArguments.CompilationName,
417417
syntaxTrees,
418418
references,
419-
compilerArguments.CompilationOptions.
420-
WithAssemblyIdentityComparer(DesktopAssemblyIdentityComparer.Default).
421-
WithStrongNameProvider(new DesktopStrongNameProvider(compilerArguments.KeyFileSearchPaths))
419+
compilerArguments.CompilationOptions
420+
.WithAssemblyIdentityComparer(DesktopAssemblyIdentityComparer.Default)
421+
.WithStrongNameProvider(new DesktopStrongNameProvider(compilerArguments.KeyFileSearchPaths))
422+
.WithMetadataImportOptions(MetadataImportOptions.All)
422423
);
423424
},
424425
(compilation, options) => analyser.EndInitialize(compilerArguments, options, compilation),

csharp/ql/test/library-tests/conversion/reftype/RefType.expected

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
| Byte[] | Object |
22
| Byte[] | dynamic |
3+
| Byte[][] | Object |
4+
| Byte[][] | dynamic |
35
| C1 | Object |
46
| C1 | dynamic |
57
| C1[] | ICollection<C1> |
@@ -183,6 +185,8 @@
183185
| IReadOnlyList<T4> | dynamic |
184186
| Int16[] | Object |
185187
| Int16[] | dynamic |
188+
| Int32[,] | Object |
189+
| Int32[,] | dynamic |
186190
| Int32[] | Object |
187191
| Int32[] | dynamic |
188192
| Int64[] | Object |
@@ -221,12 +225,15 @@
221225
| T5 | C1 |
222226
| T5 | Object |
223227
| T5 | dynamic |
228+
| UInt16[][] | Object |
229+
| UInt16[][] | dynamic |
224230
| UInt32[] | Object |
225231
| UInt32[] | dynamic |
226232
| UInt64[] | Object |
227233
| UInt64[] | dynamic |
228234
| dynamic | Object |
229235
| null | Byte[] |
236+
| null | Byte[][] |
230237
| null | C1 |
231238
| null | C1[] |
232239
| null | C2 |
@@ -279,6 +286,7 @@
279286
| null | IReadOnlyList<T3> |
280287
| null | IReadOnlyList<T4> |
281288
| null | Int16[] |
289+
| null | Int32[,] |
282290
| null | Int32[] |
283291
| null | Int64[] |
284292
| null | Object |
@@ -289,6 +297,7 @@
289297
| null | T4 |
290298
| null | T4[] |
291299
| null | T5 |
300+
| null | UInt16[][] |
292301
| null | UInt32[] |
293302
| null | UInt64[] |
294303
| null | dynamic |
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import csharp
22

33
from TypeParameter tp
4-
where tp.getConstraints().hasUnmanagedTypeConstraint()
4+
where tp.getConstraints().hasUnmanagedTypeConstraint() and tp.fromSource()
55
select tp, "This type parameter is unmanaged."

csharp/ql/test/library-tests/dataflow/global/GetAnOutNode.expected

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,10 @@
227227
| file://:0:0:0:0 | [summary] call to continuationFunction in ContinueWith | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in ContinueWith |
228228
| file://:0:0:0:0 | [summary] call to continuationFunction in ContinueWith | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in ContinueWith |
229229
| file://:0:0:0:0 | [summary] call to continuationFunction in ContinueWith | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in ContinueWith |
230+
| file://:0:0:0:0 | [summary] call to continuationFunction in ContinueWith | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in ContinueWith |
231+
| file://:0:0:0:0 | [summary] call to continuationFunction in ContinueWith | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in ContinueWith |
232+
| file://:0:0:0:0 | [summary] call to continuationFunction in ContinueWith | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in ContinueWith |
233+
| file://:0:0:0:0 | [summary] call to continuationFunction in ContinueWith | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in ContinueWith |
230234
| file://:0:0:0:0 | [summary] call to elementSelector in GroupBy | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 2 in GroupBy |
231235
| file://:0:0:0:0 | [summary] call to elementSelector in GroupBy | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 2 in GroupBy |
232236
| file://:0:0:0:0 | [summary] call to elementSelector in GroupBy | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 2 in GroupBy |
@@ -313,3 +317,5 @@
313317
| file://:0:0:0:0 | [summary] call to valueFactory in Lazy | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in Lazy |
314318
| file://:0:0:0:0 | [summary] call to valueFactory in Lazy | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in Lazy |
315319
| file://:0:0:0:0 | [summary] call to valueFactory in Lazy | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in Lazy |
320+
| file://:0:0:0:0 | [summary] call to valueFactory in Lazy | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in Lazy |
321+
| file://:0:0:0:0 | [summary] call to valueSelector in Task | normal | file://:0:0:0:0 | [summary] read: return (normal) of argument 0 in Task |

0 commit comments

Comments
 (0)