Skip to content

Commit

Permalink
Version 5.1.4 (#865)
Browse files Browse the repository at this point in the history
  • Loading branch information
snakefoot authored Sep 1, 2022
1 parent 1faeeb2 commit 147c849
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 3 deletions.
9 changes: 9 additions & 0 deletions CHANGELOG.MD
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,15 @@ See also [releases](https://github.com/NLog/NLog.Web/releases) and [milestones](

Date format: (year/month/day)

### Version 5.1.4 (2022/09/01)

- **NLog.Web.AspNetCore**
- [#865](https://github.com/NLog/NLog.Web/pull/865) Added embedded resource ILLink.Descriptors.xml (#865) (@snakefoot)
- [#865](https://github.com/NLog/NLog.Web/pull/865) Updated NLog.Extensions.Logging to v5.0.4 (#865) (@snakefoot)

- **NLog.Web**
- [#865](https://github.com/NLog/NLog.Web/pull/865) Updated dependency NLog v5.0.4 (#863) (@snakefoot)

### Version 5.1.2 (2022/09/01)

- **NLog.Web.AspNetCore**
Expand Down
2 changes: 1 addition & 1 deletion build.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
# creates NuGet package at \artifacts
dotnet --version

$versionPrefix = "5.1.2" # Also update version for minor versions in appveyor.yml
$versionPrefix = "5.1.4" # Also update version for minor versions in appveyor.yml
$versionSuffix = ""
$versionFile = $versionPrefix + "." + ${env:APPVEYOR_BUILD_NUMBER}
if ($env:APPVEYOR_PULL_REQUEST_NUMBER) {
Expand Down
5 changes: 5 additions & 0 deletions src/NLog.Web.AspNetCore/ILLink.Descriptors.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<linker>
<assembly fullname="NLog" preserve="all" />
<assembly fullname="NLog.Extensions.Logging" preserve="all" />
<assembly fullname="NLog.Web.AspNetCore" preserve="all" />
</linker>
11 changes: 10 additions & 1 deletion src/NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,8 @@ Supported platforms:
<PackageId>NLog.Web.AspNetCore</PackageId>
<PackageTags>logging;log;NLog;web;aspnet;aspnetcore;MVC;Microsoft.Extensions.Logging;httpcontext</PackageTags>
<PackageReleaseNotes>
- Added embedded resource ILLink.Descriptors.xml (#865) (@snakefoot)
- Updated NLog.Extensions.Logging to v5.0.4 (#865) (@snakefoot)
- Loading NLog.config from ContentRootPath as last fallback (#861) (@snakefoot)
- Updated Microsoft.AspNetCore.Abstractions to match Microsoft.AspNetCore.Http (#858) (@snakefoot)
- Updated NLog.Extensions.Logging to v5.0.3 (#863) (@snakefoot)
Expand Down Expand Up @@ -76,7 +78,7 @@ List of available Layout Renderers: https://nlog-project.org/config/?tab=layout-
<DefineConstants>$(DefineConstants);ASP_NET_CORE;ASP_NET_CORE3</DefineConstants>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NLog.Extensions.Logging" Version="5.0.3" />
<PackageReference Include="NLog.Extensions.Logging" Version="5.0.4" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' or '$(TargetFramework)' == 'net461' ">
<!-- Fixed to 2.1.0 as 2.1 is Long Term Supported (LTS) and only supported version for .NET Framework 4.6.1 -->
Expand All @@ -100,6 +102,13 @@ List of available Layout Renderers: https://nlog-project.org/config/?tab=layout-
<ItemGroup>
<Compile Include="..\Shared\**\*.cs" />
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="ILLink.Descriptors.xml">
<LogicalName>ILLink.Descriptors.xml</LogicalName>
</EmbeddedResource>
</ItemGroup>

<ItemGroup>
<Content Include="readme.txt">
<Pack>true</Pack>
Expand Down
2 changes: 1 addition & 1 deletion src/NLog.Web/NLog.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ List of available Layout Renderers: https://nlog-project.org/config/?tab=layout-
<DownloadFile SourceUrl="https://nlog-project.org/N.png" DestinationFolder="$(MSBuildThisFileDirectory)" />
</Target>
<ItemGroup>
<PackageReference Include="NLog" Version="5.0.3" />
<PackageReference Include="NLog" Version="5.0.4" />
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.1.1" PrivateAssets="All" />
</ItemGroup>
<ItemGroup>
Expand Down

0 comments on commit 147c849

Please sign in to comment.