Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgrade to NLog 4.5 rc2, remove nlog 5 reference, version to rc4 #181

Merged
merged 1 commit into from
Dec 4, 2017
Merged

Upgrade to NLog 4.5 rc2, remove nlog 5 reference, version to rc4 #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 17 additions & 21 deletions src/NLog.Extensions.Logging/NLog.Extensions.Logging.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,11 @@
<PropertyGroup>
<Description>NLog provider for Microsoft.Extensions.Logging for usage in .NET Standard libraries and console applicaties.

For ASP.NET Core, use NLog.Web.AspNetCore: https://www.nuget.org/packages/NLog.Web.AspNetCore</Description>
For ASP.NET Core, use NLog.Web.AspNetCore: https://www.nuget.org/packages/NLog.Web.AspNetCore
</Description>

<Authors>Microsoft;Julian Verdurmen</Authors>
<TargetFrameworks>net451;net461;netstandard1.3;netstandard1.5;netstandard2.0</TargetFrameworks>
<TargetFrameworks>net451;net461;netstandard1.5;netstandard2.0</TargetFrameworks>
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
<AssemblyName>NLog.Extensions.Logging</AssemblyName>
<AssemblyOriginatorKeyFile>NLog.snk</AssemblyOriginatorKeyFile>
Expand All @@ -15,24 +16,32 @@ For ASP.NET Core, use NLog.Web.AspNetCore: https://www.nuget.org/packages/NLog.W
<PackageTags>NLog;Microsoft.Extensions.Logging;log;logfiles;netcore;nlog</PackageTags>
<PackageReleaseNotes>

support for .NET 4.6.1, support for message templates .NET standard 1.5+ and .NET 4.5.1+

rc4: Fixed bug with message templates, removed NLog 5 dependency
rc3: Support for .NET 4.6.1, support for message templates .NET standard 1.5+ and .NET 4.5.1+

</PackageReleaseNotes>
<PackageIconUrl>http://nlog-project.org/NConfig.png</PackageIconUrl>
<PackageProjectUrl>https://github.com/NLog/NLog.Extensions.Logging</PackageProjectUrl>
<PackageLicenseUrl>https://github.com/NLog/NLog.Extensions.Logging/blob/master/LICENSE</PackageLicenseUrl>
<RepositoryType>git</RepositoryType>
<RepositoryUrl>git://github.com/NLog/NLog.Extensions.Logging</RepositoryUrl>
<Version>1.0.0-rtm-rc3</Version>

<Version>1.0.0-rtm-rc4</Version>
<AssemblyVersion>1.0.0.0</AssemblyVersion>
<!--AssemblyVersion: keep 1.0.0.0-->
<FileVersion>1.0.0.0</FileVersion>
<!-- FileVersion = AssemblyFileVersionAttribute, patched by AppVeyor -->
</PropertyGroup>

<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' Or '$(TargetFramework)' == 'net451' ">
<DefineConstants>$(DefineConstants);NETCORE1_0</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\NLog.Extensions.Logging.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="NLog" Version="[4.5.0-rc02,5)" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net451' ">
<PackageReference Include="NLog" Version="[4.5.0-rc01,5)" />
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
<Reference Include="System.Xml" />
<Reference Include="System.Runtime" />
Expand All @@ -41,32 +50,19 @@ support for .NET 4.6.1, support for message templates .NET standard 1.5+ and .NE
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<PackageReference Include="NLog" Version="[4.5.0-rc01,5)" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
<Reference Include="System.Xml" />
<Reference Include="System.Runtime" />
<Reference Include="System.Xml.Serialization" />
<Reference Include="System" />
<Reference Include="Microsoft.CSharp" />
</ItemGroup>
<PropertyGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' Or '$(TargetFramework)' == 'netstandard1.5' Or '$(TargetFramework)' == 'net451'">
<DefineConstants>$(DefineConstants);NETCORE1_0</DefineConstants>
</PropertyGroup>
<PropertyGroup>
<DocumentationFile>bin\$(Configuration)\$(TargetFramework)\NLog.Extensions.Logging.xml</DocumentationFile>
</PropertyGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.3' ">
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
<PackageReference Include="NLog" Version="5.0.0-beta11" />
<PackageReference Include="System.AppContext" Version="4.3.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard1.5' ">
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="1.1.2" />
<PackageReference Include="NLog" Version="[4.5.0-rc01,5)" />
<PackageReference Include="System.AppContext" Version="4.3.0" />
</ItemGroup>
<ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
<PackageReference Include="NLog" Version="[4.5.0-rc01,5)" />
</ItemGroup>
</Project>
7 changes: 1 addition & 6 deletions test/NLog.Extensions.Logging.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,12 +17,7 @@
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
</ItemGroup>

<ItemGroup Condition=" '$(TargetFramework)' == 'net461' ">
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp2.0' or '$(TargetFramework)' == 'net461' ">
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.0.0" />
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.0.0" />
</ItemGroup>
Expand Down