Skip to content

Commit f6fbf35

Browse files
gaurav2699nibanks
gaurav2699
and
nibanks
authored
backport onebranch fixes release 2.4 (#4862)
* Added support for using UCRT nuget package (#4759) * added oldnames.lib in test files (#4805) * added oldnames.lib in test files * conditional for windows check * Updates for Kernel Solution for 32-bit Builds (#4816) * changed kernel solution from x86 to win32 (#4847) * Added QUIC_API to test and tools code (#4850) * Win32 calls will be stdcall * added quic_api to test and tools * added QUIC_API to multiple callbacks * minor change * Win32 apicall (#4851) * Win32 calls will be stdcall * added quic_api to test and tools * added QUIC_API to multiple callbacks * minor change * added more quic_api * Remove ubuntu-20.04 from GitHub Actions (#4808) * Revert "Remove ubuntu-20.04 from GitHub Actions (#4808)" This reverts commit 6fae5da. * Remove ubuntu-20.04 from GitHub Actions (#4808) * Revert "Remove ubuntu-20.04 from GitHub Actions (#4808)" This reverts commit 6fae5da. * Remove ubuntu-20.04 from GitHub Actions (#4808) * merege conflict errors resolved --------- Co-authored-by: Nick Banks <nibanks@microsoft.com>
1 parent f283c90 commit f6fbf35

26 files changed

+107
-54
lines changed

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,8 @@ on:
2828
os:
2929
required: false
3030
type: string
31-
default: 'ubuntu-20.04'
31+
default: 'ubuntu-22.04'
3232
# options:
33-
# - ubuntu-20.04
3433
# - ubuntu-22.04
3534
# - ubuntu-24.04
3635
# - macos-13

‎.github/workflows/build.yml‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ jobs:
8181
matrix:
8282
config: ['Debug', 'Release']
8383
plat: [linux]
84-
os: ['ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04']
84+
os: ['ubuntu-22.04', 'ubuntu-24.04']
8585
arch: [arm, arm64]
8686
tls: [openssl, openssl3]
8787
static: ['', '-Static']
@@ -102,7 +102,7 @@ jobs:
102102
matrix:
103103
config: ['Debug', 'Release']
104104
plat: [linux, android]
105-
os: ['ubuntu-20.04', 'ubuntu-22.04', 'ubuntu-24.04']
105+
os: ['ubuntu-22.04', 'ubuntu-24.04']
106106
arch: [x86, x64]
107107
tls: [openssl, openssl3]
108108
systemcrypto: ['', '-UseSystemOpenSSLCrypto']
@@ -120,10 +120,6 @@ jobs:
120120
# TODO: android to support ubuntu-24.04
121121
- plat: android
122122
os: 'ubuntu-24.04'
123-
# No openssl3 system crypto on ubuntu-20.04
124-
- plat: linux
125-
os: 'ubuntu-20.04'
126-
tls: 'openssl3'
127123
systemcrypto: '-UseSystemOpenSSLCrypto'
128124
# No openssl system crypto on ubuntu-22.04
129125
- plat: linux
@@ -138,8 +134,6 @@ jobs:
138134
# linux xdp is for ubuntu24.04 only for now
139135
- plat: android
140136
xdp: "-UseXdp"
141-
- os: 'ubuntu-20.04'
142-
xdp: "-UseXdp"
143137
- os: 'ubuntu-22.04'
144138
xdp: "-UseXdp"
145139
- arch: x86

‎.github/workflows/docker-publish-xcomp.yml‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,12 @@ on:
55
branches: [ main ]
66
paths:
77
- .github/workflows/docker-publish-xcomp.yml
8-
- .docker/ubuntu-20.04/*
98
- .docker/ubuntu-22.04/*
109
- .docker/ubuntu-24.04/*
1110
pull_request:
1211
branches: [ main ]
1312
paths:
1413
- .github/workflows/docker-publish-xcomp.yml
15-
- .docker/ubuntu-20.04/*
1614
- .docker/ubuntu-22.04/*
1715
- .docker/ubuntu-24.04/*
1816

@@ -29,7 +27,7 @@ jobs:
2927
strategy:
3028
fail-fast: false
3129
matrix:
32-
version: ['20.04', '22.04', '24.04']
30+
version: ['22.04', '24.04']
3331
target: ['cross']
3432

3533
name: Build

‎.github/workflows/dotnet-test.yml‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,14 @@ jobs:
2525
uses: ./.github/workflows/build-reuse-darwin-framework.yml
2626
with:
2727
config: 'Debug'
28-
28+
2929
build-linux:
3030
name: Ubuntu
3131
needs: []
3232
strategy:
3333
fail-fast: false
3434
matrix:
3535
vec: [
36-
{ plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl" },
3736
{ plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
3837
{ plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "openssl3", xdp: "-UseXdp" },
3938
]
@@ -63,7 +62,7 @@ jobs:
6362
os: ${{ matrix.vec.os }}
6463
arch: ${{ matrix.vec.arch }}
6564
tls: ${{ matrix.vec.tls }}
66-
65+
6766
dotnet-test:
6867
name: DotNet Test
6968
needs: [build-windows, build-linux, build-darwin-frameworks]
@@ -73,7 +72,6 @@ jobs:
7372
vec: [
7473
{ plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl" },
7574
{ plat: "windows", os: "windows-2022", arch: "x64", tls: "openssl3" },
76-
{ plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl" },
7775
{ plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
7876
{ plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "openssl3", xdp: "-UseXdp" },
7977
{ plat: "macos", os: "macos-13", arch: "universal", tls: "openssl" },

‎.github/workflows/package-linux.yml‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,6 @@ jobs:
2727
fail-fast: false
2828
matrix:
2929
vec: [
30-
{ config: "Release", os: "ubuntu-20.04", arch: "arm", tls: "openssl" },
31-
{ config: "Release", os: "ubuntu-20.04", arch: "arm64", tls: "openssl" },
32-
{ config: "Release", os: "ubuntu-20.04", arch: "x64", tls: "openssl" },
3330
{ config: "Release", os: "ubuntu-22.04", arch: "arm", tls: "openssl3" },
3431
{ config: "Release", os: "ubuntu-22.04", arch: "arm64", tls: "openssl3" },
3532
{ config: "Release", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
@@ -53,7 +50,6 @@ jobs:
5350
fail-fast: false
5451
matrix:
5552
vec: [
56-
{ config: "Release", os: "ubuntu-20.04", arch: "x64", tls: "openssl" },
5753
{ config: "Release", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
5854
{ config: "Release", os: "ubuntu-24.04", arch: "x64", tls: "openssl3", xdp: "-UseXdp" },
5955
]
@@ -92,9 +88,6 @@ jobs:
9288
{ 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" },
9389
{ 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" },
9490
{ 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" },
95-
# Ubuntu 20.04
96-
{ 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" },
97-
{ 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" },
9891
# Debian 12
9992
{ 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" },
10093
{ 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" },
@@ -108,7 +101,7 @@ jobs:
108101
{ friendlyName: "Fedora 39 x64", config: "Release", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", image: "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-39", dotnetVersion: "9.0" },
109102
{ friendlyName: "Fedora 40 x64", config: "Release", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", image: "mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-40", dotnetVersion: "9.0" },
110103
# OpenSuse 15.4
111-
{ friendlyName: "OpenSuse 15.4 x64", config: "Release", os: "ubuntu-20.04", arch: "x64", tls: "openssl", image: "mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.4-helix-amd64", dotnetVersion: "9.0" },
104+
#{ friendlyName: "OpenSuse 15.4 x64", config: "Release", os: "ubuntu-20.04", arch: "x64", tls: "openssl", image: "mcr.microsoft.com/dotnet-buildtools/prereqs:opensuse-15.4-helix-amd64", dotnetVersion: "9.0" },
112105
# RHEL 8 - 9
113106
# { config: "Release", os: "ubuntu-24.04", arch: "x64", tls: "openssl3", image: "redhat/ubi8-minimal:latest" },
114107
# { config: "Release", os: "ubuntu-24.04", arch: "x64", tls: "openssl3", image: "redhat/ubi9-minimal:latest" },

‎.github/workflows/package-reuse-linux.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,10 +16,10 @@ on:
1616
os:
1717
required: false
1818
type: string
19-
default: 'ubuntu-20.04'
19+
default: 'ubuntu-22.04'
2020
# options:
21-
# - ubuntu-20.04
2221
# - ubuntu-22.04
22+
# - ubuntu-24.04
2323
arch:
2424
required: false
2525
default: 'x64'

‎.github/workflows/stress.yml‎

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,6 @@ jobs:
4949
vec: [
5050
{ config: "Debug", plat: "macos", os: "macos-13", arch: "x64", tls: "openssl", build: "-Test" },
5151
{ config: "Debug", plat: "macos", os: "macos-13", arch: "x64", tls: "openssl3", build: "-Test" },
52-
{ config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl", sanitize: "-Sanitize", build: "-Test" },
53-
{ config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
5452
{ config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
5553
{ config: "Debug", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
5654
{ config: "Debug", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "openssl3", build: "-Test", xdp: "-UseXdp" },
@@ -74,8 +72,6 @@ jobs:
7472
fail-fast: false
7573
matrix:
7674
vec: [
77-
{ config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl", sanitize: "-Sanitize", build: "-Test" },
78-
{ config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
7975
{ config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
8076
{ config: "Debug", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
8177
{ config: "Debug", plat: "linux", os: "ubuntu-24.04", arch: "x64", tls: "openssl3", build: "-Test", xdp: "-UseXdp" },

‎.github/workflows/test-down-level.yml‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,17 +29,15 @@ jobs:
2929
{ release: "2.1.11", os: "windows-2022", arch: "x64", tls: "schannel" },
3030
{ release: "2.1.11", os: "windows-2022", arch: "x64", tls: "openssl" },
3131
# v2.2
32-
{ release: "2.2.6", os: "ubuntu-20.04", arch: "x64", tls: "openssl" },
3332
{ release: "2.2.6", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
3433
{ release: "2.2.6", os: "windows-2022", arch: "x64", tls: "schannel" },
3534
{ release: "2.2.6", os: "windows-2022", arch: "x64", tls: "openssl" },
3635
{ release: "2.2.6", os: "windows-2022", arch: "x64", tls: "openssl3" },
3736
# v2.3
38-
{ release: "2.3.4", os: "ubuntu-20.04", arch: "x64", tls: "openssl" },
39-
{ release: "2.3.4", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
40-
{ release: "2.3.4", os: "windows-2022", arch: "x64", tls: "schannel" },
41-
{ release: "2.3.4", os: "windows-2022", arch: "x64", tls: "openssl" },
42-
{ release: "2.3.4", os: "windows-2022", arch: "x64", tls: "openssl3" },
37+
{ release: "2.3.8", os: "ubuntu-22.04", arch: "x64", tls: "openssl3" },
38+
{ release: "2.3.8", os: "windows-2022", arch: "x64", tls: "schannel" },
39+
{ release: "2.3.8", os: "windows-2022", arch: "x64", tls: "openssl" },
40+
{ release: "2.3.8", os: "windows-2022", arch: "x64", tls: "openssl3" },
4341
]
4442
runs-on: ${{ matrix.vec.os }}
4543
name: Test

‎.github/workflows/test.yml‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -66,9 +66,6 @@ jobs:
6666
fail-fast: false
6767
matrix:
6868
vec: [
69-
{ config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl", sanitize: "-Sanitize", build: "-Test" },
70-
{ config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl", systemcrypto: "-UseSystemOpenSSLCrypto", sanitize: "-Sanitize", build: "-Test" },
71-
{ config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
7269
{ config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl", sanitize: "-Sanitize", build: "-Test" },
7370
{ config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
7471
{ config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", systemcrypto: "-UseSystemOpenSSLCrypto", sanitize: "-Sanitize", build: "-Test" },
@@ -94,9 +91,6 @@ jobs:
9491
fail-fast: false
9592
matrix:
9693
vec: [
97-
{ config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl", sanitize: "-Sanitize", build: "-Test" },
98-
{ config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl", systemcrypto: "-UseSystemOpenSSLCrypto", sanitize: "-Sanitize", build: "-Test" },
99-
{ config: "Debug", plat: "linux", os: "ubuntu-20.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
10094
{ config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl", sanitize: "-Sanitize", build: "-Test" },
10195
{ config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", sanitize: "-Sanitize", build: "-Test" },
10296
{ config: "Debug", plat: "linux", os: "ubuntu-22.04", arch: "x64", tls: "openssl3", systemcrypto: "-UseSystemOpenSSLCrypto", sanitize: "-Sanitize", build: "-Test" },

‎CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,8 @@ endif()
1818
message(STATUS "CMAKE Version: ${CMAKE_VERSION}")
1919

2020
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
21-
21+
set(CMAKE_VS_GLOBALS "UseInternalMSUniCrtPackage=true")
22+
2223
message(STATUS "Source Dir: ${CMAKE_CURRENT_SOURCE_DIR}")
2324
message(STATUS "Host System name: ${CMAKE_HOST_SYSTEM_NAME}")
2425
if ("${CMAKE_HOST_SYSTEM_NAME}" STREQUAL "Windows")

0 commit comments

Comments
 (0)