ConfigureHiddenAssemblies only needed for NetCoreApp1

NLog · Feb 22, 2018 · b4555e3 · b4555e3
1 parent 2599536
commit b4555e3
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 2 deletions.
diff --git a/src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs b/src/NLog.Extensions.Logging/Extensions/ConfigureExtensions.cs
@@ -69,7 +69,7 @@ public static ILoggingBuilder AddNLog(this ILoggingBuilder factory, NLogProvider
         /// </summary>
         private static void ConfigureHiddenAssemblies()
         {
-#if NETCORE1_0
+#if NETCORE1_0 && !NET451
             InternalLogger.Trace("Hide assemblies for callsite");
 
             SafeAddHiddenAssembly("Microsoft.Logging");
@@ -83,7 +83,7 @@ private static void ConfigureHiddenAssemblies()
 #endif
         }
 
-#if NETCORE1_0
+#if NETCORE1_0 && !NET451
         private static void SafeAddHiddenAssembly(string assemblyName, bool logOnException = true)
         {
             try

diff --git a/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj b/src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj
@@ -48,6 +48,9 @@ rc3: Support for .NET 4.6.1, support for message templates .NET standard 1.5+ an
     <NetStandardImplicitPackageVersion>1.6.0</NetStandardImplicitPackageVersion>
     <DefineConstants>$(DefineConstants);NETCORE1_0</DefineConstants>
   </PropertyGroup>
+  <PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <Title>NLog.Extensions.Logging for NetStandard 2.0</Title>
+  </PropertyGroup>
   <PropertyGroup Condition=" '$(TargetFramework)' == 'uap10.0' ">
     <Title>NLog.Extensions.Logging for UWP</Title>
     <NugetTargetMoniker>UAP,Version=v10.0</NugetTargetMoniker>
@@ -82,4 +85,8 @@ rc3: Support for .NET 4.6.1, support for message templates .NET standard 1.5+ an
   <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
     <PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
   </ItemGroup>
+
+  <PropertyGroup>
+    <AssemblyTitle>$(Title)</AssemblyTitle>
+  </PropertyGroup>
 </Project>