projects / platform / upstream / dotnet / runtime.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: e43efb9) | patch
Merge pull request dotnet/corertdotnet/coreclr#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)
commitec6d26db976399385ad7aa6c68e843965257ac4d
treeedbb02fe71401e049f6907b1b8b67c4d98d44c0ctree | snapshot
parente43efb99f21b9aa105c9f97a0bb47b5eea6d15facommit | diff
Merge pull request dotnet/corertdotnet/coreclr#3226 from dotnet/nmirror

Merge nmirror to master

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