Merge branch 'main' into jackhe/add-cpu-tracing-feature

microsoft · Jan 30, 2025 · 4f6d5c9 · 4f6d5c9
2 parents a3b5e33 + 54c572a
commit 4f6d5c9
Show file tree

Hide file tree

Showing 17 changed files with 663 additions and 686 deletions.
diff --git a/.azure/OneBranch.Tests.Official.yml b/.azure/OneBranch.Tests.Official.yml
@@ -29,7 +29,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -45,7 +45,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -63,7 +63,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -81,7 +81,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light

diff --git a/.azure/OneBranch.Tests.PullRequest.yml b/.azure/OneBranch.Tests.PullRequest.yml
@@ -29,7 +29,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -45,7 +45,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -63,7 +63,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light
@@ -81,7 +81,7 @@ stages:
   - template: ./obtemplates/run-bvt.yml
     parameters:
       pool: 1es-msquic-pool-internal
-      image: WinServerPrerelease
+      image: WinServerPrerelease-LatestPwsh
       platform: windows
       tls: schannel
       logProfile: Full.Light

diff --git a/.github/workflows/code-coverage.yml b/.github/workflows/code-coverage.yml
@@ -51,7 +51,7 @@ jobs:
     runs-on:
      - self-hosted
      - "1ES.Pool=1es-msquic-pool"
-     - "1ES.ImageOverride=WinServerPrerelease"
+     - "1ES.ImageOverride=WinServerPrerelease-LatestPwsh"
     steps:
     - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
       with:
@@ -94,7 +94,7 @@ jobs:
     runs-on:
     - self-hosted
     - "1ES.Pool=1es-msquic-pool"
-    - "1ES.ImageOverride=WinServerPrerelease"
+    - "1ES.ImageOverride=WinServerPrerelease-LatestPwsh"
     env:
       main-timeout: 3600000
       main-repeat: 100
@@ -144,7 +144,7 @@ jobs:
     runs-on:
     - self-hosted
     - "1ES.Pool=1es-msquic-pool"
-    - "1ES.ImageOverride=WinServerPrerelease"
+    - "1ES.ImageOverride=WinServerPrerelease-LatestPwsh"
     env:
       main-timeout: 3600000
       pr-timeout: 600000

diff --git a/.github/workflows/package-alpine-linux.yml b/.github/workflows/package-alpine-linux.yml
@@ -28,9 +28,6 @@ jobs:
       matrix:
         vec: [
           { friendlyName: "Alpine-3.20-x64", config: "Release", arch: "x64", tls: "openssl3", image: "mcr.microsoft.com/dotnet/sdk:8.0-alpine3.20-amd64" },
-          { friendlyName: "Alpine-3.20-ARM64", config: "Release", arch: "arm64", tls: "openssl3", image: "mcr.microsoft.com/dotnet/sdk:8.0-alpine3.20-arm64v8" },
-          # .NET is not working properly for ARM32 Alpine with QEMU, so keep it disabled for now.
-          # { friendlyName: "Alpine-3.20-ARM32", config: "Release", arch: "arm", tls: "openssl3", image: "mcr.microsoft.com/dotnet/sdk:8.0-alpine3.20-arm32v7" },
         ]
     runs-on: ubuntu-latest
     steps:
