Skip to content

Commit

Permalink
NLog.Web 4.5.1 and NLog.Web.AspNetCore 4.5.0-beta01
Browse files Browse the repository at this point in the history
  • Loading branch information
304NotModified committed Oct 12, 2017
1 parent d2536a3 commit 92594c6
Show file tree
Hide file tree
Showing 6 changed files with 24 additions and 12 deletions.
16 changes: 12 additions & 4 deletions NLog.Web.AspNetCore/NLog.Web.AspNetCore.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<PropertyGroup>
<Description>Extend NLog with targets and layout renderers for websites and webapplications on the ASP.NET Core platform.</Description>
<AssemblyTitle>NLog.Web.AspNetCore</AssemblyTitle>
<VersionPrefix>4.3.2</VersionPrefix>

<Authors>Julian Verdurmen</Authors>
<TargetFrameworks>netstandard1.3;net451;netstandard2.0</TargetFrameworks>
<DefineConstants>$(DefineConstants);ASP_NET_CORE</DefineConstants>
Expand All @@ -14,7 +14,15 @@
<PublicSign Condition=" '$(OS)' != 'Windows_NT' ">true</PublicSign>
<PackageId>NLog.Web.AspNetCore</PackageId>
<PackageTags>logging;log;session;NLog;web;aspnet;aspnetcore;MVC</PackageTags>
<PackageReleaseNotes>Update dependencies</PackageReleaseNotes>
<PackageReleaseNotes>
- ASP.NET Core 2 support (UseNLog) - use the new method for configuring NLog! See https://github.com/NLog/NLog.Web/wiki/Getting-started-with-ASP.NET-Core-2
- make &lt;add assembly="NLog.Web.AspNetCore"/&gt; unneeded for ASP.NET Core 2
- Fix IHttpContextAccessor warning
- Add IncludeScheme option to ${aspnet-request-url}
- Updated and limit dependencies


Update dependencies</PackageReleaseNotes>
<PackageIconUrl>http://nlog-project.org/N.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/NLog/NLog.Web</PackageProjectUrl>
<PackageLicenseUrl>http://raw.github.com/NLog/NLog.Web/master/LICENSE</PackageLicenseUrl>
Expand All @@ -28,7 +36,7 @@
<GenerateAssemblyCopyrightAttribute>false</GenerateAssemblyCopyrightAttribute>
<GenerateAssemblyVersionAttribute>false</GenerateAssemblyVersionAttribute>
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
<Version>4.4.1</Version>
<Version>4.5.0-beta01</Version>
<RootNamespace>NLog.Web</RootNamespace>
</PropertyGroup>

Expand Down Expand Up @@ -56,7 +64,7 @@
<PackageReference Include="Microsoft.AspNetCore.Http.Extensions" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Hosting.Abstractions" Version="2.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Routing.Abstractions" Version="2.0.0" />
<PackageReference Include="NLog" Version="4.5.0-beta04" />
<PackageReference Include="NLog" Version="4.5.0-beta05" />

</ItemGroup>
<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions NLog.Web/NLog.Web.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -41,8 +41,7 @@
</PropertyGroup>
<ItemGroup>
<Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
<HintPath>..\packages\NLog.4.4.2\lib\net35\NLog.dll</HintPath>
<Private>True</Private>
<HintPath>..\packages\NLog.4.4.12\lib\net35\NLog.dll</HintPath>
</Reference>
<Reference Include="System" />
<Reference Include="System.Core" />
Expand Down
7 changes: 6 additions & 1 deletion NLog.Web/NLog.Web.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,12 @@
This package is for ASP.NET 3.5+

For ASP.NET Core: Check https://www.nuget.org/packages/NLog.Web.AspNetCore</description>
<releaseNotes>Community contributed custom target for NLog.</releaseNotes>
<releaseNotes>
- Fix IHttpContextAccessor warning
- Add IncludeScheme option to ${aspnet-request-url}
- Updated dependencies

</releaseNotes>
<copyright>Copyright 2014-2017</copyright>
<tags>nlog log target layoutrenderer web asp.net</tags>
</metadata>
Expand Down
2 changes: 1 addition & 1 deletion NLog.Web/packages.NLog.Web.config
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="NLog" version="4.4.2" targetFramework="net35" />
<package id="NLog" version="4.4.12" targetFramework="net35" />
</packages>
6 changes: 3 additions & 3 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ assembly_info:
file: '**\AssemblyInfo.cs'
assembly_version: '4.0.0'
assembly_file_version: '{version}'
assembly_informational_version: '4.5' #NLog.Web
assembly_informational_version: '4.5.1' #NLog.Web
nuget:
project_feed: true
matrix:
Expand All @@ -20,9 +20,9 @@ build:

build_script:
- cmd: >-
call build_aspnet.bat -nuget_version=4.5.0 #NLog.Web.AspNetCore package
call build_aspnet.bat -nuget_version=4.5.1 # NLog.Web package
call build_aspnetcore.bat
call build_aspnetcore.bat # update NLog.Web.AspNetCore.csproj for version number
deploy:
- provider: NuGet
Expand Down
2 changes: 1 addition & 1 deletion build_aspnetcore.bat
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
echo off

rem update project.json for version number
rem update NLog.Web.AspNetCore.csproj for version number

cd NLog.Web.AspNetCore
msbuild /t:restore /t:build /p:configuration=release /verbosity:minimal
Expand Down

0 comments on commit 92594c6

Please sign in to comment.