diff --git a/cmake/docker/almalinux/dotnet.Dockerfile b/cmake/docker/almalinux/dotnet.Dockerfile index 568088c64f..0fc850366d 100644 --- a/cmake/docker/almalinux/dotnet.Dockerfile +++ b/cmake/docker/almalinux/dotnet.Dockerfile @@ -4,7 +4,6 @@ FROM ortools/cmake:almalinux_swig AS env # 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 3.1 -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/cmake/docker/rockylinux/dotnet.Dockerfile b/cmake/docker/rockylinux/dotnet.Dockerfile index 7e4fbb4995..f0c2db853e 100644 --- a/cmake/docker/rockylinux/dotnet.Dockerfile +++ b/cmake/docker/rockylinux/dotnet.Dockerfile @@ -4,7 +4,6 @@ FROM ortools/cmake:rockylinux_swig AS env # 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 3.1 -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/docker/Makefile b/tools/docker/Makefile index ccb9bf8703..ca398cbc73 100644 --- a/tools/docker/Makefile +++ b/tools/docker/Makefile @@ -116,7 +116,7 @@ help: @echo @echo -e "\t${BOLD}${RESET}: Language to build" @echo -e "\t\t${BOLD}cpp${RESET} C++" - @echo -e "\t\t${BOLD}dotnet${RESET} .Net Core 3.1 and/or .Net 8.0 wrappers" + @echo -e "\t\t${BOLD}dotnet${RESET} .Net 8.0 wrappers" @echo -e "\t\t${BOLD}java${RESET} Java (JDK 8.0) wrappers" @echo -e "\t\t${BOLD}python${RESET} Python 3.9+ wrappers" @echo diff --git a/tools/docker/images/almalinux-9.Dockerfile b/tools/docker/images/almalinux-9.Dockerfile index 55bc67a1ca..4a6102159c 100644 --- a/tools/docker/images/almalinux-9.Dockerfile +++ b/tools/docker/images/almalinux-9.Dockerfile @@ -32,7 +32,6 @@ RUN dnf -y update \ # 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 3.1 -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 @@ -90,7 +89,6 @@ RUN make archive_cpp ## build FROM cpp_build AS dotnet_build RUN sed -i 's/\(\).*\(<\/SignAssembly>\)/\1false\2/' ortools/dotnet/Google.OrTools*.csproj.in -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/alpine-edge.Dockerfile b/tools/docker/images/alpine-edge.Dockerfile index 96c04328c6..3e57be822e 100644 --- a/tools/docker/images/alpine-edge.Dockerfile +++ b/tools/docker/images/alpine-edge.Dockerfile @@ -66,7 +66,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/archlinux.Dockerfile b/tools/docker/images/archlinux.Dockerfile index 76c9c64ba9..5ad355cfe5 100644 --- a/tools/docker/images/archlinux.Dockerfile +++ b/tools/docker/images/archlinux.Dockerfile @@ -67,7 +67,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=OFF RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/debian-11.Dockerfile b/tools/docker/images/debian-11.Dockerfile index 6d06748800..2c514de3f8 100644 --- a/tools/docker/images/debian-11.Dockerfile +++ b/tools/docker/images/debian-11.Dockerfile @@ -24,7 +24,6 @@ RUN ARCH=$(uname -m) \ # 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 3.1 -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 @@ -83,7 +82,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/debian-12.Dockerfile b/tools/docker/images/debian-12.Dockerfile index 4ec3143266..424fd31282 100644 --- a/tools/docker/images/debian-12.Dockerfile +++ b/tools/docker/images/debian-12.Dockerfile @@ -17,7 +17,6 @@ CMD ["/bin/bash"] # 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 3.1 -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 @@ -77,7 +76,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/debian-13.Dockerfile b/tools/docker/images/debian-13.Dockerfile index eea5a1992e..1616e3c48f 100644 --- a/tools/docker/images/debian-13.Dockerfile +++ b/tools/docker/images/debian-13.Dockerfile @@ -17,7 +17,6 @@ CMD ["/bin/bash"] # 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 3.1 -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 @@ -76,7 +75,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/debian-sid.Dockerfile b/tools/docker/images/debian-sid.Dockerfile index fc48b81fc5..1b4803b773 100644 --- a/tools/docker/images/debian-sid.Dockerfile +++ b/tools/docker/images/debian-sid.Dockerfile @@ -18,10 +18,10 @@ RUN apt update -qq \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install .Net -# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-11- +# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-13- RUN apt-get update -qq \ && apt-get install -qq gpg apt-transport-https \ -&& wget -q "https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb \ +&& wget -q "https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && rm packages-microsoft-prod.deb \ && apt-get update -qq \ @@ -88,7 +88,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/fedora-40.Dockerfile b/tools/docker/images/fedora-40.Dockerfile index 1a5a8dd8f2..0fd6b0c905 100644 --- a/tools/docker/images/fedora-40.Dockerfile +++ b/tools/docker/images/fedora-40.Dockerfile @@ -74,7 +74,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/fedora-41.Dockerfile b/tools/docker/images/fedora-41.Dockerfile index 3319aa0d36..4f5efeaef3 100644 --- a/tools/docker/images/fedora-41.Dockerfile +++ b/tools/docker/images/fedora-41.Dockerfile @@ -76,7 +76,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/fedora-42.Dockerfile b/tools/docker/images/fedora-42.Dockerfile index 33a8524552..78472a4412 100644 --- a/tools/docker/images/fedora-42.Dockerfile +++ b/tools/docker/images/fedora-42.Dockerfile @@ -76,7 +76,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/opensuse-leap.Dockerfile b/tools/docker/images/opensuse-leap.Dockerfile index b3efec0857..300efe9555 100644 --- a/tools/docker/images/opensuse-leap.Dockerfile +++ b/tools/docker/images/opensuse-leap.Dockerfile @@ -25,7 +25,6 @@ RUN zypper refresh \ # 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 3.1 -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 @@ -75,7 +74,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/rockylinux-9.Dockerfile b/tools/docker/images/rockylinux-9.Dockerfile index c70ec35b84..c885bb3d87 100644 --- a/tools/docker/images/rockylinux-9.Dockerfile +++ b/tools/docker/images/rockylinux-9.Dockerfile @@ -32,7 +32,6 @@ RUN dnf -y update \ # 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 3.1 -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 @@ -90,7 +89,6 @@ RUN make archive_cpp ## build FROM cpp_build AS dotnet_build RUN sed -i 's/\(\).*\(<\/SignAssembly>\)/\1false\2/' ortools/dotnet/Google.OrTools*.csproj.in -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/ubuntu-20.04.Dockerfile b/tools/docker/images/ubuntu-20.04.Dockerfile index 6a0e6cf91d..01564cf3ff 100644 --- a/tools/docker/images/ubuntu-20.04.Dockerfile +++ b/tools/docker/images/ubuntu-20.04.Dockerfile @@ -33,7 +33,7 @@ RUN apt-get update -qq \ && wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && apt-get update -qq \ -&& apt-get install -yq dotnet-sdk-3.1 dotnet-sdk-8.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 @@ -93,7 +93,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=ON RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/ubuntu-22.04.Dockerfile b/tools/docker/images/ubuntu-22.04.Dockerfile index 92f0c60a29..2b6a884c10 100644 --- a/tools/docker/images/ubuntu-22.04.Dockerfile +++ b/tools/docker/images/ubuntu-22.04.Dockerfile @@ -84,7 +84,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=OFF RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/ubuntu-24.04.Dockerfile b/tools/docker/images/ubuntu-24.04.Dockerfile index 471aa49052..9cc69b1380 100644 --- a/tools/docker/images/ubuntu-24.04.Dockerfile +++ b/tools/docker/images/ubuntu-24.04.Dockerfile @@ -85,7 +85,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=OFF RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/images/ubuntu-24.10.Dockerfile b/tools/docker/images/ubuntu-24.10.Dockerfile index 2ae962210e..290a38decb 100644 --- a/tools/docker/images/ubuntu-24.10.Dockerfile +++ b/tools/docker/images/ubuntu-24.10.Dockerfile @@ -85,7 +85,6 @@ RUN make archive_cpp # .Net ## build FROM cpp_build AS dotnet_build -ENV USE_DOTNET_CORE_31=OFF RUN make detect_dotnet \ && make dotnet JOBS=8 ## archive diff --git a/tools/docker/test/debian-11/dotnet.Dockerfile b/tools/docker/test/debian-11/dotnet.Dockerfile index 0c1344ab6b..6220739273 100644 --- a/tools/docker/test/debian-11/dotnet.Dockerfile +++ b/tools/docker/test/debian-11/dotnet.Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update -qq \ && dpkg -i packages-microsoft-prod.deb \ && rm packages-microsoft-prod.deb \ && apt-get update -qq \ -&& apt-get install -qq dotnet-sdk-3.1 dotnet-sdk-8.0 \ +&& apt-get install -qq 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/tools/docker/test/debian-12/dotnet.Dockerfile b/tools/docker/test/debian-12/dotnet.Dockerfile index 6d3c5543d4..cfae176874 100644 --- a/tools/docker/test/debian-12/dotnet.Dockerfile +++ b/tools/docker/test/debian-12/dotnet.Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update -qq \ && dpkg -i packages-microsoft-prod.deb \ && rm packages-microsoft-prod.deb \ && apt-get update -qq \ -&& apt-get install -qq dotnet-sdk-3.1 dotnet-sdk-8.0 \ +&& apt-get install -qq 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/tools/docker/test/debian-13/dotnet.Dockerfile b/tools/docker/test/debian-13/dotnet.Dockerfile index 571d312853..cf0334c796 100644 --- a/tools/docker/test/debian-13/dotnet.Dockerfile +++ b/tools/docker/test/debian-13/dotnet.Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update -qq \ && dpkg -i packages-microsoft-prod.deb \ && rm packages-microsoft-prod.deb \ && apt-get update -qq \ -&& apt-get install -qq dotnet-sdk-3.1 dotnet-sdk-8.0 \ +&& apt-get install -qq 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/tools/docker/test/debian-sid/dotnet.Dockerfile b/tools/docker/test/debian-sid/dotnet.Dockerfile index 506c4048ad..5ebd330602 100644 --- a/tools/docker/test/debian-sid/dotnet.Dockerfile +++ b/tools/docker/test/debian-sid/dotnet.Dockerfile @@ -7,14 +7,14 @@ RUN apt-get update \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* # Install .Net -# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-11- +# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-13- RUN apt-get update -qq \ && apt-get install -qq gpg apt-transport-https \ -&& wget -q "https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb \ +&& wget -q "https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && rm packages-microsoft-prod.deb \ && apt-get update -qq \ -&& apt-get install -qq dotnet-sdk-3.1 dotnet-sdk-8.0 \ +&& apt-get install -qq 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/tools/docker/test/opensuse-leap/dotnet.Dockerfile b/tools/docker/test/opensuse-leap/dotnet.Dockerfile index 8153d9b9e6..89b82a53dc 100644 --- a/tools/docker/test/opensuse-leap/dotnet.Dockerfile +++ b/tools/docker/test/opensuse-leap/dotnet.Dockerfile @@ -18,7 +18,6 @@ RUN zypper refresh \ # 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 3.1 -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/docker/test/ubuntu-20.04/dotnet.Dockerfile b/tools/docker/test/ubuntu-20.04/dotnet.Dockerfile index fa5faca501..eed4448aea 100644 --- a/tools/docker/test/ubuntu-20.04/dotnet.Dockerfile +++ b/tools/docker/test/ubuntu-20.04/dotnet.Dockerfile @@ -14,7 +14,7 @@ RUN apt-get update -qq \ && wget -q https://packages.microsoft.com/config/ubuntu/20.04/packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \ && apt-get update -qq \ -&& DEBIAN_FRONTEND=noninteractive apt-get install -yq dotnet-sdk-3.1 dotnet-sdk-8.0 \ +&& DEBIAN_FRONTEND=noninteractive 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/tools/release/amd64.Dockerfile b/tools/release/amd64.Dockerfile index d34f4c4725..b95ad2405e 100644 --- a/tools/release/amd64.Dockerfile +++ b/tools/release/amd64.Dockerfile @@ -24,7 +24,6 @@ CMD ["/usr/bin/bash"] # 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 3.1 -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 3e404fa439..b19b71c8fc 100644 --- a/tools/release/arm64.Dockerfile +++ b/tools/release/arm64.Dockerfile @@ -27,7 +27,6 @@ CMD ["/usr/bin/bash"] # 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 3.1 -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