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: b1fd0f2f8ae89704473526a1b07eb5dcf1bbf83e
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-03-22 08:54:20 +00:00
commit c3e25adc15
41 changed files with 66 additions and 39 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
8a49b44278fc8f5f287833024b38e31783fab28b
cf005a9bafd05081c15eb113b7c4c94faa5905aa

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

@ -1 +1 @@
c67a9efcce1d756bd7755aae18cce1416c49542d
5b4b9e998d0530b588bc6def1ef784bfa900fc1d

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

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

@ -1 +1 @@
632ffa63e9d733d1fa7e85288e669c7f3c0a961a
64667669bca0ec0b4016193a35a0fcd78975d2cd

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

@ -1 +1 @@
74210b34f12491fef9f55d7f8c9ed8fc29d01a37
e025ddbbaccd0abed12b527315c41b3134b8fb1c

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

@ -1 +1 @@
82f130c85c572806b2dfd30c0406a671d5821476
c4f01595c8e629ab7656ee49aa40e23d9cfee2e9

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

@ -1 +1 @@
c5c35be810d44e629cfde3a5bb1a7f349529711d
34589a8f9053f352e3737b2f377cf7066f0bee98

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

@ -1 +1 @@
c16b35960e6d2f8cf7297971db20ee4d6505166b
434d8b5c90a539c425c3be9ce15dbe135f34113d

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

@ -1 +1 @@
aad7272a54bf569f27d3bc8484f8656d648a1111
7dda74af2a2bb13dc0d4cd3b19ef694c8be3e6fc

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

@ -1 +1 @@
5a49425c0eec7a0194b51366746eed914c57f302
2b73b49f98468ecfa0dc3225ea3b043c9a5799b0

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

@ -1 +1 @@
632ffa63e9d733d1fa7e85288e669c7f3c0a961a
64667669bca0ec0b4016193a35a0fcd78975d2cd

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

@ -1 +1 @@
74210b34f12491fef9f55d7f8c9ed8fc29d01a37
e025ddbbaccd0abed12b527315c41b3134b8fb1c

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

@ -1 +1 @@
82f130c85c572806b2dfd30c0406a671d5821476
c4f01595c8e629ab7656ee49aa40e23d9cfee2e9

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

@ -1 +1 @@
c5c35be810d44e629cfde3a5bb1a7f349529711d
34589a8f9053f352e3737b2f377cf7066f0bee98

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

@ -1 +1 @@
c16b35960e6d2f8cf7297971db20ee4d6505166b
434d8b5c90a539c425c3be9ce15dbe135f34113d

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

@ -1 +1 @@
aad7272a54bf569f27d3bc8484f8656d648a1111
7dda74af2a2bb13dc0d4cd3b19ef694c8be3e6fc

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

@ -1 +1 @@
5a49425c0eec7a0194b51366746eed914c57f302
2b73b49f98468ecfa0dc3225ea3b043c9a5799b0

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

@ -1 +1 @@
632ffa63e9d733d1fa7e85288e669c7f3c0a961a
64667669bca0ec0b4016193a35a0fcd78975d2cd

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

@ -1 +1 @@
74210b34f12491fef9f55d7f8c9ed8fc29d01a37
e025ddbbaccd0abed12b527315c41b3134b8fb1c

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

@ -1 +1 @@
82f130c85c572806b2dfd30c0406a671d5821476
c4f01595c8e629ab7656ee49aa40e23d9cfee2e9

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

@ -1 +1 @@
c5c35be810d44e629cfde3a5bb1a7f349529711d
34589a8f9053f352e3737b2f377cf7066f0bee98

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

@ -1 +1 @@
c16b35960e6d2f8cf7297971db20ee4d6505166b
434d8b5c90a539c425c3be9ce15dbe135f34113d

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

@ -1 +1 @@
aad7272a54bf569f27d3bc8484f8656d648a1111
7dda74af2a2bb13dc0d4cd3b19ef694c8be3e6fc

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

@ -1 +1 @@
5a49425c0eec7a0194b51366746eed914c57f302
2b73b49f98468ecfa0dc3225ea3b043c9a5799b0

5
mono/mini/Makefile.am
View File

@ -791,6 +791,7 @@ hybridcheck:
fullaot_regtests = $(regtests)
fullaot_testing_deps = generics-variant-types.dll TestDriver.dll MemoryIntrinsics.dll
fullaot_testing_deps_commas = generics-variant-types.dll,TestDriver.dll,MemoryIntrinsics.dll
FULLAOT_LIBS_UNIVERSAL = \
mscorlib.dll \
@ -830,7 +831,7 @@ fullaotcheck: $(mono) $(fullaot_regtests) $(fullaot_testing_deps)
mkdir $(FULLAOT_TMP_DIR)
$(MAKE) fullaot-libs AOT_FLAGS="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" GSHAREDVT=$(GSHAREDVT)
cp $(regtests) $(fullaot_regtests) $(fullaot_testing_deps) $(FULLAOT_TMP_DIR)/
MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{*.dll,*.exe} || exit 1
MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{$(fullaot_testing_deps_commas),*.exe} || exit 1
ln -s $(if $(MONO_EXECUTABLE),$(MONO_EXECUTABLE),$$PWD/mono) $(FULLAOT_TMP_DIR)/
for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(FULLAOT_ARGS) $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done
@ -853,7 +854,7 @@ llvmonlycheck: mono $(llvmonly_regtests)
mkdir fullaot-tmp
$(MAKE) fullaot-libs AOT_FLAGS="llvmonly,$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)"
cp $(llvmonly_regtests) $(fullaot_testing_deps) fullaot-tmp/
MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) --aot=llvmonly fullaot-tmp/{*.dll,*.exe} || exit 1
MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) --aot=llvmonly fullaot-tmp/{$(fullaot_testing_deps_commas),*.exe} || exit 1
ln -s $$PWD/mono fullaot-tmp/
for i in $(llvmonly_regtests); do echo $$i; MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) --llvmonly fullaot-tmp/$$i --exclude '!BITCODE' || exit 1; done

