From 75019f244373eeac6238e76dc72ed751a4f9f173 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marie=20P=C3=ADchov=C3=A1?=
 <11718369+ManickaP@users.noreply.github.com>
Date: Mon, 5 Aug 2024 15:04:06 +0200
Subject: [PATCH] Fix msquic to 2.3.6 version (#1154)

---
 src/almalinux/8/helix/amd64/Dockerfile     | 3 ++-
 src/cbl-mariner/2.0/helix/amd64/Dockerfile | 3 ++-
 src/centos/stream9/helix/amd64/Dockerfile  | 3 ++-
 src/debian/11/helix/amd64/Dockerfile       | 3 ++-
 src/debian/11/helix/arm32v7/Dockerfile     | 3 ++-
 src/debian/11/helix/arm64v8/Dockerfile     | 5 +++--
 src/debian/12/helix/amd64/Dockerfile       | 3 ++-
 src/debian/12/helix/arm32v7/Dockerfile     | 3 ++-
 src/debian/12/helix/arm64v8/Dockerfile     | 3 ++-
 src/opensuse/15.4/helix/amd64/Dockerfile   | 3 ++-
 src/ubuntu/20.04/helix/Dockerfile          | 3 ++-
 src/ubuntu/22.04/helix/Dockerfile          | 3 ++-
 12 files changed, 25 insertions(+), 13 deletions(-)

diff --git a/src/almalinux/8/helix/amd64/Dockerfile b/src/almalinux/8/helix/amd64/Dockerfile
index 9ce33bd5b..6286bd5f2 100644
--- a/src/almalinux/8/helix/amd64/Dockerfile
+++ b/src/almalinux/8/helix/amd64/Dockerfile
@@ -13,7 +13,8 @@ RUN rpm -Uvh https://packages.microsoft.com/config/centos/8/packages-microsoft-p
         # Required for asp.net core test runs
         sudo \
         libicu \
-        libmsquic
+        # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+        libmsquic-2.3.6-1
 
 RUN python3 -m pip download --no-deps helix-scripts --index-url https://dnceng.pkgs.visualstudio.com/public/_packaging/helix-client-prod/pypi/simple && \
     python3 -m pip install ./helix_scripts-*-py3-none-any.whl
diff --git a/src/cbl-mariner/2.0/helix/amd64/Dockerfile b/src/cbl-mariner/2.0/helix/amd64/Dockerfile
index 3c4c9b2fd..54789a79c 100644
--- a/src/cbl-mariner/2.0/helix/amd64/Dockerfile
+++ b/src/cbl-mariner/2.0/helix/amd64/Dockerfile
@@ -9,7 +9,8 @@ RUN tdnf install --setopt tsflags=nodocs --refresh -y \
          gcc \
          icu \
          iputils \
-         libmsquic \
+         # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+         libmsquic-2.3.6-1 \
          llvm \
          python3-pip \
          shadow-utils \
diff --git a/src/centos/stream9/helix/amd64/Dockerfile b/src/centos/stream9/helix/amd64/Dockerfile
index a48dfb639..991b8e172 100644
--- a/src/centos/stream9/helix/amd64/Dockerfile
+++ b/src/centos/stream9/helix/amd64/Dockerfile
@@ -21,7 +21,8 @@ RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
         git-core \
         iputils \
         libicu \
-        libmsquic \
+        # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+        libmsquic-2.3.6-1 \
         libtool \
         llvm \
         make \
diff --git a/src/debian/11/helix/amd64/Dockerfile b/src/debian/11/helix/amd64/Dockerfile
index 9cc9725a1..1e9e281cd 100644
--- a/src/debian/11/helix/amd64/Dockerfile
+++ b/src/debian/11/helix/amd64/Dockerfile
@@ -46,7 +46,8 @@ RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
     rm microsoft.asc && \
     apt-add-repository https://packages.microsoft.com/debian/11/prod && \
     apt-get update && \
-    apt-get install -y libmsquic && \
+    # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+    apt-get install -y libmsquic=2.3.6 && \
     rm -rf /var/lib/apt/lists/*
 
 # Create helixbot user and give rights to sudo without password
diff --git a/src/debian/11/helix/arm32v7/Dockerfile b/src/debian/11/helix/arm32v7/Dockerfile
index 981e50f71..7dfebb480 100644
--- a/src/debian/11/helix/arm32v7/Dockerfile
+++ b/src/debian/11/helix/arm32v7/Dockerfile
@@ -45,7 +45,8 @@ RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
     rm microsoft.asc && \
     apt-add-repository https://packages.microsoft.com/debian/11/prod && \
     apt-get update && \
-    apt-get install -y libmsquic && \
+    # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+    apt-get install -y libmsquic=2.3.6 && \
     rm -rf /var/lib/apt/lists/*
 
 ENV LANG=en_US.utf8
diff --git a/src/debian/11/helix/arm64v8/Dockerfile b/src/debian/11/helix/arm64v8/Dockerfile
index 018d1de2c..d8517f81e 100644
--- a/src/debian/11/helix/arm64v8/Dockerfile
+++ b/src/debian/11/helix/arm64v8/Dockerfile
@@ -49,7 +49,8 @@ RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
     rm microsoft.asc && \
     apt-add-repository https://packages.microsoft.com/debian/11/prod && \
     apt-get update && \
-    apt-get install -y libmsquic && \
+    # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+    apt-get install -y libmsquic=2.3.6 && \
     rm -rf /var/lib/apt/lists/*
 
 # Create helixbot users and give rights to sudo without password
@@ -59,7 +60,7 @@ RUN /usr/sbin/adduser --disabled-password --gecos '' --uid 1001 --shell /bin/bas
     /usr/sbin/adduser --disabled-password --gecos '' --uid 1000 --shell /bin/bash --ingroup adm helixbot2 && \
     chmod 755 /root && \
     echo "helixbot ALL=(ALL)       NOPASSWD: ALL" > /etc/sudoers && \
-    echo "helixbot2 ALL=(ALL)       NOPASSWD: ALL" > /etc/sudoers 
+    echo "helixbot2 ALL=(ALL)       NOPASSWD: ALL" > /etc/sudoers
 
 USER helixbot
 
diff --git a/src/debian/12/helix/amd64/Dockerfile b/src/debian/12/helix/amd64/Dockerfile
index b2453bb4a..237470c49 100644
--- a/src/debian/12/helix/amd64/Dockerfile
+++ b/src/debian/12/helix/amd64/Dockerfile
@@ -56,7 +56,8 @@ RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
     rm microsoft.asc && \
     echo deb https://packages.microsoft.com/debian/12/prod bookworm main >> /etc/apt/sources.list.d/microsoft.list && \
     apt-get update && \
-    apt-get install -y libmsquic && \
+    # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+    apt-get install -y libmsquic=2.3.6 && \
     rm -rf /var/lib/apt/lists/*
 
 # Create helixbot user and give rights to sudo without password
diff --git a/src/debian/12/helix/arm32v7/Dockerfile b/src/debian/12/helix/arm32v7/Dockerfile
index c62c96021..80e24b4bd 100644
--- a/src/debian/12/helix/arm32v7/Dockerfile
+++ b/src/debian/12/helix/arm32v7/Dockerfile
@@ -66,7 +66,8 @@ RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
     rm microsoft.asc && \
     echo deb https://packages.microsoft.com/debian/12/prod bookworm main >> /etc/apt/sources.list.d/microsoft.list && \
     apt-get update && \
-    apt-get install -y libmsquic && \
+    # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+    apt-get install -y libmsquic=2.3.6 && \
     rm -rf /var/lib/apt/lists/*
 
 # Create helixbot user and give rights to sudo without password
diff --git a/src/debian/12/helix/arm64v8/Dockerfile b/src/debian/12/helix/arm64v8/Dockerfile
index b2453bb4a..237470c49 100644
--- a/src/debian/12/helix/arm64v8/Dockerfile
+++ b/src/debian/12/helix/arm64v8/Dockerfile
@@ -56,7 +56,8 @@ RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
     rm microsoft.asc && \
     echo deb https://packages.microsoft.com/debian/12/prod bookworm main >> /etc/apt/sources.list.d/microsoft.list && \
     apt-get update && \
-    apt-get install -y libmsquic && \
+    # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+    apt-get install -y libmsquic=2.3.6 && \
     rm -rf /var/lib/apt/lists/*
 
 # Create helixbot user and give rights to sudo without password
diff --git a/src/opensuse/15.4/helix/amd64/Dockerfile b/src/opensuse/15.4/helix/amd64/Dockerfile
index eafdf9ca0..7c66f595d 100644
--- a/src/opensuse/15.4/helix/amd64/Dockerfile
+++ b/src/opensuse/15.4/helix/amd64/Dockerfile
@@ -42,7 +42,8 @@ RUN wget https://packages.microsoft.com/keys/microsoft.asc && \
     rpm --import microsoft.asc && \
     rm microsoft.asc && \
     zypper addrepo https://packages.microsoft.com/opensuse/15/prod/ "MS Packages" && \
-    zypper install -y libmsquic && \
+    # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+    zypper install -y libmsquic=2.3.6-1 && \
     zypper clean -a
 
 RUN ln -sf /usr/bin/python3 /usr/bin/python && \
diff --git a/src/ubuntu/20.04/helix/Dockerfile b/src/ubuntu/20.04/helix/Dockerfile
index 9950652c5..396769000 100644
--- a/src/ubuntu/20.04/helix/Dockerfile
+++ b/src/ubuntu/20.04/helix/Dockerfile
@@ -53,7 +53,8 @@ RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
     rm microsoft.asc && \
     apt-add-repository https://packages.microsoft.com/ubuntu/20.04/prod && \
     apt-get update && \
-    apt-get install -y libmsquic && \
+    # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+    apt-get install -y libmsquic=2.3.6 && \
     rm -rf /var/lib/apt/lists/*
 
 # create helixbot user and give rights to sudo without password
diff --git a/src/ubuntu/22.04/helix/Dockerfile b/src/ubuntu/22.04/helix/Dockerfile
index cb7b2e31a..8db501cce 100644
--- a/src/ubuntu/22.04/helix/Dockerfile
+++ b/src/ubuntu/22.04/helix/Dockerfile
@@ -52,7 +52,8 @@ RUN curl -LO https://packages.microsoft.com/keys/microsoft.asc && \
     rm microsoft.asc && \
     apt-add-repository https://packages.microsoft.com/ubuntu/22.04/prod && \
     apt-get update && \
-    apt-get install -y libmsquic && \
+    # temporarilly fix msquic to 2.3.6 due to https://github.com/dotnet/runtime/issues/105788
+    apt-get install -y libmsquic=2.3.6 && \
     rm -rf /var/lib/apt/lists/*
 
 # create helixbot user and give rights to sudo without password