Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merging internal commits for release/8.0 #109742

Merged
merged 11 commits into from
Dec 2, 2024
Merged

Merging internal commits for release/8.0 #109742

Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
3a6fc48
Use explicit full-path for loading MsQuic.dll
rzikm Aug 28, 2024
c0d9021
Fix wording of comment
rzikm Aug 28, 2024
dcf4a22
Merge commit 'eeb6f525300cd8312185decc2805a1651d312e23'
Sep 24, 2024
fd1ed01
Merge commit '11046b215513f6d58c92b51198a2fd1eb1c0e0ab'
Oct 2, 2024
90bfbda
Merged PR 42182: Use explicit full-path for loading MsQuic.dll
rzikm Oct 7, 2024
1ffa061
Merge commit 'ef07c4f26e56f6d140938c88ba64375dfefc285f'
Oct 9, 2024
49a4489
Merge commit '760832a2e325534ae01886012dc2cac2b6bc84a7'
Oct 9, 2024
5292f3a
Merge commit 'e0789c672ac0fe8fc0013d34b8ad76a79c1f8974'
Oct 14, 2024
c36b66f
Merge commit 'cddad1eeb82fe9f8f46b11442e353f46230ec6ac'
Oct 15, 2024
9cb3b72
Merge commit '82d4dbfc06a745b9404152b3281eb9559ca1f0d3'
Oct 17, 2024
0cb305f
Merge commit '9cb3b725e3ad2b57ddc9fb2dd48d2d170563a8f5' into internal…
vseanreesermsft Nov 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 19 additions & 4 deletions src/libraries/System.Net.Quic/src/System/Net/Quic/Internal/MsQuicApi.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,23 @@ static MsQuicApi()

if (OperatingSystem.IsWindows())
{
// Windows ships msquic in the assembly directory.
loaded = NativeLibrary.TryLoad(Interop.Libraries.MsQuic, typeof(MsQuicApi).Assembly, DllImportSearchPath.AssemblyDirectory, out msQuicHandle);
#pragma warning disable IL3000 // Avoid accessing Assembly file path when publishing as a single file
// Windows ships msquic in the assembly directory next to System.Net.Quic, so load that.
// For single-file deployments, the assembly location is an empty string so we fall back
// to AppContext.BaseDirectory which is the directory containing the single-file executable.
string path = typeof(MsQuicApi).Assembly.Location is string assemblyLocation && !string.IsNullOrEmpty(assemblyLocation)
? System.IO.Path.GetDirectoryName(assemblyLocation)!
: AppContext.BaseDirectory;
#pragma warning restore IL3000

path = System.IO.Path.Combine(path, Interop.Libraries.MsQuic);

if (NetEventSource.Log.IsEnabled())
{
NetEventSource.Info(null, $"Attempting to load MsQuic from {path}");
}

loaded = NativeLibrary.TryLoad(path, typeof(MsQuicApi).Assembly, DllImportSearchPath.LegacyBehavior, out msQuicHandle);
}
else
{
Expand Down Expand Up @@ -154,7 +169,7 @@ static MsQuicApi()

if (version < s_minMsQuicVersion)
{
NotSupportedReason = $"Incompatible MsQuic library version '{version}', expecting higher than '{s_minMsQuicVersion}'.";
NotSupportedReason = $"Incompatible MsQuic library version '{version}', expecting higher than '{s_minMsQuicVersion}'.";
if (NetEventSource.Log.IsEnabled())
{
NetEventSource.Info(null, NotSupportedReason);
Expand All @@ -178,7 +193,7 @@ static MsQuicApi()
// Implies windows platform, check TLS1.3 availability
if (!IsWindowsVersionSupported())
{
NotSupportedReason = $"Current Windows version ({Environment.OSVersion}) is not supported by QUIC. Minimal supported version is {s_minWindowsVersion}.";
NotSupportedReason = $"Current Windows version ({Environment.OSVersion}) is not supported by QUIC. Minimal supported version is {s_minWindowsVersion}.";
if (NetEventSource.Log.IsEnabled())
{
NetEventSource.Info(null, NotSupportedReason);
Expand Down
Loading