Merge branch 'main' into seera-main

Author: masa-koz

.azure/OneBranch.Official.yml

@@ -167,13 +167,11 @@ extends:
           config: Release
           kernel: "kernel6_8"
           tls: quictls
-          xdp: "-UseXdp"
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
           kernel: "kernel6_8"
           tls: quictls
-          xdp: "-UseXdp"
 
     - stage: package_linux
       displayName: Package Linux

.azure/OneBranch.Publish.yml

@@ -40,7 +40,7 @@ parameters:
         - microsoft-ubuntu-lunar-prod-apt    # 23.04 6.2
         - microsoft-ubuntu-mantic-prod-apt   # 23.10 6.5
         - microsoft-debian-bookworm-prod-apt # 12    6.1
-  # built on ubuntu 24.04 quictls XDP
+  # built on ubuntu 24.04 quictls
   - name: kernel6_8
     type: object
     default:

.azure/OneBranch.PullRequest.yml

@@ -163,13 +163,11 @@ extends:
           config: Release
           kernel: "kernel6_8"
           tls: quictls
-          xdp: "-UseXdp"
       - template: .azure/obtemplates/build-linux.yml@self
         parameters:
           config: Debug
           kernel: "kernel6_8"
           tls: quictls
-          xdp: "-UseXdp"
 
     - stage: package_linux
       displayName: Package Linux

.azure/obtemplates/build-linux.yml

@@ -3,7 +3,6 @@ parameters:
   tls: 'quictls'
   platform: 'linux'
   kernel: 'kernel5_15'
-  xdp: ''
 
 jobs:
 - job: ${{ parameters.kernel }}_${{ parameters.config }} # this job name becomes artifact suffix in the build pipeline
@@ -34,7 +33,7 @@ jobs:
     inputs:
       pwsh: true
       filePath: scripts/build.ps1
-      arguments: -Tls ${{ parameters.tls }} -Config ${{ parameters.config }} -Platform ${{ parameters.platform }} ${{ parameters.xdp }} -Arch x64 -CI -UseSystemOpenSSLCrypto -OneBranch -OfficialRelease
+      arguments: -Tls ${{ parameters.tls }} -Config ${{ parameters.config }} -Platform ${{ parameters.platform }} -Arch x64 -CI -UseSystemOpenSSLCrypto -OneBranch -OfficialRelease
   - task: PowerShell@2
     displayName: arm64
     ${{ if eq(parameters.kernel, 'kernel5_15') }}:

.docker/ubuntu-22.04/Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Base image
-FROM ubuntu:22.04@sha256:3ba65aa20f86a0fad9df2b2c259c613df006b2e6d0bfcc8a146afb8c525a9751 AS base
+FROM ubuntu:22.04@sha256:eb29ed27b0821dca09c2e28b39135e185fc1302036427d5f4d70a41ce8fd7659 AS base
 
 LABEL org.opencontainers.image.source=https://github.com/microsoft/msquic
 
@@ -94,6 +94,7 @@ RUN echo $' \n\
 deb [arch=armhf,arm64] http://ports.ubuntu.com/ jammy main restricted universe multiverse \n\
 deb [arch=armhf,arm64] http://ports.ubuntu.com/ jammy-updates main restricted universe multiverse \n\
 deb [arch=armhf,arm64] http://ports.ubuntu.com/ jammy-backports main restricted universe multiverse \n\
+deb [arch=armhf,arm64] http://ports.ubuntu.com/ jammy-security main restricted universe multiverse \n\
 ' > /etc/apt/sources.list.d/arm-cross-compile-sources.list
 
 RUN apt-get update \

.docker/ubuntu-24.04/Dockerfile

@@ -1,5 +1,5 @@
 # Stage 1: Base image
-FROM ubuntu:24.04@sha256:d1e2e92c075e5ca139d51a140fff46f84315c0fdce203eab2807c7e495eff4f9 AS base
+FROM ubuntu:24.04@sha256:186072bba1b2f436cbb91ef2567abca677337cfc786c86e107d25b7072feef0c AS base
 
 LABEL org.opencontainers.image.source=https://github.com/microsoft/msquic
 
@@ -55,7 +55,6 @@ RUN wget -q https://launchpad.net/ubuntu/+archive/primary/+files/libicu72_72.1-3
 RUN git config --global safe.directory '*'
 
 # Stage 2: dependencies for cross-build.
-#          ubuntu 24.04 can install both xdp and arm dependencies
 FROM base AS cross-build
 
 RUN apt-get update -y && apt-get install --no-install-recommends -y \
