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;