Skip to content

Commit

Permalink
Merge pull request #287 from NLog/release/4.5.4-aspnetcore
Browse files Browse the repository at this point in the history
Update NLog dependency, release 4.5.4 (ASP.NET Core)
  • Loading branch information
304NotModified authored May 10, 2018
2 parents 9e8bba7 + 9657012 commit 79e273b
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 9 deletions.
2 changes: 2 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
## Change Log

### v4.5.4-aspnetcore (2018/05/10)
- [#285](https://github.com/nlog/nlog.web/pull/285) Update NLog dependency (@304NotModified)

### v4.5.3-aspnetcore (2018/04/29)
- [#283](https://github.com/nlog/nlog.web/pull/283) Avoid assembly lookup on static class initialization (@snakefoot)
Expand Down
15 changes: 6 additions & 9 deletions NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<TargetFrameworks>netstandard1.5;net451;net461;netstandard2.0</TargetFrameworks>

<VersionPrefix>4.5.3</VersionPrefix>
<VersionPrefix>4.5.4</VersionPrefix>
<VersionSuffix></VersionSuffix>
<Version>$(VersionPrefix)$(VersionSuffix)</Version>
<InformationalVersion>$(Version)</InformationalVersion>
Expand All @@ -30,11 +30,8 @@ Supported platforms:
<PackageId>NLog.Web.AspNetCore</PackageId>
<PackageTags>logging;log;session;NLog;web;aspnet;aspnetcore;MVC</PackageTags>
<PackageReleaseNotes>
4.5.3:
- Avoid assembly lookup on static class initialization

See https://github.com/NLog/NLog.Web/milestone/23?closed=1

4.5.4:
- Update NLog dependency

</PackageReleaseNotes>
<PackageIconUrl>http://nlog-project.org/N.png</PackageIconUrl>
Expand All @@ -55,12 +52,12 @@ See https://github.com/NLog/NLog.Web/milestone/23?closed=1
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'net451' ">
<Title>NLog.Web.AspNetCore for .NET Framework 4.5.1</Title>
<Title>NLog.Web.AspNetCore for .NET Framework 4.5.1+</Title>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<DefineConstants>$(DefineConstants);ASP_NET_CORE;ASP_NET_CORE1</DefineConstants>
</PropertyGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'net461' ">
<Title>NLog.Web.AspNetCore for .NET Framework 4.6.1</Title>
<Title>NLog.Web.AspNetCore for .NET Framework 4.6+</Title>
<DisableImplicitFrameworkReferences>true</DisableImplicitFrameworkReferences>
<DefineConstants>$(DefineConstants);ASP_NET_CORE;ASP_NET_CORE2</DefineConstants>
</PropertyGroup>
Expand All @@ -74,7 +71,7 @@ See https://github.com/NLog/NLog.Web/milestone/23?closed=1
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NLog.Extensions.Logging" Version="1.0.1" />
<PackageReference Include="NLog.Extensions.Logging" Version="1.0.2" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
Expand Down

0 comments on commit 79e273b

Please sign in to comment.