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: 547cb11802aa690c9d7a49638889080fe2bdc5a0
This commit is contained in:
Xamarin Public Jenkins (auto-signing) 2018-07-13 08:33:03 +00:00
commit bbfd05acf6
165 changed files with 52 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
configure.REMOVED.git-id
View File

@ -1 +1 @@
2ae51be67dfd26706cd8b2b93168380a99bd5cdf
490c39b688fde1f8a1e202c54c3d1de4b65946d5

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

@ -1 +1 @@
8e769346903571d38503dce24b6c002872414936
259c63e41243aa799bc462a02760ee8cd0ea9b6e

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

@ -34,11 +34,11 @@ static class Consts
// Use these assembly version constants to make code more maintainable.
//
public const string MonoVersion = "5.14.0.161";
public const string MonoVersion = "5.14.0.166";
public const string MonoCompany = "Mono development team";
public const string MonoProduct = "Mono Common Language Infrastructure";
public const string MonoCopyright = "(c) Various Mono authors";
public const int MonoCorlibVersion = 1051400003;
public const int MonoCorlibVersion = 1051400005;
#if MOBILE
// Versions of .NET Framework for Silverlight 4.0

8
mcs/class/corlib/Mono/Runtime.cs
View File

@ -86,17 +86,19 @@ namespace Mono {
static extern void DisableMicrosoftTelemetry (IntPtr appBundleID, IntPtr appSignature, IntPtr appVersion, IntPtr merpGUIPath);
[MethodImplAttribute (MethodImplOptions.InternalCall)]
static extern void EnableMicrosoftTelemetry_internal (IntPtr appBundleID, IntPtr appSignature, IntPtr appVersion, IntPtr merpGUIPath);
static extern void EnableMicrosoftTelemetry_internal (IntPtr appBundleID, IntPtr appSignature, IntPtr appVersion, IntPtr merpGUIPath, IntPtr eventType, IntPtr appPath);
static void EnableMicrosoftTelemetry (string appBundleID_str, string appSignature_str, string appVersion_str, string merpGUIPath_str)
static void EnableMicrosoftTelemetry (string appBundleID_str, string appSignature_str, string appVersion_str, string merpGUIPath_str, string eventType_str, string appPath_str)
{
if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
using (var appBundleID_chars = RuntimeMarshal.MarshalString (appBundleID_str))
using (var appSignature_chars = RuntimeMarshal.MarshalString (appSignature_str))
using (var appVersion_chars = RuntimeMarshal.MarshalString (appVersion_str))
using (var merpGUIPath_chars = RuntimeMarshal.MarshalString (merpGUIPath_str))
using (var eventType_chars = RuntimeMarshal.MarshalString (eventType_str))
using (var appPath_chars = RuntimeMarshal.MarshalString (appPath_str))
{
EnableMicrosoftTelemetry_internal (appBundleID_chars.Value, appSignature_chars.Value, appVersion_chars.Value, merpGUIPath_chars.Value);
EnableMicrosoftTelemetry_internal (appBundleID_chars.Value, appSignature_chars.Value, appVersion_chars.Value, merpGUIPath_chars.Value, eventType_chars.Value, appPath_chars.Value);
}
} else {
throw new PlatformNotSupportedException("Merp support is currently only supported on OSX.");

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

@ -1 +0,0 @@
5ae20c4b3bc1c6520f9c8bb4cbec691610ff8126

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

@ -1 +0,0 @@
e5735477a0db8d9fbee553dc64d7ec8b87844b46

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

@ -1 +0,0 @@
b354dd7e1c8b5df0209aeb650b1f4d79d2c21867

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

@ -1 +0,0 @@
778740ef22ffdc4c99567b7ca2f3f6d9f39626ab

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

@ -1 +0,0 @@
2fff4a0e726d1199e054e0497dd4ce6dbfbe1bbf

1
mcs/class/lib/monolite-darwin/1051400003/mcs.exe.REMOVED.git-id
View File

@ -1 +0,0 @@
95be6ac3ed6a51045eb79e03ddbab4691eb7ddd0

1
mcs/class/lib/monolite-darwin/1051400003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
b040c9ec355e921b8c99d7f6718d55e9c0fde492

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Collections.Concurrent.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Collections.Concurrent.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Collections.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Collections.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Diagnostics.Debug.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Diagnostics.Debug.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Diagnostics.FileVersionInfo.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Diagnostics.FileVersionInfo.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Diagnostics.Tools.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Diagnostics.Tools.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Dynamic.Runtime.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Dynamic.Runtime.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Globalization.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Globalization.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.IO.FileSystem.Primitives.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.IO.FileSystem.Primitives.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.IO.FileSystem.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.IO.FileSystem.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.IO.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.IO.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Linq.Expressions.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Linq.Expressions.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Linq.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Linq.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Reflection.Extensions.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Reflection.Extensions.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Reflection.Primitives.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Reflection.Primitives.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Reflection.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Reflection.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Resources.ResourceManager.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Resources.ResourceManager.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Runtime.Extensions.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Runtime.Extensions.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Runtime.InteropServices.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Runtime.InteropServices.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Runtime.Numerics.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Runtime.Numerics.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Runtime.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Runtime.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Security.Cryptography.Algorithms.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Security.Cryptography.Algorithms.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Security.Cryptography.Primitives.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Security.Cryptography.Primitives.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Text.Encoding.CodePages.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Text.Encoding.CodePages.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Text.Encoding.Extensions.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Text.Encoding.Extensions.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Text.Encoding.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Text.Encoding.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Threading.Tasks.Parallel.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Threading.Tasks.Parallel.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Threading.Tasks.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Threading.Tasks.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Threading.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Threading.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.ValueTuple.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.ValueTuple.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Xml.ReaderWriter.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Xml.ReaderWriter.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Facades/System.Xml.XDocument.dll → mcs/class/lib/monolite-darwin/1051400005/Facades/System.Xml.XDocument.dll
View File

0
mcs/class/lib/monolite-darwin/1051400003/Mono.Cecil.dll.REMOVED.git-id → mcs/class/lib/monolite-darwin/1051400005/Mono.Cecil.dll.REMOVED.git-id
View File

1
mcs/class/lib/monolite-darwin/1051400005/Mono.Security.dll.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
5bec38eec478297e7ae99d57b313bfa1b37e8fcd

1
mcs/class/lib/monolite-darwin/1051400005/System.Configuration.dll.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
e7eeb10ff786c4094d422e139cf545756a50f0bc

0
mcs/class/lib/monolite-darwin/1051400003/System.Core.dll.REMOVED.git-id → mcs/class/lib/monolite-darwin/1051400005/System.Core.dll.REMOVED.git-id
View File

1
mcs/class/lib/monolite-darwin/1051400005/System.Numerics.dll.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
505109c6913d9a68fa11e5c5bdb38dee35e97481

1
mcs/class/lib/monolite-darwin/1051400005/System.Security.dll.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
14045bb94aa03bd121d7ef2577c2e604acab5d18

0
mcs/class/lib/monolite-darwin/1051400003/System.Xml.Linq.dll.REMOVED.git-id → mcs/class/lib/monolite-darwin/1051400005/System.Xml.Linq.dll.REMOVED.git-id
View File

1
mcs/class/lib/monolite-darwin/1051400005/System.Xml.dll.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
3e2a9b871246ae870f4ad28950a98c46ea45fa88

0
mcs/class/lib/monolite-darwin/1051400003/System.dll.REMOVED.git-id → mcs/class/lib/monolite-darwin/1051400005/System.dll.REMOVED.git-id
View File

1
mcs/class/lib/monolite-darwin/1051400005/mcs.exe.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
0094ffa5a000888eb01c01bf881b777d3b55813b

1
mcs/class/lib/monolite-darwin/1051400005/mscorlib.dll.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
5cc19a4a6d5939b6ffd9151cc0871ba7ea485c1f

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

@ -1 +0,0 @@
5ae20c4b3bc1c6520f9c8bb4cbec691610ff8126

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

@ -1 +0,0 @@
e5735477a0db8d9fbee553dc64d7ec8b87844b46

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

@ -1 +0,0 @@
b354dd7e1c8b5df0209aeb650b1f4d79d2c21867

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

@ -1 +0,0 @@
778740ef22ffdc4c99567b7ca2f3f6d9f39626ab

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

@ -1 +0,0 @@
2fff4a0e726d1199e054e0497dd4ce6dbfbe1bbf

1
mcs/class/lib/monolite-linux/1051400003/mcs.exe.REMOVED.git-id
View File

@ -1 +0,0 @@
95be6ac3ed6a51045eb79e03ddbab4691eb7ddd0

1
mcs/class/lib/monolite-linux/1051400003/mscorlib.dll.REMOVED.git-id
View File

@ -1 +0,0 @@
b040c9ec355e921b8c99d7f6718d55e9c0fde492

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Collections.Concurrent.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Collections.Concurrent.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Collections.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Collections.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Diagnostics.Debug.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Diagnostics.Debug.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Diagnostics.FileVersionInfo.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Diagnostics.FileVersionInfo.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Diagnostics.Tools.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Diagnostics.Tools.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Dynamic.Runtime.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Dynamic.Runtime.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Globalization.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Globalization.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.IO.FileSystem.Primitives.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.IO.FileSystem.Primitives.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.IO.FileSystem.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.IO.FileSystem.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.IO.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.IO.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Linq.Expressions.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Linq.Expressions.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Linq.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Linq.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Reflection.Extensions.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Reflection.Extensions.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Reflection.Primitives.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Reflection.Primitives.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Reflection.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Reflection.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Resources.ResourceManager.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Resources.ResourceManager.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Runtime.Extensions.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Runtime.Extensions.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Runtime.InteropServices.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Runtime.InteropServices.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Runtime.Numerics.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Runtime.Numerics.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Runtime.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Runtime.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Security.Cryptography.Algorithms.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Security.Cryptography.Algorithms.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Security.Cryptography.Primitives.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Security.Cryptography.Primitives.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Text.Encoding.CodePages.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Text.Encoding.CodePages.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Text.Encoding.Extensions.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Text.Encoding.Extensions.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Text.Encoding.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Text.Encoding.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Threading.Tasks.Parallel.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Threading.Tasks.Parallel.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Threading.Tasks.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Threading.Tasks.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Threading.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Threading.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.ValueTuple.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.ValueTuple.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Xml.ReaderWriter.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Xml.ReaderWriter.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Facades/System.Xml.XDocument.dll → mcs/class/lib/monolite-linux/1051400005/Facades/System.Xml.XDocument.dll
View File

0
mcs/class/lib/monolite-linux/1051400003/Mono.Cecil.dll.REMOVED.git-id → mcs/class/lib/monolite-linux/1051400005/Mono.Cecil.dll.REMOVED.git-id
View File

1
mcs/class/lib/monolite-linux/1051400005/Mono.Security.dll.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
5bec38eec478297e7ae99d57b313bfa1b37e8fcd

1
mcs/class/lib/monolite-linux/1051400005/System.Configuration.dll.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
e7eeb10ff786c4094d422e139cf545756a50f0bc

0
mcs/class/lib/monolite-linux/1051400003/System.Core.dll.REMOVED.git-id → mcs/class/lib/monolite-linux/1051400005/System.Core.dll.REMOVED.git-id
View File

1
mcs/class/lib/monolite-linux/1051400005/System.Numerics.dll.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
505109c6913d9a68fa11e5c5bdb38dee35e97481

1
mcs/class/lib/monolite-linux/1051400005/System.Security.dll.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
14045bb94aa03bd121d7ef2577c2e604acab5d18

0
mcs/class/lib/monolite-linux/1051400003/System.Xml.Linq.dll.REMOVED.git-id → mcs/class/lib/monolite-linux/1051400005/System.Xml.Linq.dll.REMOVED.git-id
View File

1
mcs/class/lib/monolite-linux/1051400005/System.Xml.dll.REMOVED.git-id Normal file
View File

@ -0,0 +1 @@
3e2a9b871246ae870f4ad28950a98c46ea45fa88

0
mcs/class/lib/monolite-linux/1051400003/System.dll.REMOVED.git-id → mcs/class/lib/monolite-linux/1051400005/System.dll.REMOVED.git-id
View File

Some files were not shown because too many files have changed in this diff Show More