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.

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

NLog.AspNetCore ver. 4.9.1 #533

Merged
merged 14 commits into from
Mar 30, 2020
Merged

NLog.AspNetCore ver. 4.9.1 #533

merged 14 commits into from
Mar 30, 2020

Conversation

snakefoot
Copy link
Contributor

@snakefoot snakefoot commented Mar 25, 2020

Think we should release ver. 4.9.1 with NLog.Extension.Logging 1.6.2 and NLog 4.6.8, before upgrading to NLog 4.7

Have not yet bumped version number in this PR (Incase you have other items to merge before release)

304NotModified and others added 14 commits March 25, 2020 20:32
… for AspNetCore3 (NLog#524)

* aspnet-traceidentifier should automatically check System.Diagnostics.Activity.Current for AspNetCore3

* aspnet-traceidentifier should automatically check System.Diagnostics.Activity.Current for AspNetCore3 (test)
…g#525)

Bumps [NLog.Extensions.Logging](https://github.com/NLog/NLog.Extensions.Logging) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/NLog/NLog.Extensions.Logging/releases)
- [Changelog](https://github.com/NLog/NLog.Extensions.Logging/blob/master/CHANGELOG.MD)
- [Commits](NLog/NLog.Extensions.Logging@v1.6.1...v1.6.2)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@snakefoot
Copy link
Contributor Author

@304NotModified Could a NLog.Web.AspNetCore ver. 4.9.1 be made before updating to NLog 4.7 ?

@304NotModified
Copy link
Member

That's ok. Now on mobile. Should I merge this one or revert something?

@snakefoot
Copy link
Contributor Author

NLog 4.7 have only been committed to dev, and this PR targets master.

@304NotModified
Copy link
Member

OK so merge isn't? ;)

@snakefoot
Copy link
Contributor Author

Yes please merge. Will make another PR that includes only the Version-update

@304NotModified 304NotModified merged commit 18b41af into NLog:master Mar 30, 2020
snakefoot added a commit to snakefoot/NLog.Web that referenced this pull request Mar 30, 2020
* Update README.md

* remove broken badge

* Bump NLog from 4.6.7 to 4.6.8 in /src/NLog.Web

Bumps [NLog](https://github.com/NLog/NLog) from 4.6.7 to 4.6.8.
- [Release notes](https://github.com/NLog/NLog/releases)
- [Changelog](https://github.com/NLog/NLog/blob/v4.6.8/CHANGELOG.md)
- [Commits](NLog/NLog@v4.6.7...v4.6.8)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Code Cleanup to remove unused usings (Sonar Warnings)

* Bump Microsoft.NET.Test.Sdk in /tests/NLog.Web.Tests (NLog#510)

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.2.0 to 16.4.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](microsoft/vstest@v16.2.0...v16.4.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Bump Microsoft.NET.Test.Sdk in /tests/NLog.Web.AspNetCore.Tests (NLog#509)

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.2.0 to 16.4.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](microsoft/vstest@v16.2.0...v16.4.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Bump MSTest.TestAdapter from 2.0.0 to 2.1.0 in /tests/NLog.Web.Tests (NLog#518)

Bumps [MSTest.TestAdapter](https://github.com/microsoft/testfx) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/microsoft/testfx/releases)
- [Commits](microsoft/testfx@v2.0.0...v2.1.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Bump MSTest.TestFramework from 2.0.0 to 2.1.0 in /tests/NLog.Web.Tests (NLog#517)

Bumps [MSTest.TestFramework](https://github.com/microsoft/testfx) from 2.0.0 to 2.1.0.
- [Release notes](https://github.com/microsoft/testfx/releases)
- [Commits](microsoft/testfx@v2.0.0...v2.1.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Bump Microsoft.NET.Test.Sdk in /tests/NLog.Web.AspNetCore.Tests (NLog#520)

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.4.0 to 16.5.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](microsoft/vstest@v16.4.0...v16.5.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* Bump Microsoft.NET.Test.Sdk in /tests/NLog.Web.Tests (NLog#521)

Bumps [Microsoft.NET.Test.Sdk](https://github.com/microsoft/vstest) from 16.4.0 to 16.5.0.
- [Release notes](https://github.com/microsoft/vstest/releases)
- [Commits](microsoft/vstest@v16.4.0...v16.5.0)

Signed-off-by: dependabot-preview[bot] <[email protected]>

* aspnet-traceidentifier should automatically check Activity.Current.Id for AspNetCore3 (NLog#524)

* aspnet-traceidentifier should automatically check System.Diagnostics.Activity.Current for AspNetCore3

* aspnet-traceidentifier should automatically check System.Diagnostics.Activity.Current for AspNetCore3 (test)

* Bump NLog.Extensions.Logging in /tests/NLog.Web.AspNetCore.Tests (NLog#525)

Bumps [NLog.Extensions.Logging](https://github.com/NLog/NLog.Extensions.Logging) from 1.6.1 to 1.6.2.
- [Release notes](https://github.com/NLog/NLog.Extensions.Logging/releases)
- [Changelog](https://github.com/NLog/NLog.Extensions.Logging/blob/master/CHANGELOG.MD)
- [Commits](NLog/NLog.Extensions.Logging@v1.6.1...v1.6.2)

Signed-off-by: dependabot-preview[bot] <[email protected]>

Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>

* Improve AddNLog with LoggingConfiguration to handle custom LogFactory

* Version 4.9.1 for aspnetcore

Co-authored-by: Julian Verdurmen <[email protected]>
Co-authored-by: dependabot-preview[bot] <27856297+dependabot-preview[bot]@users.noreply.github.com>
@304NotModified
Copy link
Member

@snakefoot this is a squash. sorry about that. Will remove this squash.

@304NotModified
Copy link
Member

reverted the squash

@304NotModified
Copy link
Member

304NotModified commented Mar 30, 2020

I guess there is something wrong here:

Bump NLog from 4.6.7 to 4.6.8 in /src/NLog.Web should be 9ef1b5d, but is here 2340614?

@snakefoot
Copy link
Contributor Author

snakefoot commented Mar 30, 2020

Yes in #536 it looks correct. Something strange must have happened in my branch. Have now hard-reset at ver. 4.9.0 and made fast-forward.

@304NotModified
Copy link
Member

looks great, I had the same outcome in #537 :)

@304NotModified 304NotModified removed this from the 4.9.1 milestone Mar 30, 2020
@304NotModified
Copy link
Member

proper merged with #536 :)

@snakefoot
Copy link
Contributor Author

master-status in Github now also looks correct with 2 commits behind

@304NotModified
Copy link
Member

yes I also double checked it. All looks good :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants