From d2f40de5054b3fce19a63b21c95f1873a2d1e50d Mon Sep 17 00:00:00 2001
From: Yaakov Selkowitz <yselkowi@redhat.com>
Date: Aug 06 2024 23:54:35 +0000
Subject: Consolidate dotnet8.0 packages


---

diff --git a/prepopulate.json b/prepopulate.json
index 995f87e..afbfabc 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -636,12 +636,15 @@
       ],
       "dotnet8.0": [
         "aspnetcore-runtime-8.0.aarch64",
+        "aspnetcore-runtime-dbg-8.0.aarch64",
         "aspnetcore-targeting-pack-8.0.aarch64",
         "dotnet-apphost-pack-8.0.aarch64",
         "dotnet-host.aarch64",
         "dotnet-hostfxr-8.0.aarch64",
         "dotnet-runtime-8.0.aarch64",
+        "dotnet-runtime-dbg-8.0.aarch64",
         "dotnet-sdk-8.0.aarch64",
+        "dotnet-sdk-dbg-8.0.aarch64",
         "dotnet-targeting-pack-8.0.aarch64",
         "dotnet-templates-8.0.aarch64",
         "netstandard-targeting-pack-2.1.aarch64"
@@ -7221,12 +7224,15 @@
       ],
       "dotnet8.0": [
         "aspnetcore-runtime-8.0.ppc64le",
+        "aspnetcore-runtime-dbg-8.0.ppc64le",
         "aspnetcore-targeting-pack-8.0.ppc64le",
         "dotnet-apphost-pack-8.0.ppc64le",
         "dotnet-host.ppc64le",
         "dotnet-hostfxr-8.0.ppc64le",
         "dotnet-runtime-8.0.ppc64le",
+        "dotnet-runtime-dbg-8.0.ppc64le",
         "dotnet-sdk-8.0.ppc64le",
+        "dotnet-sdk-dbg-8.0.ppc64le",
         "dotnet-targeting-pack-8.0.ppc64le",
         "dotnet-templates-8.0.ppc64le",
         "netstandard-targeting-pack-2.1.ppc64le"
@@ -13713,12 +13719,15 @@
       ],
       "dotnet8.0": [
         "aspnetcore-runtime-8.0.s390x",
+        "aspnetcore-runtime-dbg-8.0.s390x",
         "aspnetcore-targeting-pack-8.0.s390x",
         "dotnet-apphost-pack-8.0.s390x",
         "dotnet-host.s390x",
         "dotnet-hostfxr-8.0.s390x",
         "dotnet-runtime-8.0.s390x",
+        "dotnet-runtime-dbg-8.0.s390x",
         "dotnet-sdk-8.0.s390x",
+        "dotnet-sdk-dbg-8.0.s390x",
         "dotnet-targeting-pack-8.0.s390x",
         "dotnet-templates-8.0.s390x",
         "netstandard-targeting-pack-2.1.s390x"
@@ -20222,12 +20231,15 @@
       ],
       "dotnet8.0": [
         "aspnetcore-runtime-8.0.x86_64",
+        "aspnetcore-runtime-dbg-8.0.x86_64",
         "aspnetcore-targeting-pack-8.0.x86_64",
         "dotnet-apphost-pack-8.0.x86_64",
         "dotnet-host.x86_64",
         "dotnet-hostfxr-8.0.x86_64",
         "dotnet-runtime-8.0.x86_64",
+        "dotnet-runtime-dbg-8.0.x86_64",
         "dotnet-sdk-8.0.x86_64",
+        "dotnet-sdk-dbg-8.0.x86_64",
         "dotnet-targeting-pack-8.0.x86_64",
         "dotnet-templates-8.0.x86_64",
         "netstandard-targeting-pack-2.1.x86_64"
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index 48d5fcb..29a37d3 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -85,8 +85,6 @@ additional_packages = [
         "*": [
             "aardvark-dns", #ENGCMP-2515
             "alsa-plugins-pulseaudio", #ENGCMP-2359
-            "aspnetcore-runtime-8.0", #ENGCMP-3375
-            "aspnetcore-targeting-pack-8.0", #ENGCMP-3375
             "autoconf-latest", #ENGCMP-3691
             "bootc", #ENGCMP-3622
             "capstone", #ENGCMP-2591
@@ -97,13 +95,6 @@ additional_packages = [
             "cups-filters-driverless", #ENGCMP-3862
             "cockpit-ostree", #ENGCMP-3233
             "composefs", #ENGCMP-3802
-            "dotnet-apphost-pack-8.0", #ENGCMP-3375
-            "dotnet-host", #ENGCMP-2586
-            "dotnet-hostfxr-8.0", #ENGCMP-3375
-            "dotnet-runtime-8.0", #ENGCMP-3375
-            "dotnet-sdk-8.0", #ENGCMP-3375
-            "dotnet-targeting-pack-8.0", #ENGCMP-3375
-            "dotnet-templates-8.0", #ENGCMP-3375
             "dpdk-devel", #ENGCMP-2205
             "drgn", #ENGCMP-3490
             "ecj", #ENGCMP-2928
@@ -215,7 +206,6 @@ additional_packages = [
             "mkpasswd", #ENGCMP-2259
             "mpdecimal", #ENGCMP-2828
             "netavark", #ENGCMP-2543
-            "netstandard-targeting-pack-2.1", #ENGCMP-2586
             "nfsv4-client-utils", #ENGCMP-2493
             "nvme-stas", #ENGCMP-2495
             "osbuild-depsolve-dnf", #ENGCMP-3857
@@ -321,9 +311,6 @@ additional_packages = [
             "gnome-shell-extension-dash-to-dock", #ENGCMP-4067
             "python-pam", #ENGCMP-4071
             "libkdumpfile-devel", #ENGCMP-4078
-            "aspnetcore-runtime-dbg-8.0", #ENGCMP-4088
-            "dotnet-runtime-dbg-8.0", #ENGCMP-4088
-            "dotnet-sdk-dbg-8.0", #ENGCMP-4088
             "gnutls-fips", #ENGCMP-4092
             "libdisplay-info", #ENGCMP-4127
             "valkey", #ENGCMP-4149
@@ -413,7 +400,6 @@ additional_packages = [
      }),
     ("^CRB$", {
         "*": [
-             "dotnet-sdk-8.0-source-built-artifacts", #CS-2160
              "fabtests", #ENGCMP-4168
          ],
         "x86_64": [