@@ -63,9 +60,6 @@ jobs:
       matrix:
         vec: [
           { friendlyName: "Alpine-3.20-x64", config: "Release", arch: "x64", tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-alpine3.20-amd64", dotnetVersion: "9.0" },
-          { friendlyName: "Alpine-3.20-ARM64", config: "Release", arch: "arm64", tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-alpine3.20-arm64v8", dotnetVersion: "9.0" },
-          # .NET is not working properly for ARM32 Alpine with QEMU, so keep it disabled for now.
-          # { friendlyName: "Alpine-3.20-ARM32", config: "Release", arch: "arm", tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-alpine3.20-arm32v7", dotnetVersion: "9.0" },
         ]
     runs-on: ubuntu-latest
     steps:

diff --git a/.github/workflows/package-linux.yml b/.github/workflows/package-linux.yml
@@ -92,20 +92,13 @@ jobs:
           { friendlyName: "Ubuntu 24.04 x64", config: "Release", os: "ubuntu-24.04", arch: "x64",   tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-noble-amd64", xdp: "-UseXdp", dotnetVersion: "9.0" },
           { friendlyName: "Ubuntu 24.04 ARM32", config: "Release", os: "ubuntu-24.04", arch: "arm",   tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-noble-arm32v7", dotnetVersion: "9.0" },
           { friendlyName: "Ubuntu 24.04 ARM64", config: "Release", os: "ubuntu-24.04", arch: "arm64", tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-noble-arm64v8", dotnetVersion: "9.0" },
-          # Ubuntu 22.04
-          { friendlyName: "Ubuntu 22.04 x64", config: "Release", os: "ubuntu-22.04", arch: "x64",   tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:8.0-jammy-amd64", dotnetVersion: "8.0" },
-          { friendlyName: "Ubuntu 22.04 ARM32", config: "Release", os: "ubuntu-22.04", arch: "arm", tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:8.0-jammy-arm32v7", dotnetVersion: "8.0" },
-          { friendlyName: "Ubuntu 22.04 ARM64", config: "Release", os: "ubuntu-22.04", arch: "arm64", tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:8.0-jammy-arm64v8", dotnetVersion: "8.0" },
           # Ubuntu 20.04
           { friendlyName: "Ubuntu 20.04 x64", config: "Release", os: "ubuntu-20.04", arch: "x64",   tls: "openssl", image: "mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-amd64", dotnetVersion: "9.0" },
           { friendlyName: "Ubuntu 20.04 ARM64", config: "Release", os: "ubuntu-20.04", arch: "arm64", tls: "openssl", image: "mcr.microsoft.com/dotnet-buildtools/prereqs:ubuntu-20.04-helix-arm64v8", dotnetVersion: "9.0" },
           # Debian 12
           { friendlyName: "Debian 12 x64", config: "Release", os: "ubuntu-22.04", arch: "x64",   tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-bookworm-slim-amd64", dotnetVersion: "9.0" },
           { friendlyName: "Debian 12 ARM32", config: "Release", os: "ubuntu-22.04", arch: "arm",   tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-bookworm-slim-arm32v7", dotnetVersion: "9.0" },
           { friendlyName: "Debian 12 ARM64", config: "Release", os: "ubuntu-22.04", arch: "arm64", tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-bookworm-slim-arm64v8", dotnetVersion: "9.0" },
-          # CBL-Mariner 2.0
-          { friendlyName: "CBL-Mariner 2.0 x64", config: "Release", os: "ubuntu-20.04", arch: "x64",   tls: "openssl", image: "mcr.microsoft.com/dotnet/runtime:8.0-cbl-mariner2.0-amd64", dotnetVersion: "8.0" },
-          { friendlyName: "CBL-Mariner 2.0 ARM64", config: "Release", os: "ubuntu-20.04", arch: "arm64",   tls: "openssl", image: "mcr.microsoft.com/dotnet/runtime:8.0-cbl-mariner2.0-arm64v8", dotnetVersion: "8.0" },
           # Azure Linux 3.0
           { friendlyName: "AzureLinux 3.0 x64", config: "Release", os: "ubuntu-24.04", arch: "x64",   tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-azurelinux3.0-amd64", dotnetVersion: "9.0", xdp: "-UseXdp" },
           { friendlyName: "AzureLinux 3.0 ARM64", config: "Release", os: "ubuntu-24.04", arch: "arm64",   tls: "openssl3", image: "mcr.microsoft.com/dotnet/runtime:9.0-azurelinux3.0-arm64v8", dotnetVersion: "9.0" },

diff --git a/.github/workflows/stress.yml b/.github/workflows/stress.yml
@@ -91,7 +91,7 @@ jobs:
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", xdp: "-UseXdp", build: "-Test" },
           { config: "Debug", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
         ]
-    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease'']') || matrix.vec.os }}
+    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease-LatestPwsh'']') || matrix.vec.os }}
     env:
       main-timeout: 3600000
       main-repeat: 100
@@ -155,7 +155,7 @@ jobs:
           { config: "Debug", plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3", xdp: "-UseXdp", build: "-Test" },
           { config: "Debug", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
         ]
-    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease'']') || matrix.vec.os }}
+    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease-LatestPwsh'']') || matrix.vec.os }}
     env:
       main-timeout: 3600000
       pr-timeout: 600000

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -127,7 +127,7 @@ jobs:
           { config: "Debug", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
           { config: "Release", plat: "windows", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
         ]
-    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease'']') || matrix.vec.os }}
+    runs-on: ${{ matrix.vec.plat == 'windows' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease-LatestPwsh'']') || matrix.vec.os }}
     steps:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -193,7 +193,7 @@ jobs:
           { config: "Debug", plat: "winkernel", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
           { config: "Release", plat: "winkernel", os: "WinServerPrerelease", arch: "x64", tls: "schannel", build: "-Test" },
         ]
-    runs-on: ${{ matrix.vec.plat == 'winkernel' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease'']') || matrix.vec.os }}
+    runs-on: ${{ matrix.vec.plat == 'winkernel' && matrix.vec.os == 'WinServerPrerelease' && fromJson('[''self-hosted'', ''1ES.Pool=1es-msquic-pool'', ''1ES.ImageOverride=WinServerPrerelease-LatestPwsh'']') || matrix.vec.os }}
     steps:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683
@@ -242,7 +242,7 @@ jobs:
     runs-on:
     - self-hosted
     - "1ES.Pool=1es-msquic-pool"
-    - "1ES.ImageOverride=WinServerPrerelease"
+    - "1ES.ImageOverride=WinServerPrerelease-LatestPwsh"
     steps:
     - name: Checkout repository
       uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -18,7 +18,8 @@ endif()
 message(STATUS "CMAKE Version: ${CMAKE_VERSION}")
 
 set_property(GLOBAL PROPERTY USE_FOLDERS ON)
-
+set(CMAKE_VS_GLOBALS "UseInternalMSUniCrtPackage=true")
+
 message(STATUS "Source Dir: ${CMAKE_CURRENT_SOURCE_DIR}")
 message(STATUS "Host System name: ${CMAKE_HOST_SYSTEM_NAME}")
 if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")

diff --git a/src/cs/QuicSimpleTest/QuicHello.net8.0.csproj b/src/cs/QuicSimpleTest/QuicHello.net8.0.csproj