Skip to content

Commit b742ed2

Browse files
authored
Merge branch 'rc/3.17' into changedocs-2.20.6
2 parents 65d5e52 + 16e84d0 commit b742ed2

File tree

39 files changed

+42
-39
lines changed

39 files changed

+42
-39
lines changed

actions/ql/lib/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/actions-all
2-
version: 0.4.4
2+
version: 0.4.5-dev
33
library: true
44
warnOnImplicitThis: true
55
dependencies:

actions/ql/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/actions-queries
2-
version: 0.5.1
2+
version: 0.5.2-dev
33
library: false
44
warnOnImplicitThis: true
55
groups: [actions, queries]

cpp/ql/lib/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/cpp-all
2-
version: 4.0.2
2+
version: 4.0.3-dev
33
groups: cpp
44
dbscheme: semmlecode.cpp.dbscheme
55
extractor: cpp

cpp/ql/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/cpp-queries
2-
version: 1.3.5
2+
version: 1.3.6-dev
33
groups:
44
- cpp
55
- queries

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/csharp-solorigate-all
2-
version: 1.7.35
2+
version: 1.7.36-dev
33
groups:
44
- csharp
55
- solorigate

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/csharp-solorigate-queries
2-
version: 1.7.35
2+
version: 1.7.36-dev
33
groups:
44
- csharp
55
- solorigate

csharp/ql/lib/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/csharp-all
2-
version: 5.1.1
2+
version: 5.1.2-dev
33
groups: csharp
44
dbscheme: semmlecode.csharp.dbscheme
55
extractor: csharp

csharp/ql/src/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql/csharp-queries
2-
version: 1.0.18
2+
version: 1.0.19-dev
33
groups:
44
- csharp
55
- queries

go/extractor/util/util.go

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -307,5 +307,8 @@ func fileExists(path string) bool {
307307
// and contains a `modules.txt` file.
308308
func IsGolangVendorDirectory(dirPath string) bool {
309309
return filepath.Base(dirPath) == "vendor" &&
310-
(fileExists(filepath.Join(dirPath, "modules.txt")) || fileExists(filepath.Join(dirPath, "../glide.yaml")))
310+
(fileExists(filepath.Join(dirPath, "modules.txt")) ||
311+
fileExists(filepath.Join(dirPath, "../glide.yaml")) ||
312+
fileExists(filepath.Join(dirPath, "../Gopkg.lock")) ||
313+
fileExists(filepath.Join(dirPath, "../vendor.conf")))
311314
}

go/ql/consistency-queries/qlpack.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
name: codeql-go-consistency-queries
2-
version: 1.0.18
2+
version: 1.0.19-dev
33
groups:
44
- go
55
- queries

0 commit comments

Comments
 (0)