Merge branch 'upstream'

Former-commit-id: 322627f0a4858719fa7ebeafd8dd9ea0cbde1814
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-08-11 08:25:00 +00:00
commit f8e83d4524
48 changed files with 196 additions and 35 deletions

View File

@ -1 +1 @@
2af2049f420bb2dc76cc2d639f373df6b191eec3
563efed4b0813cddc6d73d9531197b8b0d792bf7

View File

@ -1 +1 @@
05e8f6c4f8e057e62e89f62ae2ca008eaf65edbb
0f545e167eca4b556cfa9118e85c885f8ff39c0e

View File

@ -0,0 +1,29 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
[assembly:System.Reflection.AssemblyVersionAttribute("4.2.0.0")]
[assembly:System.Diagnostics.DebuggableAttribute((System.Diagnostics.DebuggableAttribute.DebuggingModes)(2))]
[assembly:System.Reflection.AssemblyCompanyAttribute("Mono development team")]
[assembly:System.Reflection.AssemblyCopyrightAttribute("(c) Various Mono authors")]
[assembly:System.Reflection.AssemblyDefaultAliasAttribute("System.Threading.Tasks.Extensions")]
[assembly:System.Reflection.AssemblyDescriptionAttribute("System.Threading.Tasks.Extensions")]
[assembly:System.Reflection.AssemblyFileVersionAttribute("4.0.0.0")]
[assembly:System.Reflection.AssemblyInformationalVersionAttribute("4.0.0.0")]
[assembly:System.Reflection.AssemblyProductAttribute("Mono Common Language Infrastructure")]
[assembly:System.Reflection.AssemblyTitleAttribute("System.Threading.Tasks.Extensions")]
[assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)]
[assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncMethodBuilderAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.IValueTaskSource))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.IValueTaskSource<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.ValueTaskSourceStatus))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.ValueTask))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.ValueTask<>))]

View File

@ -0,0 +1,29 @@
// Licensed to the .NET Foundation under one or more agreements.
// The .NET Foundation licenses this file to you under the MIT license.
// See the LICENSE file in the project root for more information.
[assembly:System.Reflection.AssemblyVersionAttribute("4.2.0.0")]
[assembly:System.Diagnostics.DebuggableAttribute((System.Diagnostics.DebuggableAttribute.DebuggingModes)(2))]
[assembly:System.Reflection.AssemblyCompanyAttribute("Mono development team")]
[assembly:System.Reflection.AssemblyCopyrightAttribute("(c) Various Mono authors")]
[assembly:System.Reflection.AssemblyDefaultAliasAttribute("System.Threading.Tasks.Extensions")]
[assembly:System.Reflection.AssemblyDescriptionAttribute("System.Threading.Tasks.Extensions")]
[assembly:System.Reflection.AssemblyFileVersionAttribute("4.0.0.0")]
[assembly:System.Reflection.AssemblyInformationalVersionAttribute("4.0.0.0")]
[assembly:System.Reflection.AssemblyProductAttribute("Mono Common Language Infrastructure")]
[assembly:System.Reflection.AssemblyTitleAttribute("System.Threading.Tasks.Extensions")]
[assembly:System.Runtime.CompilerServices.CompilationRelaxationsAttribute(8)]
[assembly:System.Runtime.CompilerServices.RuntimeCompatibilityAttribute(WrapNonExceptionThrows=true)]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncMethodBuilderAttribute))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.IValueTaskSource))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.IValueTaskSource<>))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.ValueTaskSourceStatus))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.ValueTask))]
[assembly:System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.ValueTask<>))]

View File

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

View File

@ -0,0 +1,36 @@
//
// Copyright (C) 2018 Microsoft Corporation
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
using System;
using System.Reflection;
using System.Runtime.CompilerServices;
[assembly: AssemblyTitle ("System.Threading.Tasks.Extensions")]
[assembly: AssemblyDescription ("System.Threading.Tasks.Extensions")]
[assembly: AssemblyDefaultAlias ("System.Threading.Tasks.Extensions")]
[assembly: AssemblyCompany ("Mono development team")]
[assembly: AssemblyProduct ("Mono Common Language Infrastructure")]
[assembly: AssemblyCopyright ("(c) Various Mono authors")]
[assembly: AssemblyVersion ("4.2.0.0")]
[assembly: AssemblyInformationalVersion ("4.0.0.0")]
[assembly: AssemblyFileVersion ("4.0.0.0")]

