From e6910f67a0a52138cb11f0767afb10b061d1ef00 Mon Sep 17 00:00:00 2001
From: Louis Abel <label@rockylinux.org>
Date: Thu, 16 May 2024 07:40:15 -0700
Subject: [PATCH] sync from upstream

---
 prepopulate.json                           | 45 ----------------------
 shared/additional_and_filter_packages.conf | 11 +-----
 2 files changed, 1 insertion(+), 55 deletions(-)

diff --git a/prepopulate.json b/prepopulate.json
index 7dfcce2..e328817 100644
--- a/prepopulate.json
+++ b/prepopulate.json
@@ -737,18 +737,6 @@
       "dotconf": [
         "dotconf.aarch64"
       ], 
-      "dotnet6.0": [
-        "aspnetcore-runtime-6.0.aarch64", 
-        "aspnetcore-targeting-pack-6.0.aarch64", 
-        "dotnet-apphost-pack-6.0.aarch64", 
-        "dotnet-host.aarch64", 
-        "dotnet-hostfxr-6.0.aarch64", 
-        "dotnet-runtime-6.0.aarch64", 
-        "dotnet-sdk-6.0.aarch64", 
-        "dotnet-targeting-pack-6.0.aarch64", 
-        "dotnet-templates-6.0.aarch64", 
-        "netstandard-targeting-pack-2.1.aarch64"
-      ], 
       "double-conversion": [
         "double-conversion.aarch64"
       ], 
@@ -15551,18 +15539,6 @@
       "dotconf": [
         "dotconf.s390x"
       ], 
-      "dotnet6.0": [
-        "aspnetcore-runtime-6.0.s390x", 
-        "aspnetcore-targeting-pack-6.0.s390x", 
-        "dotnet-apphost-pack-6.0.s390x", 
-        "dotnet-host.s390x", 
-        "dotnet-hostfxr-6.0.s390x", 
-        "dotnet-runtime-6.0.s390x", 
-        "dotnet-sdk-6.0.s390x", 
-        "dotnet-targeting-pack-6.0.s390x", 
-        "dotnet-templates-6.0.s390x", 
-        "netstandard-targeting-pack-2.1.s390x"
-      ], 
       "double-conversion": [
         "double-conversion.s390x"
       ], 
@@ -23026,18 +23002,6 @@
         "dotconf.i686", 
         "dotconf.x86_64"
       ], 
-      "dotnet6.0": [
-        "aspnetcore-runtime-6.0.x86_64", 
-        "aspnetcore-targeting-pack-6.0.x86_64", 
-        "dotnet-apphost-pack-6.0.x86_64", 
-        "dotnet-host.x86_64", 
-        "dotnet-hostfxr-6.0.x86_64", 
-        "dotnet-runtime-6.0.x86_64", 
-        "dotnet-sdk-6.0.x86_64", 
-        "dotnet-targeting-pack-6.0.x86_64", 
-        "dotnet-templates-6.0.x86_64", 
-        "netstandard-targeting-pack-2.1.x86_64"
-      ], 
       "double-conversion": [
         "double-conversion.i686", 
         "double-conversion.x86_64"
@@ -37885,9 +37849,6 @@
       "dotconf": [
         "dotconf-devel.aarch64"
       ], 
-      "dotnet6.0": [
-        "dotnet-sdk-6.0-source-built-artifacts.aarch64"
-      ], 
       "dovecot": [
         "dovecot-devel.aarch64"
       ], 
@@ -42421,9 +42382,6 @@
       "dotconf": [
         "dotconf-devel.s390x"
       ], 
-      "dotnet6.0": [
-        "dotnet-sdk-6.0-source-built-artifacts.s390x"
-      ], 
       "dovecot": [
         "dovecot-devel.s390x"
       ], 
@@ -44723,9 +44681,6 @@
         "dotconf-devel.i686", 
         "dotconf-devel.x86_64"
       ], 
-      "dotnet6.0": [
-        "dotnet-sdk-6.0-source-built-artifacts.x86_64"
-      ], 
       "dovecot": [
         "dovecot-devel.i686", 
         "dovecot-devel.x86_64", 
diff --git a/shared/additional_and_filter_packages.conf b/shared/additional_and_filter_packages.conf
index ff06b76..69ea568 100644
--- a/shared/additional_and_filter_packages.conf
+++ b/shared/additional_and_filter_packages.conf
@@ -130,19 +130,12 @@ additional_packages = [
             "cups-filters-driverless", #ENGCMP-3862
             "cockpit-ostree", #ENGCMP-3233
             "composefs", #ENGCMP-3802
-            "dotnet-apphost-pack-7.0", #ENGCMP-2586
             "dotnet-apphost-pack-8.0", #ENGCMP-3375
             "dotnet-host", #ENGCMP-2586
-            "dotnet-hostfxr-7.0", #ENGCMP-2586
             "dotnet-hostfxr-8.0", #ENGCMP-3375
-            "dotnet-runtime-7.0", #ENGCMP-2586
             "dotnet-runtime-8.0", #ENGCMP-3375
-            "dotnet-sdk-7.0", #ENGCMP-2586
             "dotnet-sdk-8.0", #ENGCMP-3375
-            "dotnet-sdk-8.0-source-built-artifacts", #ENGCMP-3375
-            "dotnet-targeting-pack-7.0", #ENGCMP-2586
             "dotnet-targeting-pack-8.0", #ENGCMP-3375
-            "dotnet-templates-7.0", #ENGCMP-2586
             "dotnet-templates-8.0", #ENGCMP-3375
             "dpdk-devel", #ENGCMP-2205
             "drgn", #ENGCMP-3490
@@ -445,6 +438,7 @@ additional_packages = [
      }),
     ("^CRB$", {
         "*": [
+             "dotnet-sdk-8.0-source-built-artifacts", #CS-2160
          ],
         "x86_64": [
              "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327
@@ -453,7 +447,6 @@ additional_packages = [
              "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-1327
              "java-11-openjdk-*fastdebug*", #ENGCMP-1327
              "java-17-openjdk-*fastdebug*", #ENGCMP-1326
-             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
          ],
          "aarch64": [
              "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327
@@ -462,12 +455,10 @@ additional_packages = [
              "java-1.8.0-openjdk-*fastdebug*", #ENGCMP-1327
              "java-11-openjdk-*fastdebug*", #ENGCMP-1327
              "java-17-openjdk-*fastdebug*", #ENGCMP-1326
-             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
          ],
          "s390x": [
              "java-11-openjdk-*slowdebug*", #ENGCMP-1327
              "java-17-openjdk-*slowdebug*", #ENGCMP-1326
-             "dotnet-sdk-6.0-source-built-artifacts", #CS-1025
          ],
          "ppc64le": [
              "java-1.8.0-openjdk-*slowdebug*", #ENGCMP-1327