aboutsummaryrefslogtreecommitdiff
path: root/Emby.Common.Implementations/Reflection/AssemblyInfo.cs
diff options
context:
space:
mode:
authorLuke <luke.pulverenti@gmail.com>2017-05-24 15:40:25 -0400
committerGitHub <noreply@github.com>2017-05-24 15:40:25 -0400
commitff19fd971c3dadd716cb49366691b830d41cea26 (patch)
treed12fde3dd5178579e71e2f268602ad642ffaebe7 /Emby.Common.Implementations/Reflection/AssemblyInfo.cs
parent57bce7daf3777be0ab83833d140c3bb1b13766a8 (diff)
parent71f7fc4e116f32a20c63ddbb17844a81283a6ba4 (diff)
Merge pull request #2658 from MediaBrowser/dev
Dev
Diffstat (limited to 'Emby.Common.Implementations/Reflection/AssemblyInfo.cs')
-rw-r--r--Emby.Common.Implementations/Reflection/AssemblyInfo.cs6
1 files changed, 0 insertions, 6 deletions
diff --git a/Emby.Common.Implementations/Reflection/AssemblyInfo.cs b/Emby.Common.Implementations/Reflection/AssemblyInfo.cs
index 7a92f02d6..87821bf7a 100644
--- a/Emby.Common.Implementations/Reflection/AssemblyInfo.cs
+++ b/Emby.Common.Implementations/Reflection/AssemblyInfo.cs
@@ -9,18 +9,12 @@ namespace Emby.Common.Implementations.Reflection
{
public Stream GetManifestResourceStream(Type type, string resource)
{
-#if NET46
return type.Assembly.GetManifestResourceStream(resource);
-#endif
- return type.GetTypeInfo().Assembly.GetManifestResourceStream(resource);
}
public string[] GetManifestResourceNames(Type type)
{
-#if NET46
return type.Assembly.GetManifestResourceNames();
-#endif
- return type.GetTypeInfo().Assembly.GetManifestResourceNames();
}
public Assembly[] GetCurrentAssemblies()