Merge branch 'upstream'
Former-commit-id: 8bb677bfec42361b8016b3560c63e111f92ef657
This commit is contained in:
commit
a418c8b0fb
@ -1 +1 @@
|
||||
6d98fb49b3272a7bb8ca47900dd3c42085b23a87
|
||||
e60587a6530024d1e09fa8b3fae2071a7baa49ca
|
@ -1 +1 @@
|
||||
ca1c7539f927b2dfd976e7a4a1dae1311fb55899
|
||||
bd0e5dfd7cf736c2d10c084942f51b1f440c9dd4
|
@ -34,7 +34,7 @@ static class Consts
|
||||
// Use these assembly version constants to make code more maintainable.
|
||||
//
|
||||
|
||||
public const string MonoVersion = "5.20.0.229";
|
||||
public const string MonoVersion = "5.20.0.232";
|
||||
public const string MonoCompany = "Mono development team";
|
||||
public const string MonoProduct = "Mono Common Language Infrastructure";
|
||||
public const string MonoCopyright = "(c) Various Mono authors";
|
||||
|
@ -39,7 +39,7 @@ common_DEPS_SUBDIRS :=
|
||||
netstandard_drawing_SUBDIRS = System.Drawing.Common System.Drawing.Primitives netstandard
|
||||
|
||||
monotouch_SUBDIRS = $(common_DEPS_SUBDIRS) $(mobile_only_DEPS_SUBDIRS)
|
||||
monotouch_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
monotouch_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
|
||||
|
||||
monodroid_SUBDIRS = $(monotouch_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
monodroid_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
@ -80,16 +80,16 @@ monotouch_tv_SUBDIRS = $(monotouch_SUBDIRS)
|
||||
monotouch_tv_PARALLEL_SUBDIRS = $(monotouch_PARALLEL_SUBDIRS)
|
||||
|
||||
winaot_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
winaot_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
|
||||
|
||||
orbis_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
orbis_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
|
||||
|
||||
unreal_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
unreal_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
|
||||
|
||||
wasm_SUBDIRS = $(common_DEPS_SUBDIRS) $(netstandard_drawing_SUBDIRS)
|
||||
wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS)
|
||||
wasm_PARALLEL_SUBDIRS = $(common_SUBDIRS) $(mobile_only_SUBDIRS) System.Drawing.Common
|
||||
|
||||
mobile_only_SUBDIRS = System.Security.Cryptography.Pkcs System.Security.Cryptography.OpenSsl System.Threading.Tasks.Extensions \
|
||||
System.Security.Cryptography.Cng System.Runtime.Loader System.Xml.XPath.XmlDocument System.Reflection.DispatchProxy System.Memory \
|
||||
|
@ -1 +1 @@
|
||||
a3bc3e9b1bbbe327ff01a4b4fa6f47f496574724
|
||||
617daca15ea56d904ec2c8ad23b7e03bb209c7c7
|
@ -1 +1 @@
|
||||
5483a2633a84f8aba73cb6022eb9ded0476f9c61
|
||||
9eb8caad9a594ec47394891d0c93a703e7f3462a
|
@ -1 +1 @@
|
||||
5750f5f5fffae7beb6c36e2bed2433e4c3fc8989
|
||||
e1aa28f449be20c90d6cfb72ca9817b9907c2f41
|
Binary file not shown.
@ -1 +1 @@
|
||||
d593a7c89a5ac50142b506d049c93a2204c0d9ff
|
||||
718b94a811cbec0035b44ca779a50f886bcc6a10
|
@ -1 +1 @@
|
||||
b216948c6c4a3e4289b78a33c764ba874a976677
|
||||
ee4c3a63131787592824bd4584ca6d166debe9c8
|
@ -1 +1 @@
|
||||
018a573c3945db63850d5a7c9a9ff722b9e82b90
|
||||
9860c1fa326aeeff1dab3cb4ca49f9328b3a94c4
|
@ -1 +1 @@
|
||||
f442b8cbdf434b1c3e5c9a36ebd3621b12ae8bf4
|
||||
b8359f1f0c71a0dbb9d2114251eda4b65b537f40
|
@ -1 +1 @@
|
||||
a3bc3e9b1bbbe327ff01a4b4fa6f47f496574724
|
||||
617daca15ea56d904ec2c8ad23b7e03bb209c7c7
|
@ -1 +1 @@
|
||||
5483a2633a84f8aba73cb6022eb9ded0476f9c61
|
||||
9eb8caad9a594ec47394891d0c93a703e7f3462a
|
@ -1 +1 @@
|
||||
5750f5f5fffae7beb6c36e2bed2433e4c3fc8989
|
||||
e1aa28f449be20c90d6cfb72ca9817b9907c2f41
|
Binary file not shown.
@ -1 +1 @@
|
||||
d593a7c89a5ac50142b506d049c93a2204c0d9ff
|
||||
718b94a811cbec0035b44ca779a50f886bcc6a10
|
@ -1 +1 @@
|
||||
b216948c6c4a3e4289b78a33c764ba874a976677
|
||||
ee4c3a63131787592824bd4584ca6d166debe9c8
|
@ -1 +1 @@
|
||||
018a573c3945db63850d5a7c9a9ff722b9e82b90
|
||||
9860c1fa326aeeff1dab3cb4ca49f9328b3a94c4
|
@ -1 +1 @@
|
||||
f442b8cbdf434b1c3e5c9a36ebd3621b12ae8bf4
|
||||
b8359f1f0c71a0dbb9d2114251eda4b65b537f40
|
Some files were not shown because too many files have changed in this diff Show More
Loading…
x
Reference in New Issue
Block a user