Skip to content

Commit eda7616

Browse files
aeisenbergaeisenberg
authored
Merge pull request github#6514 from github/aeisenberg/pack/java
Packaging: Refactor java and C#
2 parents 3953331 + 8e75fef commit eda7616

File tree

622 files changed

+106
-66
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

622 files changed

+106
-66
lines changed

‎config/identical-files.json

Lines changed: 43 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
{
22
"DataFlow Java/C++/C#/Python": [
3-
"java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl.qll",
4-
"java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl2.qll",
5-
"java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl3.qll",
6-
"java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl4.qll",
7-
"java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl5.qll",
8-
"java/ql/src/semmle/code/java/dataflow/internal/DataFlowImpl6.qll",
9-
"java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll",
3+
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl.qll",
4+
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl2.qll",
5+
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl3.qll",
6+
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl4.qll",
7+
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl5.qll",
8+
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImpl6.qll",
9+
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplForSerializability.qll",
1010
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl.qll",
1111
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl2.qll",
1212
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImpl3.qll",
@@ -16,21 +16,21 @@
1616
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl2.qll",
1717
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl3.qll",
1818
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImpl4.qll",
19-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll",
20-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll",
21-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll",
22-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll",
23-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll",
19+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl.qll",
20+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl2.qll",
21+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl3.qll",
22+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl4.qll",
23+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImpl5.qll",
2424
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl.qll",
2525
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl2.qll",
2626
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl3.qll",
2727
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImpl4.qll"
2828
],
2929
"DataFlow Java/C++/C#/Python Common": [
30-
"java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll",
30+
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplCommon.qll",
3131
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplCommon.qll",
3232
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplCommon.qll",
33-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll",
33+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplCommon.qll",
3434
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImplCommon.qll"
3535
],
3636
"TaintTracking::Configuration Java/C++/C#/Python": [
@@ -39,48 +39,48 @@
3939
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
4040
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
4141
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
42-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
43-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
44-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
45-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingImpl.qll",
46-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll",
47-
"java/ql/src/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
48-
"java/ql/src/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
42+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
43+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
44+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking3/TaintTrackingImpl.qll",
45+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking4/TaintTrackingImpl.qll",
46+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/tainttracking5/TaintTrackingImpl.qll",
47+
"java/ql/lib/semmle/code/java/dataflow/internal/tainttracking1/TaintTrackingImpl.qll",
48+
"java/ql/lib/semmle/code/java/dataflow/internal/tainttracking2/TaintTrackingImpl.qll",
4949
"python/ql/src/semmle/python/dataflow/new/internal/tainttracking1/TaintTrackingImpl.qll",
5050
"python/ql/src/semmle/python/dataflow/new/internal/tainttracking2/TaintTrackingImpl.qll",
5151
"python/ql/src/semmle/python/dataflow/new/internal/tainttracking3/TaintTrackingImpl.qll",
5252
"python/ql/src/semmle/python/dataflow/new/internal/tainttracking4/TaintTrackingImpl.qll"
5353
],
5454
"DataFlow Java/C++/C#/Python Consistency checks": [
55-
"java/ql/src/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll",
55+
"java/ql/lib/semmle/code/java/dataflow/internal/DataFlowImplConsistency.qll",
5656
"cpp/ql/lib/semmle/code/cpp/dataflow/internal/DataFlowImplConsistency.qll",
5757
"cpp/ql/lib/semmle/code/cpp/ir/dataflow/internal/DataFlowImplConsistency.qll",
58-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/DataFlowImplConsistency.qll",
58+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/DataFlowImplConsistency.qll",
5959
"python/ql/src/semmle/python/dataflow/new/internal/DataFlowImplConsistency.qll"
6060
],
6161
"DataFlow Java/C# Flow Summaries": [
62-
"java/ql/src/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll",
63-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll"
62+
"java/ql/lib/semmle/code/java/dataflow/internal/FlowSummaryImpl.qll",
63+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/FlowSummaryImpl.qll"
6464
],
6565
"SsaReadPosition Java/C#": [
66-
"java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll",
67-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll"
66+
"java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll",
67+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SsaReadPositionCommon.qll"
6868
],
6969
"Sign Java/C#": [
70-
"java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll",
71-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll"
70+
"java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/Sign.qll",
71+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/Sign.qll"
7272
],
7373
"SignAnalysis Java/C#": [
74-
"java/ql/src/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll",
75-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll"
74+
"java/ql/lib/semmle/code/java/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll",
75+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/SignAnalysisCommon.qll"
7676
],
7777
"Bound Java/C#": [
78-
"java/ql/src/semmle/code/java/dataflow/Bound.qll",
79-
"csharp/ql/src/semmle/code/csharp/dataflow/Bound.qll"
78+
"java/ql/lib/semmle/code/java/dataflow/Bound.qll",
79+
"csharp/ql/lib/semmle/code/csharp/dataflow/Bound.qll"
8080
],
8181
"ModulusAnalysis Java/C#": [
82-
"java/ql/src/semmle/code/java/dataflow/ModulusAnalysis.qll",
83-
"csharp/ql/src/semmle/code/csharp/dataflow/ModulusAnalysis.qll"
82+
"java/ql/lib/semmle/code/java/dataflow/ModulusAnalysis.qll",
83+
"csharp/ql/lib/semmle/code/csharp/dataflow/ModulusAnalysis.qll"
8484
],
8585
"C++ SubBasicBlocks": [
8686
"cpp/ql/lib/semmle/code/cpp/controlflow/SubBasicBlocks.qll",
@@ -362,8 +362,8 @@
362362
"csharp/ql/src/experimental/ir/implementation/unaliased_ssa/gvn/internal/ValueNumberingImports.qll"
363363
],
364364
"C# ControlFlowReachability": [
365-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/ControlFlowReachability.qll",
366-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/rangeanalysis/ControlFlowReachability.qll"
365+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/ControlFlowReachability.qll",
366+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/rangeanalysis/ControlFlowReachability.qll"
367367
],
368368
"Inline Test Expectations": [
369369
"cpp/ql/test/TestUtilities/InlineExpectationsTest.qll",
@@ -380,8 +380,8 @@
380380
],
381381
"XML": [
382382
"cpp/ql/lib/semmle/code/cpp/XML.qll",
383-
"csharp/ql/src/semmle/code/csharp/XML.qll",
384-
"java/ql/src/semmle/code/xml/XML.qll",
383+
"csharp/ql/lib/semmle/code/csharp/XML.qll",
384+
"java/ql/lib/semmle/code/xml/XML.qll",
385385
"javascript/ql/src/semmle/javascript/XML.qll",
386386
"python/ql/src/semmle/python/xml/XML.qll"
387387
],
@@ -437,10 +437,10 @@
437437
"python/ql/src/analysis/IDEContextual.qll"
438438
],
439439
"SSA C#": [
440-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll",
441-
"csharp/ql/src/semmle/code/csharp/controlflow/internal/pressa/SsaImplCommon.qll",
442-
"csharp/ql/src/semmle/code/csharp/dataflow/internal/basessa/SsaImplCommon.qll",
443-
"csharp/ql/src/semmle/code/cil/internal/SsaImplCommon.qll"
440+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/SsaImplCommon.qll",
441+
"csharp/ql/lib/semmle/code/csharp/controlflow/internal/pressa/SsaImplCommon.qll",
442+
"csharp/ql/lib/semmle/code/csharp/dataflow/internal/basessa/SsaImplCommon.qll",
443+
"csharp/ql/lib/semmle/code/cil/internal/SsaImplCommon.qll"
444444
],
445445
"CryptoAlgorithms Python/JS": [
446446
"javascript/ql/src/semmle/javascript/security/CryptoAlgorithms.qll",

‎csharp/ql/examples/qlpack.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
name: codeql-csharp-examples
22
version: 0.0.0
3-
libraryPathDependencies: codeql-csharp
3+
dependencies:
4+
codeql/csharp-all: ^0.0.1

‎csharp/ql/src/Customizations.qll renamed to ‎csharp/ql/lib/Customizations.qll

File renamed without changes.

‎csharp/ql/src/cil.qll renamed to ‎csharp/ql/lib/cil.qll

File renamed without changes.

‎csharp/ql/src/csharp.qll renamed to ‎csharp/ql/lib/csharp.qll

File renamed without changes.

‎csharp/ql/src/default.qll renamed to ‎csharp/ql/lib/default.qll

File renamed without changes.

‎csharp/ql/src/dotnet.qll renamed to ‎csharp/ql/lib/dotnet.qll

File renamed without changes.

‎csharp/ql/lib/qlpack.yml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
name: codeql/csharp-all
2+
version: 0.0.2
3+
dbscheme: semmlecode.csharp.dbscheme
4+
suites: codeql-suites
5+
extractor: csharp
6+
library: true

‎csharp/ql/src/semmle/code/asp/AspNet.qll renamed to ‎csharp/ql/lib/semmle/code/asp/AspNet.qll

File renamed without changes.

‎csharp/ql/src/semmle/code/asp/WebConfig.qll renamed to ‎csharp/ql/lib/semmle/code/asp/WebConfig.qll

File renamed without changes.

0 commit comments

Comments
 (0)