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

Merge branch 'upstream'

Browse Source 
Former-commit-id: 06be1a24806f7db957b7399c16a0f2c934410724
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-09-28 08:26:17 +00:00
commit a75948affd
44 changed files with 47 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
edeab869a238010eab0c6ae8925c74dbfabe005a 97d7e63f064cf6ee3f1c2a50f8911f0ad4838bcb

2
configure.ac.REMOVED.git-id
View File

@ -1 +1 @@
336a9cae567bfbf11970a9574b47ab40dbf09dbe de8913159504ae7af8420c3c5de83ef4f5ab2aa2

4
external/corefx/src/System.Collections/tests/Generic/Comparers/EqualityComparer.Generic.Tests.cs vendored
View File

@ -31,7 +31,11 @@ namespace System.Collections.Generic.Tests
Assert.False(comparer.Equals(EqualityComparer<Task<T>>.Default)); Assert.False(comparer.Equals(EqualityComparer<Task<T>>.Default));
} }
#if MOBILE
[Fact(Skip="Mono issue #10807")]
#else
[Fact] [Fact]
#endif
public void EqualityComparer_EqualsShouldBeOverriddenAndWorkForDifferentInstances_cloned() public void EqualityComparer_EqualsShouldBeOverriddenAndWorkForDifferentInstances_cloned()
{ {
var comparer = EqualityComparer<T>.Default; var comparer = EqualityComparer<T>.Default;

3
external/corefx/src/System.Threading/tests/ThreadLocalTests.cs vendored
View File

@ -218,6 +218,7 @@ namespace System.Threading.Tests
} }
[Fact] [Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "This test requires precise stack scanning")]
public static void RunThreadLocalTest7_WeakReference() public static void RunThreadLocalTest7_WeakReference()
{ {
var threadLocalWeakReferenceTest = new ThreadLocalWeakReferenceTest(); var threadLocalWeakReferenceTest = new ThreadLocalWeakReferenceTest();
@ -225,6 +226,7 @@ namespace System.Threading.Tests
} }
[Fact] [Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "This test requires precise stack scanning")]
public static void RunThreadLocalTest8_Values() public static void RunThreadLocalTest8_Values()
{ {
// Test adding values and updating values // Test adding values and updating values
@ -316,6 +318,7 @@ namespace System.Threading.Tests
} }
[Fact] [Fact]
[SkipOnTargetFramework(TargetFrameworkMonikers.Mono, "This test requires precise stack scanning")]
public static void RunThreadLocalTest8_Values_NegativeCases() public static void RunThreadLocalTest8_Values_NegativeCases()
{ {
// Test that Dispose works and that objects are released on dispose // Test that Dispose works and that objects are released on dispose

2
mcs/build/common/Consts.cs
View File

@ -34,7 +34,7 @@ static class Consts
// Use these assembly version constants to make code more maintainable. // Use these assembly version constants to make code more maintainable.
// //
public const string MonoVersion = "5.16.0.168"; public const string MonoVersion = "5.16.0.174";
public const string MonoCompany = "Mono development team"; public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure"; public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors"; public const string MonoCopyright = "(c) Various Mono authors";

5
mcs/class/System/System.Net/HttpWebRequest.cs
View File

@ -946,6 +946,11 @@ namespace System.Net
} catch { } catch {
// Ignore; we report the timeout. // Ignore; we report the timeout.
} }
#pragma warning disable 4014
// Make sure the workerTask's Exception is actually observed.
// Fixes https://github.com/mono/mono/issues/10488.
workerTask.ContinueWith (t => t.Exception?.GetHashCode (), TaskContinuationOptions.OnlyOnFaulted);
#pragma warning restore 4014
throw new WebException (SR.net_timeout, WebExceptionStatus.Timeout); throw new WebException (SR.net_timeout, WebExceptionStatus.Timeout);
} catch (Exception ex) { } catch (Exception ex) {
throw GetWebException (ex, aborted ()); throw GetWebException (ex, aborted ());

2
mcs/class/lib/monolite-darwin/1051600011/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
5469238f307139bfb54bdbe42fcb877e2cf273bc 7e2e318322aca81235ffc3c3be5f7383ebe374d8

2
mcs/class/lib/monolite-darwin/1051600011/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
4434e532924a095657096c31623446fc7773d33a 2dd0eef3a52205e1336863773f343be46bd67637

BIN
mcs/class/lib/monolite-darwin/1051600011/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-darwin/1051600011/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
e98f6d09a94747ba282f7c195cc95c9c62a06901 1675aea91b5efdd1f4581fcd1c9b89fdd0e7ed4f

2
mcs/class/lib/monolite-darwin/1051600011/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
2873ec7d2a941016516ff1429e94397f83805f9b 97c75d5e9cc403bd95f67626794afce40cfc6107

2
mcs/class/lib/monolite-darwin/1051600011/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
fba576a1996777348d40ba1ce8d7d82f7cf30796 80832caaf98ab3dbda089f94d973b93d8ce9e26e

2
mcs/class/lib/monolite-darwin/1051600011/System.dll.REMOVED.git-id
View File

@ -1 +1 @@
c0d161daa8406d2773662d0311f40ac188da847f def7d9161d84c9665094d302656ebe6161ea6f8e

2
mcs/class/lib/monolite-darwin/1051600011/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
1199285dd4df05b9633d365cbeeac536ecd0b258 010cabffda43f3ea63b7cd3800e98a93fba1069f

2
mcs/class/lib/monolite-darwin/1051600011/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
b714353945deee5c92ea0d8f901d0d8431c0f287 7520e0f1806e63956e0d05dabfa18248e4a08f64

2
mcs/class/lib/monolite-linux/1051600011/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
5469238f307139bfb54bdbe42fcb877e2cf273bc 7e2e318322aca81235ffc3c3be5f7383ebe374d8

2
mcs/class/lib/monolite-linux/1051600011/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
4434e532924a095657096c31623446fc7773d33a 2dd0eef3a52205e1336863773f343be46bd67637

BIN
mcs/class/lib/monolite-linux/1051600011/System.IO.Compression.dll
View File

Binary file not shown.

2
mcs/class/lib/monolite-linux/1051600011/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
e98f6d09a94747ba282f7c195cc95c9c62a06901 1675aea91b5efdd1f4581fcd1c9b89fdd0e7ed4f

2
mcs/class/lib/monolite-linux/1051600011/System.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
2873ec7d2a941016516ff1429e94397f83805f9b 97c75d5e9cc403bd95f67626794afce40cfc6107

Some files were not shown because too many files have changed in this diff Show More