From 22be41357cfe3b0fb55e863add58c0964283bb9e Mon Sep 17 00:00:00 2001
From: Corentin Le Molgat <corentinl@google.com>
Date: Mon, 2 Jun 2025 17:22:12 +0200
Subject: [PATCH] dotnet: get rid of last remaining .Net 6.0

---
 makefiles/docker/debian/dotnet.Dockerfile   |  2 +-
 makefiles/docker/fedora/dotnet.Dockerfile   |  2 +-
 makefiles/docker/opensuse/dotnet.Dockerfile | 20 +++++++-------------
 tools/release/amd64.Dockerfile              |  2 +-
 tools/release/arm64.Dockerfile              |  2 +-
 5 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/makefiles/docker/debian/dotnet.Dockerfile b/makefiles/docker/debian/dotnet.Dockerfile
index bed49fcb94..08af62ec16 100644
--- a/makefiles/docker/debian/dotnet.Dockerfile
+++ b/makefiles/docker/debian/dotnet.Dockerfile
@@ -6,7 +6,7 @@ RUN apt-get update -qq \
 && dpkg -i packages-microsoft-prod.deb \
 && rm packages-microsoft-prod.deb \
 && apt-get update -qq \
-&& apt-get install -yq dotnet-sdk-6.0 \
+&& apt-get install -yq dotnet-sdk-8.0 \
 && apt-get clean \
 && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 # Trigger first run experience by running arbitrary cmd
diff --git a/makefiles/docker/fedora/dotnet.Dockerfile b/makefiles/docker/fedora/dotnet.Dockerfile
index eb0946bd5d..8ec8515c13 100644
--- a/makefiles/docker/fedora/dotnet.Dockerfile
+++ b/makefiles/docker/fedora/dotnet.Dockerfile
@@ -2,7 +2,7 @@ FROM ortools/make:fedora_swig AS env
 
 # see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-fedora
 RUN dnf -y update \
-&& dnf -y install dotnet-sdk-6.0 \
+&& dnf -y install dotnet-sdk-8.0 \
 && dnf clean all
 # Trigger first run experience by running arbitrary cmd
 RUN dotnet --info
diff --git a/makefiles/docker/opensuse/dotnet.Dockerfile b/makefiles/docker/opensuse/dotnet.Dockerfile
index 8a2ec61cdf..9a4b082894 100644
--- a/makefiles/docker/opensuse/dotnet.Dockerfile
+++ b/makefiles/docker/opensuse/dotnet.Dockerfile
@@ -1,21 +1,15 @@
 FROM ortools/make:opensuse_swig AS env
 
-# Install .Net
+# .NET install
 # see: https://docs.microsoft.com/en-us/dotnet/core/install/linux-opensuse
 RUN zypper refresh \
-&& zypper install -y wget tar gzip libicu-devel
-RUN mkdir -p /usr/share/dotnet \
-&& ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
+&& zypper install -y wget tar awk gzip libicu-devel findutils
 
-## .Net 6.0
-## see: https://dotnet.microsoft.com/download/dotnet-core/6.0
-RUN dotnet_sdk_version=6.0.100 \
-&& wget -qO dotnet.tar.gz \
-"https://dotnetcli.azureedge.net/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-x64.tar.gz" \
-&& dotnet_sha512='cb0d174a79d6294c302261b645dba6a479da8f7cf6c1fe15ae6998bc09c5e0baec810822f9e0104e84b0efd51fdc0333306cb2a0a6fcdbaf515a8ad8cf1af25b' \
-&& echo "$dotnet_sha512  dotnet.tar.gz" | sha512sum -c - \
-&& tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \
-&& rm dotnet.tar.gz
+## .Net 8.0
+# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
+RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
+&& chmod a+x dotnet-install.sh \
+&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
 # Trigger first run experience by running arbitrary cmd
 RUN dotnet --info
 
diff --git a/tools/release/amd64.Dockerfile b/tools/release/amd64.Dockerfile
index 58f2d2a174..d34f4c4725 100644
--- a/tools/release/amd64.Dockerfile
+++ b/tools/release/amd64.Dockerfile
@@ -25,7 +25,7 @@ CMD ["/usr/bin/bash"]
 RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
 && chmod a+x dotnet-install.sh \
 && ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
-&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin
+&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
 # Trigger first run experience by running arbitrary cmd
 RUN dotnet --info
 
diff --git a/tools/release/arm64.Dockerfile b/tools/release/arm64.Dockerfile
index d04bd506ac..3e404fa439 100644
--- a/tools/release/arm64.Dockerfile
+++ b/tools/release/arm64.Dockerfile
@@ -28,7 +28,7 @@ CMD ["/usr/bin/bash"]
 RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
 && chmod a+x dotnet-install.sh \
 && ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
-&& ./dotnet-install.sh -c 6.0 -i /usr/local/bin
+&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
 # Trigger first run experience by running arbitrary cmd
 #RUN objdump -p /lib64/libstdc++.so.6
 #RUN g++ --version