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: dfddeb0298166bf47f1d2e4894cc8ad9b6a73dc2
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2019-08-30 20:12:08 +00:00
commit ebb79e779c
50 changed files with 52 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
91ebc48069c47a6e5fbee11f910ee6ce6bedf4fe 697def686b221f80e49bd7286802b3a76adac046

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

@ -1 +1 @@
f6cc60f550b124af1f6e690d99260b1b0610771c 3f61beb1f86b86a2da5ac63d27ef6bf2ce7e9d75

2
external/ikvm/reflect/CustomAttributeData.cs vendored
View File

@ -412,7 +412,7 @@ namespace IKVM.Reflection
} }
else else
{ {
throw new InvalidOperationException(); throw new InvalidOperationException(type.ToString());
} }
} }

2
external/ikvm/reflect/Metadata/Tables.cs vendored
View File

@ -1244,6 +1244,8 @@ namespace IKVM.Reflection.Metadata
return (token & 0xFFFFFF) << 5 | 18; return (token & 0xFFFFFF) << 5 | 18;
case GenericParamTable.Index: case GenericParamTable.Index:
return (token & 0xFFFFFF) << 5 | 19; return (token & 0xFFFFFF) << 5 | 19;
case GenericParamConstraintTable.Index:
return (token & 0xFFFFFF) << 5 | 20;
default: default:
throw new InvalidOperationException(); throw new InvalidOperationException();
} }

2
external/ikvm/reflect/Reader/MetadataReader.cs vendored
View File

@ -226,6 +226,8 @@ namespace IKVM.Reflection.Reader
return (ManifestResourceTable.Index << 24) + (codedIndex >> 5); return (ManifestResourceTable.Index << 24) + (codedIndex >> 5);
case 19: case 19:
return (GenericParamTable.Index << 24) + (codedIndex >> 5); return (GenericParamTable.Index << 24) + (codedIndex >> 5);
case 20:
return (GenericParamConstraintTable.Index << 24) + (codedIndex >> 5);
default: default:
throw new BadImageFormatException(); throw new BadImageFormatException();
} }

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

@ -41,7 +41,7 @@ static partial 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 = "6.4.0.186"; public const string MonoVersion = "6.4.0.187";
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";

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
2a0838370259ebf96142331b10ac563b1103adc2 e925fe0f1361b9e6bf78893830c63667f5e41fb3

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
1f4cc2768f13d9875b13350c001dcbee20740ddc 1398f4d7f255841ea15d7ba1d0c00b608b2083c3

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
9f0fc2a560ae0b2ef6c2614982dde04e85c01a4a 3c2e330763ca854a2259da0baf98936541785934

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
View File

@ -1 +1 @@
587bd1f18657bd271b42e055e7ff0018a45c4274 f0a8f37dc4e0a5992a38660b3ffe3cf70d200455

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
d011a963a7c2363851175bdd399a1c1bc970b982 e4e76f037929f101e9690211286da031013a0833

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
d53b8d57ef7eb035aa068ffa64d681042acd284a 93b139c713973ccf7c2ef61bab9feab364715fda

2
mcs/class/lib/monolite-linux/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
efd82eaedda668b7dad0c82fd6097d695a7349bd 310ca82df358b8d54b3ebffa12954e9f1718ea28

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
2a0838370259ebf96142331b10ac563b1103adc2 e925fe0f1361b9e6bf78893830c63667f5e41fb3

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
1f4cc2768f13d9875b13350c001dcbee20740ddc 1398f4d7f255841ea15d7ba1d0c00b608b2083c3

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
9f0fc2a560ae0b2ef6c2614982dde04e85c01a4a 3c2e330763ca854a2259da0baf98936541785934

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
View File

@ -1 +1 @@
587bd1f18657bd271b42e055e7ff0018a45c4274 f0a8f37dc4e0a5992a38660b3ffe3cf70d200455

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
d011a963a7c2363851175bdd399a1c1bc970b982 e4e76f037929f101e9690211286da031013a0833

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
d53b8d57ef7eb035aa068ffa64d681042acd284a 93b139c713973ccf7c2ef61bab9feab364715fda

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
9fb87367c7c8e951f6ad881ec516ad4b49564834 a3edf311a2041e2c64c3b214e8ae124aa50e4809

2
mcs/class/lib/monolite-macos/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
efd82eaedda668b7dad0c82fd6097d695a7349bd 310ca82df358b8d54b3ebffa12954e9f1718ea28

2
mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
2a0838370259ebf96142331b10ac563b1103adc2 e925fe0f1361b9e6bf78893830c63667f5e41fb3

2
mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
1f4cc2768f13d9875b13350c001dcbee20740ddc 1398f4d7f255841ea15d7ba1d0c00b608b2083c3

2
mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
9f0fc2a560ae0b2ef6c2614982dde04e85c01a4a 3c2e330763ca854a2259da0baf98936541785934

2
mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
View File

@ -1 +1 @@
587bd1f18657bd271b42e055e7ff0018a45c4274 f0a8f37dc4e0a5992a38660b3ffe3cf70d200455

2
mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
d011a963a7c2363851175bdd399a1c1bc970b982 e4e76f037929f101e9690211286da031013a0833

2
mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
d53b8d57ef7eb035aa068ffa64d681042acd284a 93b139c713973ccf7c2ef61bab9feab364715fda

2
mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
9fb87367c7c8e951f6ad881ec516ad4b49564834 a3edf311a2041e2c64c3b214e8ae124aa50e4809

