Forward port of #1966 into CoreCLR #1967
Closed
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
# 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
I also fixed indentation while I was at it.
|
Travis/AppVeyor failures are not triggered by this PR but other (already included) commits. |
304NotModified
force-pushed
the
coreCLR-beta6
branch
from
dec78c6
to
f57dfed
Compare
|
Thank! I was fixing the CoreCLR branch and I merged master into it, so this one is fixed already. |
|
No problem, thank you a lot for merging! 👍 |
|
took me 5 hours :( Anyway, expecting a more streamlined process when VS2017 RTM is there :) |
|
pushing new package within an hour |
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.
I also fixed indentation while I was at it.
This change is