Skip to content

C#: Use explicit native extension loading whenever possible#25490

Merged
jtattermusch merged 2 commits intogrpc:masterfrom
jtattermusch:fix_loading_native
Feb 19, 2021
Merged

C#: Use explicit native extension loading whenever possible#25490
jtattermusch merged 2 commits intogrpc:masterfrom
jtattermusch:fix_loading_native

Conversation

@jtattermusch
Copy link
Copy Markdown
Contributor

Tentatively fixes the hang issue described in #25208.

The problem is a side effect of #24744.

@jtattermusch jtattermusch added lang/C# release notes: yes Indicates if PR needs to be in release notes labels Feb 18, 2021
@jtattermusch
Copy link
Copy Markdown
Contributor Author

CC @jskeet

@jtattermusch
Copy link
Copy Markdown
Contributor Author

@jtattermusch
Copy link
Copy Markdown
Contributor Author

@jtattermusch
Copy link
Copy Markdown
Contributor Author

jtattermusch commented Feb 18, 2021

Also fixes #7303

Relevant to: #25211, #25274

// are similarly copied to the built output folder, through the magic of Microsoft.NETCore.Platforms.
var classicPath = Path.Combine(assemblyDirectory, GetNativeLibraryFilename());

// With dotnet SDK project targeting netcoreappX.Y, projects will use Grpc.Core assembly directly in the location where it got restored
Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@jtattermusch
Copy link
Copy Markdown
Contributor Author

@jskeet
Copy link
Copy Markdown
Contributor

jskeet commented Feb 18, 2021

I'll do a test tomorrow, thanks.

@jskeet
Copy link
Copy Markdown
Contributor

jskeet commented Feb 19, 2021

My specific "hang test" worked, as did the smoke tests for an actual API - great! Thanks very much :)

@jtattermusch jtattermusch merged commit 3944bfa into grpc:master Feb 19, 2021
lidizheng pushed a commit that referenced this pull request Feb 19, 2021
* add IsNet5OrHigher to PlatformApis

* use explicit native library loading whenever possible
gnossen added a commit that referenced this pull request Mar 24, 2021
* Bump version to 1.36.0-pre1

* Regenerate projects

* update dotnet sdk5 docker image to avoid nuget download error

* Merge pull request #25456 from gnossen/fix_interop_breakage

Bump xDS Interop Tests to Python 3

* Backport #25490 into v1.36.x (#25506)

* add IsNet5OrHigher to PlatformApis

* use explicit native library loading whenever possible

* Bump version to v1.36.0 (#25534)

* add env var protection for google-c2p resolver (#25548) (#25569)

* Bump version to 1.36.1 (#25574)

* Relax ruby test check on protobuf error message (#25507) (#25591)

Co-authored-by: apolcyn <[email protected]>

* [Backport] Update the way dockerfiles install pip for python 2.7 and 3.5 (#25607)

* Backport: Update the way dockerfiles install pip for python 2.7 and 3.5

* Fix implicit-int-float-conversion warning.

Co-authored-by: Jan Tattermusch <[email protected]>
Co-authored-by: Levon Ter-Grigoryan <[email protected]>

* Backport #25647 and #25510 (#25664)

* Fix pypa link (#25647)

* Fix pypa link

* And 3.5 as well

* [xDS Proto] Pin PyPI dependencies in Dockerfiles (#25510)

* Regenerate projects

Co-authored-by: Lidi Zheng <[email protected]>

* Fix an infinite read loop with SRV record resolution on windows (#25690)

* Bump version to 1.36.4 (#25744)

Co-authored-by: Lidi Zheng <[email protected]>
Co-authored-by: Jan Tattermusch <[email protected]>
Co-authored-by: Jan Tattermusch <[email protected]>
Co-authored-by: Mark D. Roth <[email protected]>
Co-authored-by: apolcyn <[email protected]>
Co-authored-by: Levon Ter-Grigoryan <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

lang/C# release notes: yes Indicates if PR needs to be in release notes

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants