From d8e4e25c1e0fca628ff0b29bc297468fa8cc77b2 Mon Sep 17 00:00:00 2001
From: Andrew Eisenberg <aeisenberg@github.com>
Date: Tue, 17 Aug 2021 09:29:08 -0700
Subject: [PATCH] Packaging: Fix query pack references

We can't have recursive references to query packs.
---
 cpp/ql/src/codeql-suites/cpp-code-scanning.qls        | 2 +-
 cpp/ql/src/codeql-suites/cpp-lgtm-full.qls            | 2 +-
 cpp/ql/src/codeql-suites/cpp-security-and-quality.qls | 2 +-
 cpp/ql/src/codeql-suites/cpp-security-extended.qls    | 2 +-
 cpp/ql/test/qlpack.yml                                | 4 +++-
 5 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/cpp/ql/src/codeql-suites/cpp-code-scanning.qls b/cpp/ql/src/codeql-suites/cpp-code-scanning.qls
index 4a8a85cae42..219ee5d9534 100644
--- a/cpp/ql/src/codeql-suites/cpp-code-scanning.qls
+++ b/cpp/ql/src/codeql-suites/cpp-code-scanning.qls
@@ -1,5 +1,5 @@
 - description: Standard Code Scanning queries for C and C++
-- qlpack: codeql-cpp
+- queries: .
 - apply: code-scanning-selectors.yml
   from: codeql/suite-helpers
 - apply: codeql-suites/exclude-slow-queries.yml
diff --git a/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls b/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls
index 11416fccb7c..53207e8e5e5 100644
--- a/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls
+++ b/cpp/ql/src/codeql-suites/cpp-lgtm-full.qls
@@ -1,5 +1,5 @@
 - description: Standard LGTM queries for C/C++, including ones not displayed by default
-- qlpack: codeql-cpp
+- queries: .
 - apply: lgtm-selectors.yml
   from: codeql/suite-helpers
 - apply: codeql-suites/exclude-slow-queries.yml
diff --git a/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls b/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls
index f212afedba6..351cee3c772 100644
--- a/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls
+++ b/cpp/ql/src/codeql-suites/cpp-security-and-quality.qls
@@ -1,5 +1,5 @@
 - description: Security-and-quality queries for C and C++
-- qlpack: codeql-cpp
+- queries: .
 - apply: security-and-quality-selectors.yml
   from: codeql/suite-helpers
 - apply: codeql-suites/exclude-slow-queries.yml
diff --git a/cpp/ql/src/codeql-suites/cpp-security-extended.qls b/cpp/ql/src/codeql-suites/cpp-security-extended.qls
index 26063f088d2..63e23300d26 100644
--- a/cpp/ql/src/codeql-suites/cpp-security-extended.qls
+++ b/cpp/ql/src/codeql-suites/cpp-security-extended.qls
@@ -1,5 +1,5 @@
 - description: Security-extended queries for C and C++
-- qlpack: codeql-cpp
+- queries: .
 - apply: security-extended-selectors.yml
   from: codeql/suite-helpers
 - apply: codeql-suites/exclude-slow-queries.yml
diff --git a/cpp/ql/test/qlpack.yml b/cpp/ql/test/qlpack.yml
index 8b6ba2cb605..a2858d0c3fe 100644
--- a/cpp/ql/test/qlpack.yml
+++ b/cpp/ql/test/qlpack.yml
@@ -1,5 +1,7 @@
 name: codeql-cpp-tests
 version: 0.0.0
-libraryPathDependencies: codeql/cpp-all
+dependencies:
+  codeql/cpp-all: "*"
+  codeql/cpp-queries: "*"
 extractor: cpp
 tests: .