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: 7f38376f4cb407a5842ab73ddf323279ef04db53
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-04-11 08:48:45 +00:00
commit e332a0a577
36 changed files with 34 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
c0485c2f9df5d26693fb84576018067049031e0f
0405eaad6e14272e250b5d0e228cdc25a526539a

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

@ -1 +1 @@
3e9a7e48b233632a7da0eb7f82c90ac92c3917d8
f67ab8f8f968ead24814554961a2506d220f1e84

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.
//
public const string MonoVersion = "5.10.1.40";
public const string MonoVersion = "5.10.1.42";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";

3
mcs/class/System/Test/System.Net/WebClientTest.cs
View File

@ -1691,10 +1691,11 @@ namespace MonoTests.System.Net
// We throw a PlatformNotSupportedException deeper, which is caught and re-thrown as WebException
[ExpectedException (typeof (WebException))]
#endif
[Category ("InetAccess")]
public void GetWebRequestOverriding ()
{
GetWebRequestOverridingTestClass testObject = new GetWebRequestOverridingTestClass ();
testObject.DownloadData ("http://www.mono-project.com");
testObject.DownloadData ("http://www.example.com");
Assert.IsTrue (testObject.overridedCodeRan, "Overrided code wasn't called");
}

2
mcs/class/System/Test/System.Net/WebClientTestAsync.cs
View File

@ -88,7 +88,7 @@ namespace MonoTests.System.Net
WebClient wc = new WebClient ();
string filename = Path.GetTempFileName ();
var task = wc.DownloadFileTaskAsync ("http://www.mono-project.com/", filename);
var task = wc.DownloadFileTaskAsync ("http://www.example.com/", filename);
Assert.IsTrue (task.Wait (15000));
Assert.IsTrue (task.IsCompleted);

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

@ -1 +1 @@
448a569c80cc2adb9531d4fd84d718cdc9c68b21
1c3d609b892150c6a434c3230f6ee2f8f83d537f

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

@ -1 +1 @@
cc63b7237253ec87c3f7694dd2a62af2836bea0d
d9ea405ef95e6eb3049b2861f6478655ead37e76

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

@ -1 +1 @@
bb87cba1da155b59229d7a7d8d470f490d29f1a9
e158ea8ae36eaa2b44ad45ed97442e2c2fd563e6

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

@ -1 +1 @@
d9474a1a8877f61d1a43aae27b9c0055f2b0cdfc
ff1bd0185e1491eafd682c1d28842630bafe23cd

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

@ -1 +1 @@
8f416c1f007a014ae887930af7c2917a5fb23e42
c074b7f7035bfd438c978cf2313a5b70e3d2b6ec

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

@ -1 +1 @@
af4c64d9b19e049141b5f9c78a0ee8869e1ee4c8
3111797aa1d3362befcd97b2bbbf121ce7f0c710

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

@ -1 +1 @@
14e4ab0eaa2b6760d1d8b5c7c3f6ff156539cdbc
1a5c5a66b822428856251965590510ac7e760117

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

@ -1 +1 @@
448a569c80cc2adb9531d4fd84d718cdc9c68b21
1c3d609b892150c6a434c3230f6ee2f8f83d537f

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

@ -1 +1 @@
cc63b7237253ec87c3f7694dd2a62af2836bea0d
d9ea405ef95e6eb3049b2861f6478655ead37e76

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

@ -1 +1 @@
bb87cba1da155b59229d7a7d8d470f490d29f1a9
e158ea8ae36eaa2b44ad45ed97442e2c2fd563e6

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

@ -1 +1 @@
d9474a1a8877f61d1a43aae27b9c0055f2b0cdfc
ff1bd0185e1491eafd682c1d28842630bafe23cd

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

@ -1 +1 @@
8f416c1f007a014ae887930af7c2917a5fb23e42
c074b7f7035bfd438c978cf2313a5b70e3d2b6ec

2
mcs/class/lib/monolite-linux/1051000003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
af4c64d9b19e049141b5f9c78a0ee8869e1ee4c8
3111797aa1d3362befcd97b2bbbf121ce7f0c710

2
mcs/class/lib/monolite-linux/1051000003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
14e4ab0eaa2b6760d1d8b5c7c3f6ff156539cdbc
1a5c5a66b822428856251965590510ac7e760117

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

@ -1 +1 @@
448a569c80cc2adb9531d4fd84d718cdc9c68b21
1c3d609b892150c6a434c3230f6ee2f8f83d537f

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

@ -1 +1 @@
cc63b7237253ec87c3f7694dd2a62af2836bea0d
d9ea405ef95e6eb3049b2861f6478655ead37e76

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

@ -1 +1 @@
bb87cba1da155b59229d7a7d8d470f490d29f1a9
e158ea8ae36eaa2b44ad45ed97442e2c2fd563e6

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

@ -1 +1 @@
d9474a1a8877f61d1a43aae27b9c0055f2b0cdfc
ff1bd0185e1491eafd682c1d28842630bafe23cd

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

@ -1 +1 @@
8f416c1f007a014ae887930af7c2917a5fb23e42
c074b7f7035bfd438c978cf2313a5b70e3d2b6ec

2
mcs/class/lib/monolite-win32/1051000003/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
af4c64d9b19e049141b5f9c78a0ee8869e1ee4c8
3111797aa1d3362befcd97b2bbbf121ce7f0c710

2
mcs/class/lib/monolite-win32/1051000003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
14e4ab0eaa2b6760d1d8b5c7c3f6ff156539cdbc
1a5c5a66b822428856251965590510ac7e760117

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/d194b8f"
#define FULL_VERSION "explicit/16cad3c"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

2
po/mcs/de.po.REMOVED.git-id
View File

@ -1 +1 @@
f39c9c0e7dd2615b738f596091d0441637de7368
89c9ebd5dccaf734d0a55210618a5c9a5a538b6e

BIN
po/mcs/es.gmo
View File

Binary file not shown.

2
po/mcs/es.po.REMOVED.git-id
View File

@ -1 +1 @@
06d0f44b39eab8e579a199eb60d9b16692737a77
6305a41bad43805a4ee6a8a5175a7c728879e57b

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

2
po/mcs/ja.po.REMOVED.git-id
View File

@ -1 +1 @@
a334f9350a4d09f529824bfa3d840280474b48b9
2e72ce64dd8eae73864a2f2df8cfcebec186b755

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.1.40\n"
"Project-Id-Version: mono 5.10.1.42\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-04-10 08:22+0000\n"
"POT-Creation-Date: 2018-04-11 08:17+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"

BIN
po/mcs/pt_BR.gmo
View File

Binary file not shown.

2
po/mcs/pt_BR.po.REMOVED.git-id
View File

@ -1 +1 @@
b0b48d5e478e38925c7372f58d03230761122120
0214a33ffcf4f99e6c931dd8a16ea47af9424337