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

@ -1561,7 +1561,7 @@ namespace System.Net.PeerToPeer.Collaboration
object userToken = createAsyncState.UserToken;
//
// Call the [....] version of createcontact
// Call the sync version of createcontact
//
try{
peerContact = CreateContact(peerNearMe);

View File

@ -315,7 +315,7 @@ namespace System.Net.PeerToPeer.Collaboration
if (exception != null){
//
// Throw exception for [....] but call callback for async with exception
// Throw exception for sync but call callback for async with exception
//
if (!isAsync)
throw exception;
@ -328,7 +328,7 @@ namespace System.Net.PeerToPeer.Collaboration
Logging.P2PTraceSource.TraceEvent(TraceEventType.Information, 0, "Found endpoint match in Request status changed.");
//
// For async call the callback and for [....] just return
// For async call the callback and for sync just return
//
if (isAsync){
RefreshDataCompletedEventArgs args = new
@ -352,7 +352,7 @@ namespace System.Net.PeerToPeer.Collaboration
//
// Async case with exception fire callback here
// [....] would have already thrown this by now
// Sync would have already thrown this by now
//
if (exception != null){
RefreshDataCompletedEventArgs args = new

View File

@ -433,7 +433,7 @@ namespace System.Net.PeerToPeer
/// I have considered using regular expressions. However, the regular expressions offer
/// poor performance and or startup cost. Really there is no substiture for custom
/// parsing logic. I decided to write this piece of code to parse the peername for now
/// - [....] 6/6/2005
/// - Microsoft 6/6/2005
/// </summary>
/// <param name="peerName"></param>
/// <param name="authority"></param>

View File

@ -490,7 +490,7 @@ namespace System.Net.PeerToPeer
/// <summary>
/// PeerNameResolver does [....] and async resolves.
/// PeerNameResolver does sync and async resolves.
/// PeerNameResolver supports multiple outstanding async calls
/// </summary>
public class PeerNameResolver
@ -581,7 +581,7 @@ namespace System.Net.PeerToPeer
}
/// <summary>
/// Implements [....] resolve of the PeerName in the cloud given
/// Implements sync resolve of the PeerName in the cloud given
/// </summary>
/// <param name="peerName"></param>
/// <param name="cloud"></param>
@ -641,7 +641,7 @@ namespace System.Net.PeerToPeer
//---------------------------------------------------------------
//Trace log
//---------------------------------------------------------------
Logging.P2PTraceSource.TraceEvent(TraceEventType.Information, 0, "[....] Resolve called with PeerName: {0}, Cloud: {1}, MaxRecords {2}", peerName, cloud, maxRecords);
Logging.P2PTraceSource.TraceEvent(TraceEventType.Information, 0, "Sync Resolve called with PeerName: {0}, Cloud: {1}, MaxRecords {2}", peerName, cloud, maxRecords);
SafePeerData shEndPointInfoArray;
string NativeCloudName = cloud.InternalName;
@ -721,7 +721,7 @@ namespace System.Net.PeerToPeer
shEndPointInfoArray.Dispose();
}
}
Logging.P2PTraceSource.TraceEvent(TraceEventType.Information, 0, "[....] Resolve returnig with PeerNameRecord count :{0}", PeerNameRecords.Count);
Logging.P2PTraceSource.TraceEvent(TraceEventType.Information, 0, "Sync Resolve returnig with PeerNameRecord count :{0}", PeerNameRecords.Count);
return PeerNameRecords;
}