View File

@ -0,0 +1,24 @@
MCS_BUILD_DIR = ../../../build
thisdir = class/Facades/System.Threading.Tasks.Extensions
SUBDIRS =
include $(MCS_BUILD_DIR)/rules.make
LIBRARY_SUBDIR = Facades
LIBRARY_INSTALL_DIR = $(mono_libdir)/mono/$(FRAMEWORK_VERSION)/Facades
LIBRARY = System.Threading.Tasks.Extensions.dll
KEYFILE = ../../Open.snk
LIBRARY_SNK = $(KEYFILE)
SIGN_FLAGS = /delaysign /nowarn:1616,1699
LIB_REFS =
LIB_MCS_FLAGS = $(SIGN_FLAGS)
PLATFORM_DEBUG_FLAGS =
NO_TEST = yes
include $(MCS_BUILD_DIR)/library.make

View File

@ -0,0 +1,2 @@
AssemblyInfo.cs
TypeForwarders.cs

View File

@ -0,0 +1,39 @@
//
// Copyright (C) 2018 Microsoft Corporation
//
// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:
//
// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.
//
// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
// NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
// LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
// OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
// WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
//
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncMethodBuilderAttribute))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.AsyncValueTaskMethodBuilder<>))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ConfiguredValueTaskAwaitable<>))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Runtime.CompilerServices.ValueTaskAwaiter<>))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.ValueTask))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.ValueTask<>))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.IValueTaskSource))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.IValueTaskSource<>))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.ValueTaskSourceOnCompletedFlags))]
[assembly: System.Runtime.CompilerServices.TypeForwardedToAttribute(typeof(System.Threading.Tasks.Sources.ValueTaskSourceStatus))]

View File

@ -90,7 +90,7 @@ unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
wasm_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
mobile_only_SUBDIRS = System.Security.Cryptography.Pkcs \
mobile_only_SUBDIRS = System.Security.Cryptography.Pkcs System.Threading.Tasks.Extensions \
System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy System.Memory System.Drawing.Common
mobile_only_DEPS_SUBDIRS = System.Security.Cryptography.OpenSsl

View File

@ -1 +1 @@
6b1d9cf06f641c19ad455f11be616ebe3bd1da27
0eac5b73eafc9e51b3b7380b79bfa6a173d087ba

View File

@ -1 +1 @@
a7e9b0b04c19363857218bd2bde477ef407a100c
db7cb124eed11e351766195b34818644bf656156

View File

@ -1 +1 @@
2eb744d2912ab04cce992305035efd8a5bed7af8
befa7798d9e934f5648ad9ea5ae0a673eb0db257

View File

@ -1 +1 @@
093f807a737c04dbe5c194e310a1f0665ef7bf2f
ad7cd980634db06302435155054be4196d9db8f6

View File

@ -1 +1 @@
b8e37ab63c6564322fab781e01c99b906958ce90
2603e10200febbc2e2f66789b7fced98ac9a92a9

View File

@ -1 +1 @@
232ae970ee993f99bffa983a45d06e193271b1b3
1e4af4a28b201bde7e5100bb94dd419494ddf7b6

View File

@ -1 +1 @@
ae8039190c7fa7c4fe1558c96d90e03e84d24240
3a16209d0c3fdf43ed7498b8690ed0acf072de3d

View File

@ -1 +1 @@
6b1d9cf06f641c19ad455f11be616ebe3bd1da27
0eac5b73eafc9e51b3b7380b79bfa6a173d087ba

View File

@ -1 +1 @@
a7e9b0b04c19363857218bd2bde477ef407a100c
db7cb124eed11e351766195b34818644bf656156

View File

