Skip to content

Commit 6275619

Browse files
MizuxMizux
committed
dotnet: Remove EOL .Net Core 3.1 in release artifacts
Please target .Net 8.0 or above... ref: https://dotnet.microsoft.com/en-us/platform/support/policy/dotnet-core
1 parent b912ebf commit 6275619

27 files changed

Lines changed: 11 additions & 38 deletions

‎cmake/docker/almalinux/dotnet.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ FROM ortools/cmake:almalinux_swig AS env
44
# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
55
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
66
&& chmod a+x dotnet-install.sh \
7-
&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
87
&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
98
# Trigger first run experience by running arbitrary cmd
109
RUN dotnet --info

‎cmake/docker/rockylinux/dotnet.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ FROM ortools/cmake:rockylinux_swig AS env
44
# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
55
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
66
&& chmod a+x dotnet-install.sh \
7-
&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
87
&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
98
# Trigger first run experience by running arbitrary cmd
109
RUN dotnet --info

‎tools/docker/Makefile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ help:
116116
@echo
117117
@echo -e "\t${BOLD}<lang>${RESET}: Language to build"
118118
@echo -e "\t\t${BOLD}cpp${RESET} C++"
119-
@echo -e "\t\t${BOLD}dotnet${RESET} .Net Core 3.1 and/or .Net 8.0 wrappers"
119+
@echo -e "\t\t${BOLD}dotnet${RESET} .Net 8.0 wrappers"
120120
@echo -e "\t\t${BOLD}java${RESET} Java (JDK 8.0) wrappers"
121121
@echo -e "\t\t${BOLD}python${RESET} Python 3.9+ wrappers"
122122
@echo

‎tools/docker/images/almalinux-9.Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,6 @@ RUN dnf -y update \
3232
# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
3333
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
3434
&& chmod a+x dotnet-install.sh \
35-
&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
3635
&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
3736
# Trigger first run experience by running arbitrary cmd
3837
RUN dotnet --info
@@ -90,7 +89,6 @@ RUN make archive_cpp
9089
## build
9190
FROM cpp_build AS dotnet_build
9291
RUN sed -i 's/\(<SignAssembly>\).*\(<\/SignAssembly>\)/\1false\2/' ortools/dotnet/Google.OrTools*.csproj.in
93-
ENV USE_DOTNET_CORE_31=ON
9492
RUN make detect_dotnet \
9593
&& make dotnet JOBS=8
9694
## archive

‎tools/docker/images/alpine-edge.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ RUN make archive_cpp
6666
# .Net
6767
## build
6868
FROM cpp_build AS dotnet_build
69-
ENV USE_DOTNET_CORE_31=ON
7069
RUN make detect_dotnet \
7170
&& make dotnet JOBS=8
7271
## archive

‎tools/docker/images/archlinux.Dockerfile‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,6 @@ RUN make archive_cpp
6767
# .Net
6868
## build
6969
FROM cpp_build AS dotnet_build
70-
ENV USE_DOTNET_CORE_31=OFF
7170
RUN make detect_dotnet \
7271
&& make dotnet JOBS=8
7372
## archive

‎tools/docker/images/debian-11.Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ RUN ARCH=$(uname -m) \
2424
# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
2525
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
2626
&& chmod a+x dotnet-install.sh \
27-
&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
2827
&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
2928
# Trigger first run experience by running arbitrary cmd
3029
RUN dotnet --info
@@ -83,7 +82,6 @@ RUN make archive_cpp
8382
# .Net
8483
## build
8584
FROM cpp_build AS dotnet_build
86-
ENV USE_DOTNET_CORE_31=ON
8785
RUN make detect_dotnet \
8886
&& make dotnet JOBS=8
8987
## archive

‎tools/docker/images/debian-12.Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ CMD ["/bin/bash"]
1717
# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
1818
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
1919
&& chmod a+x dotnet-install.sh \
20-
&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
2120
&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
2221
# Trigger first run experience by running arbitrary cmd
2322
RUN dotnet --info
@@ -77,7 +76,6 @@ RUN make archive_cpp
7776
# .Net
7877
## build
7978
FROM cpp_build AS dotnet_build
80-
ENV USE_DOTNET_CORE_31=ON
8179
RUN make detect_dotnet \
8280
&& make dotnet JOBS=8
8381
## archive

‎tools/docker/images/debian-13.Dockerfile‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ CMD ["/bin/bash"]
1717
# see: https://learn.microsoft.com/en-us/dotnet/core/install/linux-scripted-manual#scripted-install
1818
RUN wget -q "https://dot.net/v1/dotnet-install.sh" \
1919
&& chmod a+x dotnet-install.sh \
20-
&& ./dotnet-install.sh -c 3.1 -i /usr/local/bin \
2120
&& ./dotnet-install.sh -c 8.0 -i /usr/local/bin
2221
# Trigger first run experience by running arbitrary cmd
2322
RUN dotnet --info
@@ -76,7 +75,6 @@ RUN make archive_cpp
7675
# .Net
7776
## build
7877
FROM cpp_build AS dotnet_build
79-
ENV USE_DOTNET_CORE_31=ON
8078
RUN make detect_dotnet \
8179
&& make dotnet JOBS=8
8280
## archive

‎tools/docker/images/debian-sid.Dockerfile‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@ RUN apt update -qq \
1818
&& rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
1919

2020
# Install .Net
21-
# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-11-
21+
# see https://docs.microsoft.com/en-us/dotnet/core/install/linux-debian#debian-13-
2222
RUN apt-get update -qq \
2323
&& apt-get install -qq gpg apt-transport-https \
24-
&& wget -q "https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb \
24+
&& wget -q "https://packages.microsoft.com/config/debian/13/packages-microsoft-prod.deb" -O packages-microsoft-prod.deb \
2525
&& dpkg -i packages-microsoft-prod.deb \
2626
&& rm packages-microsoft-prod.deb \
2727
&& apt-get update -qq \
@@ -88,7 +88,6 @@ RUN make archive_cpp
8888
# .Net
8989
## build
9090
FROM cpp_build AS dotnet_build
91-
ENV USE_DOTNET_CORE_31=ON
9291
RUN make detect_dotnet \
9392
&& make dotnet JOBS=8
9493
## archive

0 commit comments

Comments
 (0)