Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 0 additions & 5 deletions src/Mono.Android/Android.Runtime/AndroidEnvironment.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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!;

Expand Down
2 changes: 0 additions & 2 deletions src/Mono.Android/Android.Runtime/Logger.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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);
}
}

Expand Down
8 changes: 0 additions & 8 deletions src/Mono.Android/ILLink/ILLink.Substitutions.xml
Original file line number Diff line number Diff line change
@@ -1,13 +1,5 @@
<linker>
<assembly fullname="Mono.Android">
<type fullname="Android.Runtime.AndroidEnvironment" feature="Android.Runtime.AndroidEnvironment.VSAndroidDesignerIsEnabled" featurevalue="false">
<method signature="System.Boolean get_VSAndroidDesignerIsEnabled()" body="stub" value="false" />
</type>
<type fullname="Java.Interop.TypeManager" feature="Android.Runtime.AndroidEnvironment.VSAndroidDesignerIsEnabled" featurevalue="false">
<method signature="System.Type TypeRegistrationFallback(System.String)" body="stub" />
<method signature="System.Void RegisterPackage(System.String,System.Converter`2&lt;System.String,System.Type&gt;)" body="stub" />
<method signature="System.Void RegisterPackages(System.String[],System.Converter`2&lt;System.String,System.Type&gt;[])" body="stub" />
</type>
<type fullname="Xamarin.Android.Net.AndroidMessageHandler">
<method signature="System.Boolean get_NegotiateAuthenticationIsEnabled()" body="stub" feature="Xamarin.Android.Net.UseNegotiateAuthentication" featurevalue="false" value="false" />
<method signature="System.Boolean get_NegotiateAuthenticationIsEnabled()" body="stub" feature="Xamarin.Android.Net.UseNegotiateAuthentication" featurevalue="true" value="true" />
Expand Down
28 changes: 0 additions & 28 deletions src/Mono.Android/Java.Interop/TypeManager.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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<string, Type?> 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;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -124,7 +124,6 @@
<EnableTrimAnalyzer Condition="'$(EnableTrimAnalyzer)' == '' and '$(TrimMode)' == 'full'">true</EnableTrimAnalyzer>

<!-- XA feature switches defaults -->
<VSAndroidDesigner Condition="'$(VSAndroidDesigner)' == ''">false</VSAndroidDesigner>
<AndroidUseNegotiateAuthentication Condition="'$(AndroidUseNegotiateAuthentication)' == ''">false</AndroidUseNegotiateAuthentication>

<!-- profiler won't work without internet permission, we must thus force it -->
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,6 @@ This file contains the .NET 5-specific targets to customize ILLink
<_ProguardProjectConfiguration Condition=" '$(AndroidLinkTool)' != '' ">$(IntermediateOutputPath)proguard\proguard_project_references.cfg</_ProguardProjectConfiguration>
</PropertyGroup>
<ItemGroup>
<RuntimeHostConfigurationOption Include="Android.Runtime.AndroidEnvironment.VSAndroidDesignerIsEnabled"
Condition="'$(VSAndroidDesigner)' != ''"
Value="$(VSAndroidDesigner)"
Trim="true" />

<!--
Used for the <ILLink CustomData="@(_TrimmerCustomData)" /> value:
https://github.com/dotnet/sdk/blob/a5393731b5b7b225692fff121f747fbbc9e8b140/src/Tasks/Microsoft.NET.Build.Tasks/targets/Microsoft.NET.ILLink.targets#L147
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -512,26 +512,6 @@ void CheckAssembly (string assemblyPath, string projectDir)
}
}

[Test]
public void TypeRegistrationsFallback ([Values (true, false)] bool enabled)
{
var proj = new XamarinAndroidApplicationProject () { IsRelease = true };
if (enabled)
proj.SetProperty (proj.ActiveConfigurationProperties, "VSAndroidDesigner", "true");

using (var b = CreateApkBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
var assemblyFile = "Mono.Android.dll";
var assemblyPath = BuildTest.GetLinkedPath (b, true, assemblyFile);
using (var assembly = AssemblyDefinition.ReadAssembly (assemblyPath)) {
Assert.IsTrue (assembly != null);

var td = assembly.MainModule.GetType ("Java.Interop.__TypeRegistrations");
Assert.IsTrue ((td != null) == enabled);
}
}
}

[Test]
public void AndroidUseNegotiateAuthentication ([Values (true, false, null)] bool? useNegotiateAuthentication)
{
Expand Down