From 81d26c572fa1fc14627a2b6d169847932d8cfbfe Mon Sep 17 00:00:00 2001
From: Omair Majid <omajid@redhat.com>
Date: Tue, 26 Jul 2022 15:53:08 -0400
Subject: [PATCH] Fix some remaining references to 6.0

---
 build-arm64-bootstrap-tarball              | 4 ++--
 build-dotnet-tarball                       | 5 +++++
 dotnet6.0.rpmlintrc => dotnet7.0.rpmlintrc | 0
 tests/tests.yml                            | 6 +++---
 4 files changed, 10 insertions(+), 5 deletions(-)
 rename dotnet6.0.rpmlintrc => dotnet7.0.rpmlintrc (100%)

diff --git a/build-arm64-bootstrap-tarball b/build-arm64-bootstrap-tarball
index 9f1cc7d..79ac1da 100755
--- a/build-arm64-bootstrap-tarball
+++ b/build-arm64-bootstrap-tarball
@@ -29,9 +29,9 @@ for package in "${linux_x64_packages[@]}"; do
     fi
 
     filename=${package##*/}
-    name=${filename%.6.0*}
+    name=${filename%.7.0*}
     arm_name=${name/linux-x64/linux-arm64}
-    version="6.0${filename##*6.0}"
+    version="7.0${filename##*6.0}"
     version=${version%.*}
 
     nappo download --verbose "$arm_name" "$version"
diff --git a/build-dotnet-tarball b/build-dotnet-tarball
index b85c3a7..a332926 100755
--- a/build-dotnet-tarball
+++ b/build-dotnet-tarball
@@ -173,6 +173,11 @@ fi
 
 # Remove files with funny licenses, crypto implementations and other
 # not-very-useful artifacts to reduce tarball size
+#
+# We use rm -r (no -f) to make sure the operation fails if the files are not at
+# the expected locations. If the files are not at the expected location, we
+# need to find the new location of the files and delete them, or verify that
+# upstream has fix them.
 
 # Binaries for gradle
 rm -r src/aspnetcore/src/SignalR/clients/java/signalr/gradle*
diff --git a/dotnet6.0.rpmlintrc b/dotnet7.0.rpmlintrc
similarity index 100%
rename from dotnet6.0.rpmlintrc
rename to dotnet7.0.rpmlintrc
diff --git a/tests/tests.yml b/tests/tests.yml
index 8ce51f4..b1facd8 100644
--- a/tests/tests.yml
+++ b/tests/tests.yml
@@ -21,12 +21,12 @@
           dir: ./
           run: dotnet turkey/Turkey.dll -l={{ remote_artifacts }} dotnet-regular-tests
     required_packages:
-    - aspnetcore-runtime-6.0
+    - aspnetcore-runtime-7.0
     - babeltrace
     - bash-completion
     - binutils
-    - dotnet-sdk-6.0
-    - dotnet-runtime-6.0
+    - dotnet-sdk-7.0
+    - dotnet-runtime-7.0
     - expect
     - git
     - jq