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

Jump to bottom

Misc. fixes for .NET Core #1592

Merged
merged 11 commits into from Aug 14, 2016
Merged

Misc. fixes for .NET Core #1592

merged 11 commits into from Aug 14, 2016

Conversation

ghost
Copy link

@ghost ghost commented Aug 13, 2016

  • Removed a wapper project for System.Linq
  • Update, format and renamed Global.json to global.json
  • Fix Travis script to build and test for Linux and macOS targeting release and debug configurations
  • Merged current master, resolved conflicts and applied fixes for netcore
  • Update project.jsons with updated versions of packages and consistent indentation of 2 spaces
  • Minor fixes

/cc @304NotModified, there are still some failing tests, but Travis build NLog, NLog.UnitTests and SampleExtensions projects successfully on Linux and macOS: https://travis-ci.org/jasonwilliams200OK/NLog/builds/152123995

johnkors and others added 9 commits August 5, 2016 00:33
@johnkors @304NotModified
Added option to not render empty literals on nested json objects (#1580)
d57288b 
* Added option to not render empty objects on nested json objects
@304NotModified
Add support for name parameter on (#1578)
9a26892
@304NotModified
Bugfix: Use the culture when rendering the layout (#1556)
d9f2ee7 
* Added unit tests

* Use the correct culture for rendering the string

* fix SL / fix tests

* fix culture

* split IFormatProvider and CultureInfo

* added related test

* update/expand tests

* fix xplat
@304NotModified
Allow overwriting possible nlog configuration file paths (#1469)
7d8305d 
* Allow overwriting possible nlog configuration file paths

* Redesign after review

* Added tests

* Improvements after review

* move statics to XmlLoggingConfiguration
@304NotModified
FileTarget: Performance improvement for CleanupInvalidFileNameChars (#…
f4b7e92 
…1582)

* FileTarget: Performance improvement for CleanupInvalidFileNameChars

* Added unit test
@304NotModified
Update for NLog 4.3.7
c69deb7
@304NotModified
Update README.md
7f097d8 
[skip ci]
@304NotModified
fix unit test (#1589)
cdb1fcf
Misc. fixes for .NET Core
7305b7f
@304NotModified
Copy link
Member

\0/ great work! Thanks! Will review it!

@304NotModified
Copy link
Member

looks good to me :)

@304NotModified
Copy link
Member

Removed a wapper project for System.Linq

Could you elaborate on that?

@304NotModified 304NotModified added the enhancement Improvement on existing feature label Aug 13, 2016
@ghost
Copy link
Author

ghost commented Aug 13, 2016

Sorry it is System.Xml.Linq, this guy https://github.com/NLog/NLog/tree/91f1d5c/wrap/System.Xml.Linq

We have a substitute package https://www.nuget.org/packages/System.Xml.XDocument/, which covers most of the surface area of System.Xml.Linq (at least what the code was using). In case the transitive/indirect reference is required, nuget will handle it. Seems like build is happy without it. wrap was a legacy DNX concept anyway and CLI has never advertised that its support (and secretly discouraging it) 😎

@ghost
Copy link
Author

ghost commented Aug 13, 2016

A potential goal (, IMO,) should be to clear the wrap directory completely. :)

@ghost
Copy link
Author

ghost commented Aug 13, 2016

Also, moved DNXCore50SampleApp to DotnetCore50Sample... since DNX-anything is obsolete.

@304NotModified
Copy link
Member

Sorry it is System.Xml.Linq, this guy https://github.com/NLog/NLog/tree/91f1d5c/wrap/System.Xml.Linq

We have a substitute package https://www.nuget.org/packages/System.Xml.XDocument/, which covers most of the surface area of System.Xml.Linq (at least what the code was using). In case the transitive/indirect reference is required, nuget will handle it. Seems like build is happy without it. wrap was a legacy DNX concept anyway and CLI has never advertised that its support (and secretly discouraging it)

That would be great.

A potential goal (, IMO,) should be to clear the wrap directory completely. :)

Well all those Silverlight stuff isn't really used. Dunno if it even works. :|

@ghost
Copy link
Author

ghost commented Aug 14, 2016

Removed the wrap directory. 😊

@304NotModified 304NotModified merged commit 086ff66 into NLog:coreCLR Aug 14, 2016
@304NotModified
Copy link
Member

thanks!

@ghost ghost deleted the coreCLR branch August 14, 2016 20:12
@ghost ghost restored the coreCLR branch August 14, 2016 20:14
@ghost ghost mentioned this pull request Aug 14, 2016
Closed
21 tasks
@304NotModified 304NotModified mentioned this pull request Nov 27, 2016
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
enhancement Improvement on existing feature
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@304NotModified @johnkors