@ -1 +1 @@
2eb744d2912ab04cce992305035efd8a5bed7af8
befa7798d9e934f5648ad9ea5ae0a673eb0db257

View File

@ -1 +1 @@
093f807a737c04dbe5c194e310a1f0665ef7bf2f
ad7cd980634db06302435155054be4196d9db8f6

View File

@ -1 +1 @@
b8e37ab63c6564322fab781e01c99b906958ce90
2603e10200febbc2e2f66789b7fced98ac9a92a9

View File

@ -1 +1 @@
232ae970ee993f99bffa983a45d06e193271b1b3
1e4af4a28b201bde7e5100bb94dd419494ddf7b6

View File

@ -1 +1 @@
ae8039190c7fa7c4fe1558c96d90e03e84d24240
3a16209d0c3fdf43ed7498b8690ed0acf072de3d

View File

@ -1 +1 @@
6b1d9cf06f641c19ad455f11be616ebe3bd1da27
0eac5b73eafc9e51b3b7380b79bfa6a173d087ba

View File

@ -1 +1 @@
a7e9b0b04c19363857218bd2bde477ef407a100c
db7cb124eed11e351766195b34818644bf656156

View File

@ -1 +1 @@
2eb744d2912ab04cce992305035efd8a5bed7af8
befa7798d9e934f5648ad9ea5ae0a673eb0db257

View File

@ -1 +1 @@
093f807a737c04dbe5c194e310a1f0665ef7bf2f
ad7cd980634db06302435155054be4196d9db8f6

View File

@ -1 +1 @@
b8e37ab63c6564322fab781e01c99b906958ce90
2603e10200febbc2e2f66789b7fced98ac9a92a9

View File

@ -1 +1 @@
232ae970ee993f99bffa983a45d06e193271b1b3
1e4af4a28b201bde7e5100bb94dd419494ddf7b6

View File

@ -1 +1 @@
ae8039190c7fa7c4fe1558c96d90e03e84d24240
3a16209d0c3fdf43ed7498b8690ed0acf072de3d

View File

@ -1 +1 @@
07311e48b24a9f066db4bc81a9d0a8909cf3b974
328a7ed774148ac3ca84ca7d3f69cf1f7354d8d0

View File

@ -1 +1 @@
aca2533078543caf0dc3ce34871256cc577b29c9
dbd74ba4e1f9faa60a0a2ca3d67935212d67f970

View File

@ -1 +1 @@
ffb917f2bb083bc78d4767be9541cb5a3352c43f
5500716c656e96de6976ce309e5f40e8fbb80299

View File

@ -1 +1 @@
#define FULL_VERSION "explicit/a8b65e1"
#define FULL_VERSION "explicit/3707b81"

View File

@ -194,6 +194,8 @@ mono_error_get_message (MonoError *oerror)
case MONO_ERROR_FILE_NOT_FOUND:
case MONO_ERROR_MISSING_FIELD:
return error->full_message;
case MONO_ERROR_CLEANUP_CALLED_SENTINEL:
g_assert_not_reached ();
}
if (error->full_message_with_fields)

Binary file not shown.

View File

@ -1 +1 @@
73173d1e27ea71b44607b13d22f2ccdf40a5469d
c8dbb804591d8cb087c90396b4842d046b95dc24

Binary file not shown.

View File

@ -1 +1 @@
01c3d4ed64ff5ba8b4209d1595160d9daf9bae28
1f1957905e9fa39c20100e8bb9cf65b0b45d0246

Binary file not shown.

View File

@ -1 +1 @@
6a5643f35ef00579d703772643ee38fb544e11b6
8f443d2c8a1e3da81a6dc437f59834dd0c1ab859

View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.16.0.102\n"
"Project-Id-Version: mono 5.16.0.107\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-08-09 08:08+0000\n"
"POT-Creation-Date: 2018-08-11 08:05+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"

Binary file not shown.

View File

@ -1 +1 @@
fafe3f96d5dd45f8a189dbdd257828e693591c45
20487c124e2341a1532e251e7fb175fc09d5693e