mono/linux-packaging-mono
0
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Imported Upstream version 5.20.0.180

Browse Source 
Former-commit-id: ff953ca879339fe1e1211f7220f563e1342e66cb
This commit is contained in:
Xamarin Public Jenkins (auto-signing)
2019-02-04 20:11:37 +00:00
parent 0e2d47d1c8
commit 0510252385
3360 changed files with 83827 additions and 39243 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
mcs/class/corlib/Mono/DependencyInjector.cs
View File

@@ -23,10 +23,10 @@
// 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;
#if !(MONOTOUCH || MONODROID)
using System.Reflection;
#endif
using System.Runtime.CompilerServices;
namespace Mono
{
@@ -45,13 +45,9 @@ namespace Mono
if (systemDependency != null)
return systemDependency;
// Not using `MOBILE` as a conditional here because we want to use this on full-aot.
#if !(MONOTOUCH || MONODROID)
// On Mobile, we initializes this during system startup.
systemDependency = ReflectionLoad ();
#endif
if (systemDependency == null)
throw new PlatformNotSupportedException ("Cannot get `ISystemDependencyProvider`.");
throw new PlatformNotSupportedException ($"Cannot find '{TypeName}' dependency");
return systemDependency;
}
@@ -67,22 +63,21 @@ namespace Mono
}
}
#if !(MONOTOUCH || MONODROID)
const string TypeName = "Mono.SystemDependencyProvider, " + Consts.AssemblySystem;
const string TypeName = "Mono.SystemDependencyProvider, System";
[PreserveDependency ("get_Instance()", "Mono.SystemDependencyProvider", "System")]
static ISystemDependencyProvider ReflectionLoad ()
{
var type = Type.GetType (TypeName);
if (type == null)
return null;
var prop = type.GetProperty ("Instance", BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public);
var prop = type.GetProperty ("Instance", BindingFlags.Static | BindingFlags.Public | BindingFlags.DeclaredOnly);
if (prop == null)
return null;
return (ISystemDependencyProvider)prop.GetValue (null);
return (ISystemDependencyProvider) prop.GetValue (null);
}
#endif
static object locker = new object ();
static ISystemDependencyProvider systemDependency;

86
mcs/class/corlib/Mono/MonoNativePlatform.cs Normal file
View File

@@ -0,0 +1,86 @@
//
// MonoNativePlatform.cs
//
// Author:
// Martin Baulig <mabaul@microsoft.com>
//
// Copyright (c) 2018 Xamarin, Inc.
//
// 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.Runtime.CompilerServices;
using System.Runtime.InteropServices;
namespace Mono
{
/*
* The purpose of this class is to be used by test such as for instance
* the xamarin-macios test suite to examine and test the Mono.Native
* library.
*/
static class MonoNativePlatform
{
[DllImport ("System.Native")]
extern static int mono_native_get_platform_type ();
public static MonoNativePlatformType GetPlatformType ()
{
return (MonoNativePlatformType)mono_native_get_platform_type ();
}
/*
* Test Suite Use Only.
*/
[MethodImpl (MethodImplOptions.InternalCall)]
extern static int IncrementInternalCounter ();
[DllImport ("System.Native")]
extern static int mono_native_is_initialized ();
[DllImport ("System.Native")]
extern static int mono_native_initialize ();
/*
* This method is called by the xamarin-macios test suite
* to register the `IncrementInternalCounter` icall.
*
* It ensures that the native library can call
* `mono_add_internal_call_with_flags` and the mtouch and mmp
* tools can correctly deal with it.
*/
public static void Initialize ()
{
mono_native_initialize ();
}
public static bool IsInitialized ()
{
return mono_native_is_initialized () != 0;
}
/*
* Test Suite Use Only.
*/
internal static int TestInternalCounter ()
{
// Atomically increments internal counter, for testing purposes only.
return IncrementInternalCounter ();
}
}
}

49
mcs/class/corlib/Mono/MonoNativePlatformType.cs Normal file
View File

@@ -0,0 +1,49 @@
//
// MonoNativePlatformType.cs
//
// Author:
// Martin Baulig <mabaul@microsoft.com>
//
// Copyright (c) 2018 Xamarin, Inc.
//
// 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;
namespace Mono
{
// Keep in sync with mono/native/mono-native-platform-type.h
[Flags]
enum MonoNativePlatformType
{
MONO_NATIVE_PLATFORM_TYPE_UNKNOWN = 0,
MONO_NATIVE_PLATFORM_TYPE_MACOS = 1,
MONO_NATIVE_PLATFORM_TYPE_IOS = 2,
MONO_NATIVE_PLATFORM_TYPE_LINUX = 3,
MONO_NATIVE_PLATFORM_TYPE_IPHONE = 0x100,
MONO_NATIVE_PLATFORM_TYPE_TV = 0x200,
MONO_NATIVE_PLATFORM_TYPE_WATCH = 0x400,
MONO_NATIVE_PLATFORM_TYPE_COMPAT = 0x1000,
MONO_NATIVE_PLATFORM_TYPE_UNIFIED = 0x2000,
MONO_NATIVE_PLATFORM_TYPE_SIMULATOR = 0x4000,
MONO_NATIVE_PLATFORM_TYPE_DEVICE = 0x8000
}
}

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

@@ -148,7 +148,7 @@ namespace Mono {
}
// All must be set except for configDir_str
static void EnableMicrosoftTelemetry (string appBundleID_str, string appSignature_str, string appVersion_str, string merpGUIPath_str, string eventType_str, string appPath_str)
static void EnableMicrosoftTelemetry (string appBundleID_str, string appSignature_str, string appVersion_str, string merpGUIPath_str, string eventType_str, string appPath_str, string configDir_str)
{
if (RuntimeInformation.IsOSPlatform (OSPlatform.OSX)) {
using (var appBundleID_chars = RuntimeMarshal.MarshalString (appBundleID_str))
@@ -157,14 +157,14 @@ namespace Mono {
using (var merpGUIPath_chars = RuntimeMarshal.MarshalString (merpGUIPath_str))
using (var eventType_chars = RuntimeMarshal.MarshalString (eventType_str))
using (var appPath_chars = RuntimeMarshal.MarshalString (appPath_str))
using (var configDir_chars = RuntimeMarshal.MarshalString (configDir_str))
{
EnableMicrosoftTelemetry_internal (appBundleID_chars.Value, appSignature_chars.Value, appVersion_chars.Value, merpGUIPath_chars.Value, eventType_chars.Value, appPath_chars.Value, IntPtr.Zero);
EnableMicrosoftTelemetry_internal (appBundleID_chars.Value, appSignature_chars.Value, appVersion_chars.Value, merpGUIPath_chars.Value, eventType_chars.Value, appPath_chars.Value, configDir_chars.Value);
}
} else {
throw new PlatformNotSupportedException("Merp support is currently only supported on OSX.");
}
}
#endif
[MethodImplAttribute (MethodImplOptions.InternalCall)]