mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.8.0.22

Browse Source 
Former-commit-id: df344e34b07851d296efb3e6604c8db42b6f7aa3
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2017-10-19 20:04:20 +00:00
parent 5f4a27cc8a
commit 7d05485754
5020 changed files with 114082 additions and 186061 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mcs/class/System.ServiceModel.Discovery/Assembly/AssemblyInfo.cs
View File

@@ -54,8 +54,3 @@ using System.Runtime.InteropServices;
[assembly: ComVisible (false)]
[assembly: AssemblyDelaySign (true)]
#if MOBILE
[assembly: AssemblyKeyFile ("../silverlight.pub")]
#else
[assembly: AssemblyKeyFile("../winfx.pub")]
#endif

6
mcs/class/System.ServiceModel.Discovery/Makefile
View File

@@ -11,6 +11,12 @@ LIB_REFS += System.Configuration
LIB_MCS_FLAGS += -d:NET_3_5 -d:NET_3_0
endif
ifdef MOBILE_PROFILE
KEYFILE = ../silverlight.pub
else
KEYFILE = ../winfx.pub
endif
TEST_MCS_FLAGS = $(LIB_MCS_FLAGS)
EXTRA_DISTFILES = $(RESOURCE_FILES)

4
mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery.Udp/UdpDuplexChannel.cs
View File

@@ -152,7 +152,7 @@ namespace System.ServiceModel.Discovery.Udp
public bool TryReceive (TimeSpan timeout, out Message msg)
{
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
ThrowIfDisposedOrNotOpen ();
msg = null;
@@ -188,7 +188,7 @@ namespace System.ServiceModel.Discovery.Udp
msg = message_encoder.ReadMessage (new MemoryStream (bytes), int.MaxValue);
var id = msg.Headers.MessageId;
if (message_ids.Contains (id))
return TryReceive (timeout - (DateTime.Now - start), out msg);
return TryReceive (timeout - (DateTime.UtcNow - start), out msg);
if (id != null) {
message_ids.Enqueue (id);
if (message_ids.Count >= binding_element.TransportSettings.DuplicateMessageHistoryLength)

10
mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryChannelDispatcher.cs
View File

@@ -86,7 +86,7 @@ namespace System.ServiceModel.Discovery
if (!handle_announce_online)
return; // Offline announcement is done by another DiscoveryChannelDispatcher
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
Communication.Open (timeout);
// and call AnnouncementOnline().
@@ -94,7 +94,7 @@ namespace System.ServiceModel.Discovery
// Published endpoints are added by DicoveryEndpointPublisherBehavior, which is added to each ServiceEndpoint in the primary (non-announcement) service.
if (dx != null) {
foreach (var edm in dx.PublishedEndpoints) {
client.InnerChannel.OperationTimeout = timeout - (DateTime.Now - start);
client.InnerChannel.OperationTimeout = timeout - (DateTime.UtcNow - start);
client.AnnounceOnline (edm);
}
}
@@ -115,19 +115,19 @@ namespace System.ServiceModel.Discovery
if (handle_announce_online)
return; // Offline announcement is done by another DiscoveryChannelDispatcher
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
// and call AnnouncementOnline().
var dx = host.Extensions.Find<DiscoveryServiceExtension> ();
// Published endpoints are added by DicoveryEndpointPublisherBehavior, which is added to each ServiceEndpoint in the primary (non-announcement) service.
if (dx != null) {
foreach (var edm in dx.PublishedEndpoints) {
client.InnerChannel.OperationTimeout = timeout - (DateTime.Now - start);
client.InnerChannel.OperationTimeout = timeout - (DateTime.UtcNow - start);
client.AnnounceOffline (edm);
}
}
// Then close the client.
Communication.Close (timeout - (DateTime.Now - start));
Communication.Close (timeout - (DateTime.UtcNow - start));
}
protected override IAsyncResult OnBeginClose (TimeSpan timeout, AsyncCallback callback, object state)

4
mcs/class/System.ServiceModel.Discovery/System.ServiceModel.Discovery/DiscoveryRequestChannel.cs
View File

@@ -107,9 +107,9 @@ namespace System.ServiceModel.Discovery
protected override void OnOpen (TimeSpan timeout)
{
// FIXME: use timeout
DateTime start = DateTime.Now;
DateTime start = DateTime.UtcNow;
inner = CreateDiscoveryInnerChannel<TChannel> (factory);
((IChannel) inner).Open (timeout - (DateTime.Now - start));
((IChannel) inner).Open (timeout - (DateTime.UtcNow - start));
}
public Message Request (Message msg)

9
mcs/class/System.ServiceModel.Discovery/Test/System.ServiceModel.Discovery/DiscoveryClientBindingElementTest.cs
View File

@@ -23,6 +23,7 @@
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Diagnostics;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.IO;
@@ -176,9 +177,9 @@ namespace MonoTests.System.ServiceModel.Discovery
Assert.IsNull (cf.GetProperty<DiscoveryEndpoint> (), "#1");
var ch = cf.CreateChannel (DiscoveryClientBindingElement.DiscoveryEndpointAddress);
Assert.IsNull (ch.GetProperty<DiscoveryEndpoint> (), "#2");
DateTime start = DateTime.Now;
var sw = Stopwatch.StartNew ();
ch.Open (TimeSpan.FromSeconds (5));
Assert.IsTrue (DateTime.Now - start < TimeSpan.FromSeconds (15), "It is likely that FindCriteria.Duration is ignored");
Assert.IsTrue (sw.Elapsed < TimeSpan.FromSeconds (15), "It is likely that FindCriteria.Duration is ignored");
}
[Test]
@@ -193,9 +194,9 @@ namespace MonoTests.System.ServiceModel.Discovery
var cf = be.BuildChannelFactory<IDuplexSessionChannel> (bc);
cf.Open ();
var ch = cf.CreateChannel (DiscoveryClientBindingElement.DiscoveryEndpointAddress);
DateTime start = DateTime.Now;
var sw = Stopwatch.StartNew ();
ch.Open (TimeSpan.FromSeconds (5));
Assert.IsTrue (DateTime.Now - start < TimeSpan.FromSeconds (15), "It is likely that FindCriteria.Duration is ignored");
Assert.IsTrue (sw.Elapsed < TimeSpan.FromSeconds (15), "It is likely that FindCriteria.Duration is ignored");
}
[Test]