Use explicit full-path for loading MsQuic.dll on Windows #109963
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
A call to `Assembly.Location` was added in a recent fix. It has `IL30000` suppressed via `#pragma warning disable`, but that only applies to the compilation of the library itself. Consumers will hit it when doing something like publishing their app as NativeAOT. This change adds an `[UnconditionalSuppressMessage]` to the `MsQuicApi` static constructor such that `IL30000` should also be suppressed for apps consuming the runtime. This was caught in an aspnetcore deps flow PR coming from runtime.
|
Tagging subscribers to this area: @dotnet/ncl |
ManickaP
approved these changes
Nov 19, 2024
am11
reviewed
Nov 19, 2024
| @@ -89,8 +91,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 | |||
There was a problem hiding this comment.
Why adding this pragma? The UnconditionalSuppress should already suppress this. Feels like this will just make it more likely to get #109958 resurface, whenever someone just mindlessly copies/pastes this code to somewhere else.
MichalStrehovsky
added a commit
that referenced
this pull request
Nov 20, 2024
MichalStrehovsky
added a commit
that referenced
this pull request
Nov 21, 2024
mikelle-rogers
pushed a commit
to mikelle-rogers/runtime
that referenced
this pull request
Dec 10, 2024
* Use explicit full-path for loading MsQuic.dll on Windows * Suppress IL3000 in MsQuicApi constructor A call to `Assembly.Location` was added in a recent fix. It has `IL30000` suppressed via `#pragma warning disable`, but that only applies to the compilation of the library itself. Consumers will hit it when doing something like publishing their app as NativeAOT. This change adds an `[UnconditionalSuppressMessage]` to the `MsQuicApi` static constructor such that `IL30000` should also be suppressed for apps consuming the runtime. This was caught in an aspnetcore deps flow PR coming from runtime. --------- Co-authored-by: Elinor Fung <elfung@microsoft.com>
mikelle-rogers
pushed a commit
to mikelle-rogers/runtime
that referenced
this pull request
Dec 10, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR explicitly composes the path from which MsQuic.dll is attempted to be loaded. It also logs the path to enable better diagnostics.