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.

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

Reference SNI from SqlClient #169

Merged
merged 2 commits into from
Nov 12, 2024
Merged

Reference SNI from SqlClient #169

merged 2 commits into from
Nov 12, 2024

Conversation

ericstj
Copy link
Member

@ericstj ericstj commented Nov 12, 2024

No description provided.

@ericstj
Copy link
Member Author

ericstj commented Nov 12, 2024

Let me double check the nuspec before we merge this.

@ViktorHofer ViktorHofer enabled auto-merge (squash) November 12, 2024 16:35
@ViktorHofer ViktorHofer disabled auto-merge November 12, 2024 16:35
@ericstj
Copy link
Member Author

ericstj commented Nov 12, 2024

Ok, the first condition while "more correct" didn't actually result in the dependency being in the NUSPEC because we don't include platform specific sections in our dependencies.

I adjusted the condition and now we see:

    <dependencies>
      <group targetFramework=".NETFramework4.6.2" />
      <group targetFramework="net6.0">
        <dependency id="runtime.native.System.Data.SqlClient.sni" version="4.4.0" exclude="Build,Analyzers" />
      </group>
      <group targetFramework="net8.0">
        <dependency id="runtime.native.System.Data.SqlClient.sni" version="4.4.0" exclude="Build,Analyzers" />
      </group>
      <group targetFramework=".NETStandard2.0" />
    </dependencies>

I confirmed these were the only targets that required it by disassembling the binary and examining it's PInvokes. netstandard2.0 and net462 binaries do not contain pinvokes to sni.dll.

@ericstj
Copy link
Member Author

ericstj commented Nov 12, 2024

/azp run

Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@ericstj ericstj enabled auto-merge (squash) November 12, 2024 16:48
@ericstj ericstj merged commit 1230019 into dotnet:main Nov 12, 2024
5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants