From adb1299f86e350f3ff568ccef7a7b31578a3a643 Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Tue, 3 Dec 2024 16:19:38 -0600
Subject: [PATCH 1/3] Add Debian 12 Dockerfile

---
 src/debian/12/amd64/Dockerfile | 60 ++++++++++++++++++++++++++++++++++
 src/debian/manifest.json       | 13 ++++++++
 2 files changed, 73 insertions(+)
 create mode 100644 src/debian/12/amd64/Dockerfile

diff --git a/src/debian/12/amd64/Dockerfile b/src/debian/12/amd64/Dockerfile
new file mode 100644
index 000000000..4a202f89f
--- /dev/null
+++ b/src/debian/12/amd64/Dockerfile
@@ -0,0 +1,60 @@
+FROM library/debian:bookworm
+
+# Dependencies for generic .NET Core builds and the base toolchain we need to
+# build anything (clang, cmake, make and the like)
+RUN apt-get update \
+    && apt-get upgrade -y \
+    && apt-get install -y \
+        apt-transport-https \
+        curl \
+        software-properties-common \
+    && curl -sL https://packages.microsoft.com/config/debian/12/packages-microsoft-prod.deb -o packages-microsoft-prod.deb \
+    && dpkg -i packages-microsoft-prod.deb \
+    && rm packages-microsoft-prod.deb \
+    && apt-get update \
+    && apt-get install -y \
+        autoconf \
+        automake \
+        azure-cli \
+        build-essential \
+        clang \
+        cmake \
+        elfutils \
+        file \
+        g++ \
+        gettext \
+        gdb \
+        git \
+        gnupg \
+        jq \
+        libcurl4-openssl-dev \
+        libgdiplus \
+        libicu-dev \
+        libkrb5-dev \
+        liblldb-dev \
+        liblttng-ust-dev \
+        libnuma-dev \
+        libssl-dev \
+        libssl1.1 \
+        libtool \
+        libunwind8-dev \
+        lldb \
+        llvm \
+        locales \
+        make \
+        pigz \
+        powershell \
+        python-lldb \
+        sudo \
+        tar \
+        uuid-dev \
+        zip \
+        zlib1g-dev \
+    && rm -rf /var/lib/apt/lists/*
+
+# .NET SDK MSBuild requires US.UTF-8 locale to execute tasks
+# These commands are from https://askubuntu.com/a/1027038
+RUN echo "locales locales/default_environment_locale select en_US.UTF-8" | debconf-set-selections \
+    && echo "locales locales/locales_to_be_generated multiselect en_US.UTF-8 UTF-8" | debconf-set-selections \
+    && rm "/etc/locale.gen" \
+    && dpkg-reconfigure --frontend noninteractive locales
diff --git a/src/debian/manifest.json b/src/debian/manifest.json
index 4eab92590..1a0e8e497 100644
--- a/src/debian/manifest.json
+++ b/src/debian/manifest.json
@@ -57,6 +57,19 @@
             }
           ]
         },
+        {
+          "platforms": [
+            {
+              "architecture": "amd64",
+              "dockerfile": "src/debian/12/amd64",
+              "os": "linux",
+              "osVersion": "bookworm",
+              "tags": {
+                "debian-12-amd64": {}
+              }
+            }
+          ]
+        },
         {
           "platforms": [
             {

From 25c1226236309323b370df993be804e64ab296bc Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Tue, 3 Dec 2024 16:24:07 -0600
Subject: [PATCH 2/3] Update codeowners

---
 CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODEOWNERS b/CODEOWNERS
index df174623e..bba5f0204 100644
--- a/CODEOWNERS
+++ b/CODEOWNERS
@@ -29,7 +29,7 @@ src/cbl-mariner/2.0/amd64/ @dotnet/runtime-infrastructure @dotnet/dotnet-docker-
 src/centos/stream9/amd64/ @dotnet/source-build @dotnet/dotnet-docker-reviewers
 
 # debian
-src/debian/11/amd64/ @dotnet/source-build @dotnet/dotnet-docker-reviewers
+src/debian/**/amd64/ @dotnet/source-build @dotnet/dotnet-docker-reviewers
 src/debian/11/opt/arm64v8/ @dotnet/runtime-infrastructure @dotnet/dotnet-docker-reviewers
 src/debian/12/gcc14/amd64/ @dotnet/runtime-infrastructure @dotnet/dotnet-docker-reviewers
 

From 8517abcb2419dc0bb824e73ec8d91380ca537d8a Mon Sep 17 00:00:00 2001
From: Matt Thalman <mthalman@microsoft.com>
Date: Wed, 4 Dec 2024 07:56:44 -0600
Subject: [PATCH 3/3] Update package names

---
 src/debian/12/amd64/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/debian/12/amd64/Dockerfile b/src/debian/12/amd64/Dockerfile
index 4a202f89f..820520f35 100644
--- a/src/debian/12/amd64/Dockerfile
+++ b/src/debian/12/amd64/Dockerfile
@@ -35,7 +35,7 @@ RUN apt-get update \
         liblttng-ust-dev \
         libnuma-dev \
         libssl-dev \
-        libssl1.1 \
+        libssl3 \
         libtool \
         libunwind8-dev \
         lldb \
@@ -44,7 +44,7 @@ RUN apt-get update \
         make \
         pigz \
         powershell \
-        python-lldb \
+        python3-lldb \
         sudo \
         tar \
         uuid-dev \