netstandard beta6- up-to-date with NLog 4.4.2 #1944
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
In the project there are a number of different formats on how events are defined in the code. This is a effort to standarise the way the events are implemented and named in the project without breaking the public interface.
FileTarget - Mono2 runtime detection to skip using named archive-mutex
Standarise implementation of events
[skip ci]
It fixes the immutability of the static properties AllLevels and AllLoggingLevels for LogLevel class.
IDisposable is implemented by FileAppenderCache according to Microsoft recommendations "CA1001: Types that own disposable fields should be disposable". Non-breaking change as the class is internal.
FileAppenderCache implements IDisposable
Fix immutability of LogLevel properties
NetworkTarget - UdpNetworkSender should exercise the provided Close-callback
* LogFactory.Dispose() can experience race-condition with reloadTimer * LogFactory.Dispose() can experience race-condition with reloadTimer (Added LogFactory.Close)
Helper class ParameterUtils is underused in the project so it is removed. This is a non-breaking change as the class is internal.
Helper class ParameterUtils removed
* Correct variable casing. * Add notice for upcoming maxLogFilenames property rename.
Minor cosmetic changes on FileTarget class
SHFB config cleanup & simplify
…ble (#1850) * ConsoleTarget - Encoding is applied on InitializeTarget, if Console is available * ConsoleTarget - Encoding is applied on InitializeTarget, if Console is available (Test) * ConsoleTarget - Encoding is applied on InitializeTarget, if Console is available (Fix) * ConsoleTarget - Encoding is applied on InitializeTarget, if Console is available (Review comments)
…(ReflectedType is deprecated)
Compile MethodInfo into LateBoundMethod-delegate (ReflectedType is deprecated)
FileTarget - Failing to delete old archive files, should not stop logging
* FileTarget - Reopen filehandle when write to file fails * FileTarget - Reopen filehandle when write to file fails (Review comments) * FileTarget - Reopen filehandle when file handle fails * FileTarget - Reopen filehandle when write to file fails (Throttle retry)
…1853) * AsyncTargetWrapper - Flush should start immediately, and not wait for timer-event (Now blocking) * AsyncTargetWrapper - Flush should start immediately, and not wait for timer-event (Custom targets with broken flush, should not get artificial help) * AsyncTargetWrapper - Flush should start immediately, and not wait for timer-event (QueueUserWorkItem)
304NotModified
changed the title
|
merge partial done, but a lot work to fix the build and tests |
fix small typo at xml docs
Remove '-' sign from the expected string, as in case of negative offset '-' sign will already be present.
Emphasize that C# 6.0 support is required to build Unit Test project. Remove trailing spaces.
Fix regression issue from 3bd3eb9. Category was read from the EventId configuration property instead of its own property and was always set incorrectly.
Add a note on building unit test project to README
Fix TimeZoneTest for negative offset
EventLogTarget: Properly parse and set EventLog category
System.UriFormatException on load (Mono)
This was referenced Feb 15, 2017
# Conflicts: # appveyor.yml # src/NLog/Common/AsyncHelpers.cs # src/NLog/Common/InternalLogger.cs # src/NLog/Config/ConfigurationItemFactory.cs # src/NLog/Internal/FileAppenders/BaseMutexFileAppender.cs # src/NLog/Internal/FileAppenders/FileAppenderCache.cs # src/NLog/Internal/FileAppenders/WindowsMultiProcessFileAppender.cs # src/NLog/Internal/FilePathLayout.cs # src/NLog/Internal/NativeMethods.cs # src/NLog/Internal/PlatformDetector.cs # src/NLog/Internal/Win32ThreadIDHelper.cs # src/NLog/LayoutRenderers/BaseDirLayoutRenderer.cs # src/NLog/LayoutRenderers/Log4JXmlEventLayoutRenderer.cs # src/NLog/LayoutRenderers/QueryPerformanceCounterLayoutRenderer.cs # src/NLog/LogFactory.cs # src/NLog/LogManager.cs # src/NLog/NLog.Xamarin.Android.csproj # src/NLog/NLog.Xamarin.iOS.csproj # src/NLog/NLog.doc.csproj # src/NLog/NLog.mono.csproj # src/NLog/NLog.netfx35.csproj # src/NLog/NLog.netfx40.csproj # src/NLog/NLog.netfx45.csproj # src/NLog/NLog.sl4.csproj # src/NLog/NLog.sl5.csproj # src/NLog/NLog.wp7.csproj # src/NLog/NLog.wp71.csproj # src/NLog/NLog.wp8.csproj # src/NLog/Properties/AssemblyInfo.cs # src/NLog/Targets/ColoredConsoleTarget.cs # src/NLog/Targets/FileTarget.cs # src/NLog/Targets/OutputDebugStringTarget.cs # src/NLog/Targets/Wrappers/ImpersonatingTargetWrapper.cs # src/NLog/Targets/Wrappers/RetryingTargetWrapper.cs # tests/NLog.UnitTests/Common/InternalLoggerTests.cs # tests/NLog.UnitTests/Config/IncludeTests.cs # tests/NLog.UnitTests/LayoutRenderers/BaseDirTests.cs # tests/NLog.UnitTests/NLog.UnitTests.mono.csproj # tests/NLog.UnitTests/NLog.UnitTests.netfx35.csproj # tests/NLog.UnitTests/NLog.UnitTests.netfx40.csproj # tests/NLog.UnitTests/NLog.UnitTests.netfx45.csproj # tests/NLog.UnitTests/NLogTestBase.cs # tests/NLog.UnitTests/Targets/ConcurrentFileTargetTests.cs # tests/NLog.UnitTests/Targets/FileTargetTests.cs # tests/NLog.UnitTests/Targets/Wrappers/AsyncTargetWrapperTests.cs # tests/NLog.UnitTests/Targets/Wrappers/BufferingTargetWrapperTests.cs # tests/NLog.UnitTests/Targets/Wrappers/ImpersonatingTargetWrapperTests.cs
304NotModified
force-pushed
the
coreCLR-beta6
branch
from
dec78c6
to
f57dfed
Compare
# Conflicts: # appveyor.yml # src/NLog/Config/ConfigurationItemFactory.cs
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This change is