2
mcs/class/lib/monolite-unix/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
efd82eaedda668b7dad0c82fd6097d695a7349bd 310ca82df358b8d54b3ebffa12954e9f1718ea28

2
mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/Mono.Security.dll.REMOVED.git-id
View File

@ -1 +1 @@
2a0838370259ebf96142331b10ac563b1103adc2 e925fe0f1361b9e6bf78893830c63667f5e41fb3

2
mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Configuration.dll.REMOVED.git-id
View File

@ -1 +1 @@
1f4cc2768f13d9875b13350c001dcbee20740ddc 1398f4d7f255841ea15d7ba1d0c00b608b2083c3

2
mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Core.dll.REMOVED.git-id
View File

@ -1 +1 @@
ae618deceecb9ed6e2d386e8837bc70c13afe28c 86be9deec79ef9fb4f41ab99820c5c3352e86660

2
mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.IO.Compression.dll.REMOVED.git-id
View File

@ -1 +1 @@
587bd1f18657bd271b42e055e7ff0018a45c4274 f0a8f37dc4e0a5992a38660b3ffe3cf70d200455

2
mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Numerics.dll.REMOVED.git-id
View File

@ -1 +1 @@
d011a963a7c2363851175bdd399a1c1bc970b982 e4e76f037929f101e9690211286da031013a0833

2
mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/System.Xml.dll.REMOVED.git-id
View File

@ -1 +1 @@
d53b8d57ef7eb035aa068ffa64d681042acd284a 93b139c713973ccf7c2ef61bab9feab364715fda

2
mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mcs.exe.REMOVED.git-id
View File

@ -1 +1 @@
9fb87367c7c8e951f6ad881ec516ad4b49564834 a3edf311a2041e2c64c3b214e8ae124aa50e4809

2
mcs/class/lib/monolite-win32/62731146-81CF-4D61-826D-9A8DDED14432/mscorlib.dll.REMOVED.git-id
View File

@ -1 +1 @@
d5d6c792c0807c09182e600b7def5369e6df846a 02da03284d8e08a084e3401656a8df759ce4f810

3
mono/dis/dump.c
View File

@ -794,6 +794,9 @@ has_cattr_get_table (MonoImage *m, guint32 val)
case MONO_CUSTOM_ATTR_GENERICPAR: case MONO_CUSTOM_ATTR_GENERICPAR:
table = "GenericParam"; table = "GenericParam";
break; break;
case MONO_CUSTOM_ATTR_GENERICPARAMCONSTRAINT:
table = "GenericParamConstraint";
break;
default: default:
table = "Unknown"; table = "Unknown";
break; break;

1
mono/metadata/row-indexes.h
View File

@ -392,6 +392,7 @@ enum {
MONO_CUSTOM_ATTR_EXP_TYPE, MONO_CUSTOM_ATTR_EXP_TYPE,
MONO_CUSTOM_ATTR_MANIFEST, MONO_CUSTOM_ATTR_MANIFEST,
MONO_CUSTOM_ATTR_GENERICPAR, MONO_CUSTOM_ATTR_GENERICPAR,
MONO_CUSTOM_ATTR_GENERICPARAMCONSTRAINT,
MONO_CUSTOM_ATTR_BITS = 5, MONO_CUSTOM_ATTR_BITS = 5,
MONO_CUSTOM_ATTR_MASK = 0x1F MONO_CUSTOM_ATTR_MASK = 0x1F
}; };

2
mono/mini/version.h
View File

@ -1 +1 @@
#define FULL_VERSION "explicit/7ef99c0" #define FULL_VERSION "explicit/3216a3c"

4
mono/unit-tests/Makefile.in
View File

@ -1491,10 +1491,10 @@ distclean-generic:
maintainer-clean-generic: maintainer-clean-generic:
@echo "This command is intended for maintainers to use" @echo "This command is intended for maintainers to use"
@echo "it deletes files that may require special tools to rebuild." @echo "it deletes files that may require special tools to rebuild."
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
@CROSS_COMPILE_TRUE@test-local: @CROSS_COMPILE_TRUE@test-local:
@HOST_WIN32_TRUE@test-local: @HOST_WIN32_TRUE@test-local:
@CROSS_COMPILE_TRUE@clean-local:
@HOST_WIN32_TRUE@clean-local:
clean: clean-am clean: clean-am
clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \ clean-am: clean-checkPROGRAMS clean-generic clean-libtool clean-local \

BIN
po/mcs/de.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
bf8b08a3b660338eeb69091d4ebda95a72b55fe1 1d733780162acfa33503df4ca165679a813c8231

BIN
po/mcs/es.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
8131f9b1508b4cb4d71c4c3d2420cee3b03a9f23 90338ca43f6a7f342c131145dd5b29617a7de47d

BIN
po/mcs/ja.gmo
View File

Binary file not shown.

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

@ -1 +1 @@
9a71555571ad7964c6a0547935ac552f9b55a9f9 0b09e40cbdb0494273ab266ba96c0794f386ca09

4
po/mcs/mcs.pot
View File

@ -6,9 +6,9 @@
#, fuzzy #, fuzzy
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: mono 6.4.0.186\n" "Project-Id-Version: mono 6.4.0.187\n"
"Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n" "Report-Msgid-Bugs-To: http://www.mono-project.com/Bugs\n"
"POT-Creation-Date: 2019-08-30 08:07+0000\n" "POT-Creation-Date: 2019-08-30 19:04+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n" "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\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 @@
5de2d18bf9edad21019faee5dcd5aec84b4a0219 5c95d15fd24c36df8e25d521a7ad221505f7c289