5
mono/mini/Makefile.am.in
View File

@ -791,6 +791,7 @@ hybridcheck:
fullaot_regtests = $(regtests)
fullaot_testing_deps = generics-variant-types.dll TestDriver.dll MemoryIntrinsics.dll
fullaot_testing_deps_commas = generics-variant-types.dll,TestDriver.dll,MemoryIntrinsics.dll
FULLAOT_LIBS_UNIVERSAL = \
mscorlib.dll \
@ -830,7 +831,7 @@ fullaotcheck: $(mono) $(fullaot_regtests) $(fullaot_testing_deps)
mkdir $(FULLAOT_TMP_DIR)
$(MAKE) fullaot-libs AOT_FLAGS="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" GSHAREDVT=$(GSHAREDVT)
cp $(regtests) $(fullaot_regtests) $(fullaot_testing_deps) $(FULLAOT_TMP_DIR)/
MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{*.dll,*.exe} || exit 1
MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(LLVM_AOT_RUNTIME_OPTS) $(GSHAREDVT_RUNTIME_OPTS) --aot="$(FULLAOT_AOT_ARGS),$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)" $(FULLAOT_TMP_DIR)/{$(fullaot_testing_deps_commas),*.exe} || exit 1
ln -s $(if $(MONO_EXECUTABLE),$(MONO_EXECUTABLE),$$PWD/mono) $(FULLAOT_TMP_DIR)/
for i in $(fullaot_regtests); do echo $$i; MONO_PATH=$(FULLAOT_TMP_DIR) $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) $(FULLAOT_ARGS) $(FULLAOT_TMP_DIR)/$$i --exclude '!FULLAOT' $(ARCH_FULLAOT_EXCLUDE) || exit 1; done
@ -853,7 +854,7 @@ llvmonlycheck: mono $(llvmonly_regtests)
mkdir fullaot-tmp
$(MAKE) fullaot-libs AOT_FLAGS="llvmonly,$(MONO_FULLAOT_ADDITIONAL_ARGS)$(INVARIANT_AOT_OPTIONS)"
cp $(llvmonly_regtests) $(fullaot_testing_deps) fullaot-tmp/
MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) --aot=llvmonly fullaot-tmp/{*.dll,*.exe} || exit 1
MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) --aot=llvmonly fullaot-tmp/{$(fullaot_testing_deps_commas),*.exe} || exit 1
ln -s $$PWD/mono fullaot-tmp/
for i in $(llvmonly_regtests); do echo $$i; MONO_PATH=fullaot-tmp $(top_builddir)/runtime/mono-wrapper $(MOBILE_RUNTIME_ARG) --llvmonly fullaot-tmp/$$i --exclude '!BITCODE' || exit 1; done

2
mono/mini/Makefile.in.REMOVED.git-id
View File

@ -1 +1 @@
22a194c7230dfadcaa4ff33d31d209c6c51c388e
79ad89bfa38a6955409bbde7832246a94e04d3a9

25
mono/mini/generics.cs
View File

@ -1409,6 +1409,31 @@ class Tests
swap (ref obj.buffer1, ref obj.buffer2);
return obj.counter;
}
public interface ICompletion {
Type UnsafeOnCompleted ();
}
public struct TaskAwaiter<T> : ICompletion {
public Type UnsafeOnCompleted () {
typeof(T).GetHashCode ();
return typeof(T);
}
}
public struct AStruct {
public Type Caller<TAwaiter>(ref TAwaiter awaiter)
where TAwaiter : ICompletion {
return awaiter.UnsafeOnCompleted();
}
}
public static int test_0_partial_constrained_call_llvmonly () {
var builder = new AStruct ();
var awaiter = new TaskAwaiter<bool> ();
var res = builder.Caller (ref awaiter);
return res == typeof (bool) ? 0 : 1;
}
}
#if !__MOBILE__

2
mono/mini/method-to-ir.c.REMOVED.git-id
View File

@ -1 +1 @@
6863ee6aca5068eb9377397e32a610d27382a0cf
9a8e885395e6128f4bb16a5ab2cbf0fd3828567e

2
mono/mini/mini-generic-sharing.c.REMOVED.git-id
View File

@ -1 +1 @@
9d95b3ae207facfc373358a3730b166e5843f71e
1e8657d2ce6d4d44fb7252e8bd75f4aa56073f23

2
mono/mini/mini.h.REMOVED.git-id
View File

@ -1 +1 @@
06ea97d24b17f0145537974ad8843d736a6b8a9b
7de8e2236f0d81e755b21d9c55136ca3e4bb5631

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/47631c3"
#define FULL_VERSION "explicit/2eba668"

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
8e7491b65992cbfc838b99016086596f2525e087
a7ce2916837c52f2ef8465bed04673655af7e6b0

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
21324a200c24c7bb0a359b587188fdd41862c93d
cb5a4e64c5d380b21f4498d1d2f6f93ae5b69dd6

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
7a339f2c16e1288f7b2b1da34fea9c2c657d9676
271ab5ce92b319a6aaa5237f8add1a34e587f91c

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy
msgid ""
msgstr ""
"Project-Id-Version: mono 5.10.1.4\n"
"Project-Id-Version: mono 5.10.1.6\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2018-03-21 08:45+0000\n"
"POT-Creation-Date: 2018-03-22 08:15+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 @@
00910a452b11f7bda00762ecf15da1aaacd3631b
f57a3215e781604edaeee1b862ac7a55c09e656e