@@ -73,7 +72,7 @@ RUN apt-get update -y && apt-get install --no-install-recommends -y \
     libbpf-dev \
     && rm -rf /var/lib/apt/lists/*
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update -y && apt-get install --no-install-recommends -y \
     gcc-arm-linux-gnueabihf \
     g++-arm-linux-gnueabihf \
     binutils-arm-linux-gnueabihf \
@@ -85,15 +84,21 @@ RUN apt-get update && apt-get install -y \
 RUN dpkg --add-architecture arm64 && \
     dpkg --add-architecture armhf
 
-RUN mv /etc/apt/sources.list /etc/apt/sources.list.int && \
+# For cross-compilation, we need amd64 packages from the default Ubuntu repos and
+# ARM packages from ports.ubuntu.com. To prevent apt from trying to resolve ARM
+# packages against the default (amd64-only) repos, we restrict all default sources
+# to amd64. On 24.04, the default repos are defined in ubuntu.sources (DEB822
+# format), which doesn't exist on 22.04, so this line is only needed here.
+RUN sed -i '/^Types:/a Architectures: amd64' /etc/apt/sources.list.d/ubuntu.sources && \
+    mv /etc/apt/sources.list /etc/apt/sources.list.int && \
     cat /etc/apt/sources.list.int | grep "^deb" | sed 's/deb /deb [arch=amd64] /g' > /etc/apt/sources.list && \
-    rm /etc/apt/sources.list.int && \
-    rm /etc/apt/sources.list.d/ubuntu.sources
+    rm /etc/apt/sources.list.int
 
 RUN echo $' \n\
 deb [arch=armhf,arm64] http://ports.ubuntu.com/ noble main restricted universe multiverse \n\
 deb [arch=armhf,arm64] http://ports.ubuntu.com/ noble-updates main restricted universe multiverse \n\
 deb [arch=armhf,arm64] http://ports.ubuntu.com/ noble-backports main restricted universe multiverse \n\
+deb [arch=armhf,arm64] http://ports.ubuntu.com/ noble-security main restricted universe multiverse \n\
 ' > /etc/apt/sources.list.d/arm-cross-compile-sources.list
 
 RUN apt-get update \

.github/copilot-instructions.md

@@ -123,6 +123,10 @@ The `check-dotnet.yml` CI workflow validates the generated .NET interop files ar
 - Public API is in `src/inc/msquic.h`. C++ wrapper in `src/inc/msquic.hpp`.
 - Test infrastructure uses GoogleTest. Test cases in `src/test/lib/`, runner in `src/test/bin/`.
 
+## Pull Requests
+
+When creating pull requests, always follow the PR template at `.github/pull_request_template.md`.
+
 ## Update These Instructions
 
 As you learn the codebase, update this file with any important information you think would help future contributors. This is the primary source of truth for how to work with the codebase, so keep it accurate and comprehensive.

.github/workflows/build-reuse-darwin-framework.yml

@@ -64,12 +64,12 @@ jobs:
         repository: ${{ inputs.repo}}
         ref: ${{ inputs.ref }}
     - name: Download Build Artifacts (x64)
-      uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
       with:
         name: ${{ inputs.config }}-macos-macos-15-x64-${{ inputs.tls }}${{ inputs.static }}
         path: artifacts
     - name: Download Build Artifacts (arm64)
-      uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
       with:
         name: ${{ inputs.config }}-macos-macos-15-arm64-${{ inputs.tls }}${{ inputs.static }}
         path: artifacts
@@ -101,7 +101,7 @@ jobs:
         repository: ${{ inputs.repo}}
         ref: ${{ inputs.ref }}
     - name: Download Build Artifacts (x64)
-      uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
       with:
         name: ${{ inputs.config }}-${{ matrix.vec.plat }}-macos-15-${{ matrix.vec.arch }}-${{ inputs.tls }}${{ inputs.static }}
         path: artifacts
@@ -125,17 +125,17 @@ jobs:
         repository: ${{ inputs.repo}}
         ref: ${{ inputs.ref }}
     - name: Download Build Artifacts (iOS x64)
-      uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
       with:
         name: Framework-${{ inputs.config }}-ios-macos-15-x64-${{ inputs.tls }}
         path: artifacts
     - name: Download Build Artifacts (iOS arm64)
-      uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
       with:
         name: Framework-${{ inputs.config }}-ios-macos-15-arm64-${{ inputs.tls }}
         path: artifacts
     - name: Download Build Artifacts (MacOS Universal)
-      uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3
+      uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c
       with:
         name: Framework-${{ inputs.config }}-macos-macos-15-universal-${{ inputs.tls }}
         path: artifacts

.github/workflows/build-reuse-unix.yml

@@ -69,10 +69,6 @@ on:
         required: false
         default: ''
         type: string
-      xdp:
-        required: false
-        default: ''
-        type: string
       iouring:
         required: false
         default: ''
@@ -92,7 +88,7 @@ permissions:
 jobs:
   build-unix-reuse:
     name: Build
-    runs-on: ${{ inputs.os == 'ubuntu-20.04' && fromJson('[''self-hosted'', ''1ES.Pool=ubuntu-20.04-forbuild'']') || inputs.os }}
+    runs-on: ${{ inputs.os == 'ubuntu-20.04' && fromJson(format('[''self-hosted'', ''1ES.Pool=ubuntu-20.04-forbuild'', ''JobId=build-unix-{0}-{1}-{2}-{3}-{4}-{5}'']', inputs.config, inputs.arch, inputs.tls, github.run_id, github.run_number, github.run_attempt)) || inputs.os }}
     container:
       image: ${{ (inputs.plat == 'linux' && format('ghcr.io/microsoft/msquic/linux-build-xcomp:{0}-cross', inputs.os)) || '' }}
     steps:
@@ -112,17 +108,17 @@ jobs:
     - name: Build For Test
       if: inputs.build == '-Test'
       shell: pwsh
-      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} -DisablePerf ${{ inputs.static }} ${{ inputs.clang }} ${{ inputs.systemcrypto }} ${{ inputs.codecheck }} ${{ inputs.sanitize }} ${{ inputs.xdp }} ${{ inputs.iouring }} -OneBranch
+      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} -DisablePerf ${{ inputs.static }} ${{ inputs.clang }} ${{ inputs.systemcrypto }} ${{ inputs.codecheck }} ${{ inputs.sanitize }} ${{ inputs.iouring }} -OneBranch
     - name: Build For Perf
       if: inputs.build == '-Perf'
       shell: pwsh
-      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} -DisableTools -DisableTest ${{ inputs.static }} ${{ inputs.clang }} ${{ inputs.systemcrypto }} ${{ inputs.codecheck }} ${{ inputs.sanitize }} ${{ inputs.xdp }} ${{ inputs.iouring }}
+      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} -DisableTools -DisableTest ${{ inputs.static }} ${{ inputs.clang }} ${{ inputs.systemcrypto }} ${{ inputs.codecheck }} ${{ inputs.sanitize }} ${{ inputs.iouring }}
     - name: Build
       if: inputs.build == ''
       shell: pwsh
-      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} ${{ inputs.static }} ${{ inputs.clang }} ${{ inputs.systemcrypto }} ${{ inputs.codecheck }} ${{ inputs.sanitize }} ${{ inputs.xdp }} ${{ inputs.iouring }} -OneBranch
+      run: scripts/build.ps1 -Config ${{ inputs.config }} -Platform ${{ inputs.plat }} -Arch ${{ inputs.arch }} -Tls ${{ inputs.tls }} ${{ inputs.static }} ${{ inputs.clang }} ${{ inputs.systemcrypto }} ${{ inputs.codecheck }} ${{ inputs.sanitize }} ${{ inputs.iouring }} -OneBranch
     - name: Upload build artifacts
       uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f
       with:
-        name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.tls }}${{ inputs.static }}${{ inputs.clang }}${{ inputs.systemcrypto }}${{ inputs.codecheck }}${{ inputs.sanitize }}${{ inputs.xdp }}${{ inputs.iouring }}${{ inputs.build }}
+        name: ${{ inputs.config }}-${{ inputs.plat }}-${{ inputs.os }}-${{ inputs.arch }}-${{ inputs.tls }}${{ inputs.static }}${{ inputs.clang }}${{ inputs.systemcrypto }}${{ inputs.codecheck }}${{ inputs.sanitize }}${{ inputs.iouring }}${{ inputs.build }}
         path: artifacts

.github/workflows/build-reuse-win.yml

@@ -83,7 +83,7 @@ jobs:
         repository: ${{ inputs.repo}}
         ref: ${{ inputs.ref }}
     - name: Install Perl
-      uses: shogo82148/actions-setup-perl@b6cfc127f1b0a63ac98797800f641494d80f42f8
+      uses: shogo82148/actions-setup-perl@5a2f3b681f2e2fa0db6cc52c7608d9916527aa58
       with:
         perl-version: '5.34'
     - name: Install NASM