projects / platform / upstream / coreclr.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: b4f28d7) | patch
Merge pull request dotnet/corert#3226 from dotnet/nmirror
authorSimon Nattress <nattress@gmail.com>
Fri, 7 Apr 2017 01:02:03 +0000 (18:02 -0700)
committerJan Kotas <jkotas@microsoft.com>
Fri, 7 Apr 2017 13:15:57 +0000 (06:15 -0700)
commit157a0aee00e8623811c3b9b1ff962a2e2ae8bb67
tree086b875f2db6a902ed6d996353f32df622740f47tree | snapshot
parentb4f28d7470da18ec871ae1240a6c9df2db44da2ccommit | diff
Merge pull request dotnet/corert#3226 from dotnet/nmirror

Merge nmirror to master

Signed-off-by: dotnet-bot <dotnet-bot@microsoft.com>
42 files changed:
src/mscorlib/shared/System.Private.CoreLib.Shared.projitems diff | blob | history
src/mscorlib/shared/System/Diagnostics/Tracing/ActivityTracker.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/EventActivityOptions.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/EventCounter.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/EventDescriptor.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/EventProvider.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/EventSource.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/EventSourceException.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/FrameworkEventSource.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/StubEnvironment.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/ArrayTypeInfo.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/ConcurrentSet.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/ConcurrentSetItem.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/DataCollector.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/EmptyStruct.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/EnumHelper.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/EnumerableTypeInfo.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/EventDataAttribute.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/EventFieldAttribute.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/EventFieldFormat.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/EventIgnoreAttribute.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/EventPayload.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/EventSourceActivity.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/EventSourceOptions.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/FieldMetadata.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/InvokeTypeInfo.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/NameInfo.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/PropertyAnalysis.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/PropertyValue.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/SimpleEventTypes.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/SimpleTypeInfos.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/Statics.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/TraceLoggingDataCollector.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/TraceLoggingDataType.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventSource.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventTraits.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/TraceLoggingEventTypes.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/TraceLoggingMetadataCollector.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/TraceLoggingTypeInfo.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/TraceLogging/TypeAnalysis.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/Diagnostics/Tracing/Winmeta.cs [new file with mode: 0644] blob
src/mscorlib/shared/System/IO/FileLoadException.cs [new file with mode: 0644] blob
Domain: Dotnet / Core;