From 60b5317c5f2bc2e29e2097d848db3f83a904952d Mon Sep 17 00:00:00 2001
From: Cornelius Riemenschneider <cornelius@github.com>
Date: Thu, 30 May 2024 10:28:08 +0200
Subject: [PATCH] C++: Move to new packaging rules.

---
 cpp/downgrades/BUILD.bazel                          | 2 +-
 cpp/ql/lib/BUILD.bazel                              | 2 --
 csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel | 1 -
 misc/bazel/csharp.bzl                               | 2 +-
 4 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/cpp/downgrades/BUILD.bazel b/cpp/downgrades/BUILD.bazel
index da15140b0b4..fd96656a2ec 100644
--- a/cpp/downgrades/BUILD.bazel
+++ b/cpp/downgrades/BUILD.bazel
@@ -6,7 +6,7 @@ pkg_files(
         ["**"],
         exclude = ["BUILD.bazel"],
     ),
-    prefix = "cpp/downgrades",
+    prefix = "downgrades",
     strip_prefix = strip_prefix.from_pkg(),
     visibility = ["//cpp:__pkg__"],
 )
diff --git a/cpp/ql/lib/BUILD.bazel b/cpp/ql/lib/BUILD.bazel
index b71a607b6ec..af6e7ece494 100644
--- a/cpp/ql/lib/BUILD.bazel
+++ b/cpp/ql/lib/BUILD.bazel
@@ -5,11 +5,9 @@ package(default_visibility = ["//cpp:__pkg__"])
 pkg_files(
     name = "dbscheme",
     srcs = ["semmlecode.cpp.dbscheme"],
-    prefix = "cpp",
 )
 
 pkg_files(
     name = "dbscheme-stats",
     srcs = ["semmlecode.cpp.dbscheme.stats"],
-    prefix = "cpp",
 )
diff --git a/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel b/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel
index 801e7aedbab..379b8aea91d 100644
--- a/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel
+++ b/csharp/autobuilder/Semmle.Autobuild.Cpp/BUILD.bazel
@@ -9,7 +9,6 @@ codeql_csharp_binary(
         "*.cs",
         "Properties/*.cs",
     ]),
-    language_prefix = "cpp",
     visibility = ["//visibility:public"],
     deps = [
         "//csharp/autobuilder/Semmle.Autobuild.Shared",
diff --git a/misc/bazel/csharp.bzl b/misc/bazel/csharp.bzl
index 299febf5308..fa1a954c752 100644
--- a/misc/bazel/csharp.bzl
+++ b/misc/bazel/csharp.bzl
@@ -33,7 +33,7 @@ def codeql_xunit_test(name, **kwargs):
         **kwargs
     )
 
-def codeql_csharp_binary(name, language_prefix = "csharp", **kwargs):
+def codeql_csharp_binary(name, **kwargs):
     kwargs.setdefault("nullable", "enable")
     kwargs.setdefault("target_frameworks", [TARGET_FRAMEWORK])