Imported Upstream version 5.4.0.167

Former-commit-id: 5624ac747d633e885131e8349322922b6a59baaa
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-08-21 15:34:15 +00:00
parent e49d6f06c0
commit 536cd135cc
12856 changed files with 563812 additions and 223249 deletions

View File

@@ -7,7 +7,7 @@
**
** Class: Contract
**
** <OWNER>[....],mbarnett</OWNER>
** <OWNER>Microsoft,mbarnett</OWNER>
**
** Purpose: The contract class allows for expressing preconditions,
** postconditions, and object invariants about methods in source

View File

@@ -7,7 +7,7 @@
**
** Class: Contract
**
** <OWNER>maf,mbarnett,[....]</OWNER>
** <OWNER>maf,mbarnett,Microsoft</OWNER>
**
** Implementation details of CLR Contracts.
**

View File

@@ -95,7 +95,10 @@ namespace System.Diagnostics.Tracing
public IEnumerator<KeyValuePair<string, object>> GetEnumerator()
{
throw new System.NotSupportedException();
for (int i = 0; i < Keys.Count; i++)
{
yield return new KeyValuePair<string, object>(this.m_names[i], this.m_values[i]);
}
}
IEnumerator IEnumerable.GetEnumerator()

View File

@@ -549,7 +549,7 @@ namespace System.Diagnostics.Tracing
}
// This callback is used to initialize the m_current AsyncLocal Variable.
// Its job is to keep the ETW Activity ID (part of thread local storage) in [....]
// Its job is to keep the ETW Activity ID (part of thread local storage) in sync
// with m_current.ActivityID
void ActivityChanging(AsyncLocalValueChangedArgs<ActivityInfo> args)
{

View File

@@ -2,7 +2,7 @@
// <copyright file="etwprovider.cs" company="Microsoft">
// Copyright (c) Microsoft Corporation. All rights reserved.
// </copyright>
// <OWNER>[....]</OWNER>
// <OWNER>Microsoft</OWNER>
//------------------------------------------------------------------------------
using System;
using System.Runtime.InteropServices;

View File

@@ -1 +1 @@
9ae566937256255d1b55dcc7c0b259983dc54595
6bc1f76856fb77f63aa282abb81fe71ab81e373c

View File

@@ -6,8 +6,8 @@
//
// ResourcesEtwProvider.cs
//
// <OWNER>[....]</OWNER>
// <OWNER>[....]</OWNER>
// <OWNER>Microsoft</OWNER>
// <OWNER>Microsoft</OWNER>
//
// Managed event source for things that can version with MSCORLIB.
//