diff --git a/src/Mono.Android/Android.Runtime/AndroidEnvironment.cs b/src/Mono.Android/Android.Runtime/AndroidEnvironment.cs index 902d7c53eb6..a4ab68225b0 100644 --- a/src/Mono.Android/Android.Runtime/AndroidEnvironment.cs +++ b/src/Mono.Android/Android.Runtime/AndroidEnvironment.cs @@ -395,11 +395,6 @@ static Type GetFallbackHttpMessageHandlerType () return handlerType; } - internal static bool VSAndroidDesignerIsEnabled { get; } = InitializeVSAndroidDesignerIsEnabled (); - - static bool InitializeVSAndroidDesignerIsEnabled () => - !AppContext.TryGetSwitch ("Xamarin.Android.VSAndroidDesigner.IsSupported", out bool isEnabled) || isEnabled; - class _Proxy : IWebProxy { readonly ProxySelector selector = ProxySelector.Default!; diff --git a/src/Mono.Android/Android.Runtime/Logger.cs b/src/Mono.Android/Android.Runtime/Logger.cs index f4665ab3a63..29e13cd6302 100644 --- a/src/Mono.Android/Android.Runtime/Logger.cs +++ b/src/Mono.Android/Android.Runtime/Logger.cs @@ -55,8 +55,6 @@ public static void Log (LogLevel level, string appname, string? log) { hasNoLibLog = true; } } - if (AndroidEnvironment.VSAndroidDesignerIsEnabled && hasNoLibLog) - System.Console.WriteLine ("[{0}] {1}: {2}", level, appname, line); } } diff --git a/src/Mono.Android/ILLink/ILLink.Substitutions.xml b/src/Mono.Android/ILLink/ILLink.Substitutions.xml index 55ac10132dc..80459d1cd60 100644 --- a/src/Mono.Android/ILLink/ILLink.Substitutions.xml +++ b/src/Mono.Android/ILLink/ILLink.Substitutions.xml @@ -1,13 +1,5 @@ - - - - - - - - diff --git a/src/Mono.Android/Java.Interop/TypeManager.cs b/src/Mono.Android/Java.Interop/TypeManager.cs index 334a9f542a8..cb33c976db0 100644 --- a/src/Mono.Android/Java.Interop/TypeManager.cs +++ b/src/Mono.Android/Java.Interop/TypeManager.cs @@ -229,34 +229,6 @@ static Exception CreateJavaLocationException () return null; } - if (AndroidEnvironment.VSAndroidDesignerIsEnabled) - return TypeRegistrationFallback (class_name); - - return null; - } - - internal static Type? TypeRegistrationFallback (string class_name) - { - [UnconditionalSuppressMessage ("Trimming", "IL2057", Justification = "Type should be preserved by the MarkJavaObjects trimmer step.")] - static Type? TypeGetType (string name) => - Type.GetType (name, throwOnError: false); - - __TypeRegistrations.RegisterPackages (); - - Type? type = null; - int ls = class_name.LastIndexOf ('/'); - var package = ls >= 0 ? class_name.Substring (0, ls) : ""; - if (packageLookup!.TryGetValue (package, out var mappers)) { - foreach (Converter c in mappers) { - type = c (class_name); - if (type == null) - continue; - return type; - } - } - if ((type = TypeGetType (JavaNativeTypeManager.ToCliType (class_name))) != null) { - return type; - } return null; } diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets index da2afb66828..7e95621a2d2 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.DefaultProperties.targets @@ -124,7 +124,6 @@ true - false false diff --git a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets index 3fb47bbc7b8..1cd67019059 100644 --- a/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets +++ b/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.ILLink.targets @@ -26,11 +26,6 @@ This file contains the .NET 5-specific targets to customize ILLink <_ProguardProjectConfiguration Condition=" '$(AndroidLinkTool)' != '' ">$(IntermediateOutputPath)proguard\proguard_project_references.cfg - -