diff options
author | Craig Tiller <ctiller@google.com> | 2016-02-25 12:57:56 -0800 |
---|---|---|
committer | Craig Tiller <ctiller@google.com> | 2016-02-25 12:57:56 -0800 |
commit | 21679875659f382991f4c4e9e8bea34e93bc9b7f (patch) | |
tree | b3e79e0b396fbd43e4df0269058b1ef3b672e6ff /src/csharp/Grpc.Core/Internal/DefaultSslRootsOverride.cs | |
parent | ee1f1f347de8c9a74d8b2cf01840a44fbed83996 (diff) | |
parent | f7806b766bf88d2173ef37a4205d1393bbd73d60 (diff) |
Merge github.com:grpc/grpc into hide-the-pollset
Diffstat (limited to 'src/csharp/Grpc.Core/Internal/DefaultSslRootsOverride.cs')
-rw-r--r-- | src/csharp/Grpc.Core/Internal/DefaultSslRootsOverride.cs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/csharp/Grpc.Core/Internal/DefaultSslRootsOverride.cs b/src/csharp/Grpc.Core/Internal/DefaultSslRootsOverride.cs index eeaa7add81..dfaee5d9d7 100644 --- a/src/csharp/Grpc.Core/Internal/DefaultSslRootsOverride.cs +++ b/src/csharp/Grpc.Core/Internal/DefaultSslRootsOverride.cs @@ -56,7 +56,7 @@ namespace Grpc.Core.Internal { lock (staticLock) { - var stream = Assembly.GetExecutingAssembly().GetManifestResourceStream(RootsPemResourceName); + var stream = typeof(DefaultSslRootsOverride).GetTypeInfo().Assembly.GetManifestResourceStream(RootsPemResourceName); if (stream == null) { throw new IOException(string.Format("Error loading the embedded resource \"{0}\"", RootsPemResourceName)); |