From 782bf0807f007c7ce99ce24b1dd0e5b7067f7e34 Mon Sep 17 00:00:00 2001
From: Mizux Seiha <mizux.dev@gmail.com>
Date: Tue, 13 Jun 2023 23:08:10 +0200
Subject: [PATCH] dotnet: disable .Net 3.1

---
 cmake/docker/alpine/dotnet.Dockerfile     |  2 +-
 makefiles/Makefile.cpp.mk                 |  2 +-
 makefiles/docker/alpine/dotnet.Dockerfile | 14 +++-----------
 3 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/cmake/docker/alpine/dotnet.Dockerfile b/cmake/docker/alpine/dotnet.Dockerfile
index e588dd7e6b..ed3fea7d08 100644
--- a/cmake/docker/alpine/dotnet.Dockerfile
+++ b/cmake/docker/alpine/dotnet.Dockerfile
@@ -24,7 +24,7 @@ COPY . .
 
 FROM devel AS build
 RUN cmake -version
-RUN cmake -S. -Bbuild -DBUILD_DOTNET=ON -DUSE_DOTNET_CORE_31=OFF -DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF
+RUN cmake -S. -Bbuild -DBUILD_DOTNET=ON -DBUILD_CXX_SAMPLES=OFF -DBUILD_CXX_EXAMPLES=OFF
 RUN cmake --build build --target all -v
 RUN cmake --build build --target install -v
 
diff --git a/makefiles/Makefile.cpp.mk b/makefiles/Makefile.cpp.mk
index d3f3d1b08a..f8b73d0c38 100644
--- a/makefiles/Makefile.cpp.mk
+++ b/makefiles/Makefile.cpp.mk
@@ -41,7 +41,7 @@ USE_SCIP ?= ON
 USE_CPLEX ?= OFF
 USE_XPRESS ?= OFF
 
-USE_DOTNET_CORE_31 ?= ON
+USE_DOTNET_CORE_31 ?= OFF
 USE_DOTNET_6 ?= ON
 BUILD_VENV ?= ON
 JOBS ?= 4
diff --git a/makefiles/docker/alpine/dotnet.Dockerfile b/makefiles/docker/alpine/dotnet.Dockerfile
index b6027c1143..a3a6973d03 100644
--- a/makefiles/docker/alpine/dotnet.Dockerfile
+++ b/makefiles/docker/alpine/dotnet.Dockerfile
@@ -4,21 +4,13 @@ FROM ortools/make:alpine_swig AS env
 RUN apk add --no-cache wget icu-libs libintl \
 && mkdir -p /usr/share/dotnet \
 && ln -s /usr/share/dotnet/dotnet /usr/bin/dotnet
-## .Net 3.1
-## see: https://dotnet.microsoft.com/download/dotnet-core/3.1
-RUN dotnet_sdk_version=3.1.415 \
-&& wget -qO dotnet.tar.gz \
-"https://dotnetcli.azureedge.net/dotnet/Sdk/${dotnet_sdk_version}/dotnet-sdk-${dotnet_sdk_version}-linux-musl-x64.tar.gz" \
-&& dotnet_sha512='20297eb436db2fe0cb3d8edfe4ad5b7c7871116616843314830533471a344f0ca943fbc5f92685113afc331a64c90f271245a36be1c232c364add936dd06d13d' \
-&& echo "$dotnet_sha512  dotnet.tar.gz" | sha512sum -c - \
-&& tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \
-&& rm dotnet.tar.gz
+
 ## .Net 6.0
 ## see: https://dotnet.microsoft.com/download/dotnet-core/6.0
-RUN dotnet_sdk_version=6.0.100 \
+RUN dotnet_sdk_version=6.0.405 \
 && wget -qO dotnet.tar.gz \
 "https://dotnetcli.azureedge.net/dotnet/Sdk/$dotnet_sdk_version/dotnet-sdk-${dotnet_sdk_version}-linux-musl-x64.tar.gz" \
-&& dotnet_sha512='428082c31fd588b12fd34aeae965a58bf1c26b0282184ae5267a85cdadc503f667c7c00e8641892c97fbd5ef26a38a605b683b45a0fef2da302ec7f921cf64fe' \
+&& dotnet_sha512='ca98ebc5858339c5ce4164f5f5932a5bf8aae9f13d54adf382a41f5e6d1302df278bd7e218ecc2f651dcf67e705c40c43347cd33956732c6bd88d3b3d2881b84' \
 && echo "$dotnet_sha512  dotnet.tar.gz" | sha512sum -c - \
 && tar -C /usr/share/dotnet -oxzf dotnet.tar.gz \
 && rm dotnet.tar.gz