From 8e41bddd7f34e694e9090dfb58926ad8ee5fc884 Mon Sep 17 00:00:00 2001 From: Marek Habersack Date: Thu, 31 Oct 2024 09:10:59 +0100 Subject: [PATCH] Address feedback --- .../Mono.Android/ApplicationAttribute.Partial.cs | 6 ------ .../Mono.Android/InstrumentationAttribute.Partial.cs | 6 ------ .../Mono.Android/PermissionAttribute.Partial.cs | 6 ------ .../Mono.Android/PermissionGroupAttribute.Partial.cs | 6 ------ .../Mono.Android/PermissionTreeAttribute.Partial.cs | 6 ------ .../Mono.Android/SupportsGLTextureAttribute.Partial.cs | 6 ------ .../Mono.Android/UsesFeatureAttribute.Partial.cs | 6 ------ .../Mono.Android/UsesPermissionAttribute.Partial.cs | 6 ------ 8 files changed, 48 deletions(-) diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/ApplicationAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/ApplicationAttribute.Partial.cs index b72c2ce4d9d..4507424b7a5 100644 --- a/src/Xamarin.Android.Build.Tasks/Mono.Android/ApplicationAttribute.Partial.cs +++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/ApplicationAttribute.Partial.cs @@ -57,12 +57,6 @@ static partial void AddManualMapping () public static ApplicationAttribute FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache) { - // `provider` might be null in situations when application configuration is broken, and it surfaces in a number of - // tests which check these situations. - if (provider == null) { - return null; - } - CustomAttribute attr = provider.GetCustomAttributes ("Android.App.ApplicationAttribute") .SingleOrDefault (); if (attr == null) diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/InstrumentationAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/InstrumentationAttribute.Partial.cs index 0facaf53e23..ae3cc8d31b9 100644 --- a/src/Xamarin.Android.Build.Tasks/Mono.Android/InstrumentationAttribute.Partial.cs +++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/InstrumentationAttribute.Partial.cs @@ -16,12 +16,6 @@ partial class InstrumentationAttribute { public static IEnumerable FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache) { - // `provider` might be null in situations when application configuration is broken, and it surfaces in a number of - // tests which check these situations. - if (provider == null) { - yield break; - } - foreach (CustomAttribute attr in provider.GetCustomAttributes ("Android.App.InstrumentationAttribute")) { InstrumentationAttribute self = new InstrumentationAttribute (); self.specified = mapping.Load (self, attr, cache); diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionAttribute.Partial.cs index ebabfbc9562..1ca8b28ae39 100644 --- a/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionAttribute.Partial.cs +++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionAttribute.Partial.cs @@ -21,12 +21,6 @@ partial class PermissionAttribute { public static IEnumerable FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache) { - // `provider` might be null in situations when application configuration is broken, and it surfaces in a number of - // tests which check these situations. - if (provider == null) { - yield break; - } - var attrs = provider.GetCustomAttributes ("Android.App.PermissionAttribute"); foreach (var attr in attrs) { PermissionAttribute self = new PermissionAttribute (); diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionGroupAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionGroupAttribute.Partial.cs index 99cedace7d6..a1e00e4b68e 100644 --- a/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionGroupAttribute.Partial.cs +++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionGroupAttribute.Partial.cs @@ -21,12 +21,6 @@ partial class PermissionGroupAttribute { public static IEnumerable FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache) { - // `provider` might be null in situations when application configuration is broken, and it surfaces in a number of - // tests which check these situations. - if (provider == null) { - yield break; - } - var attrs = provider.GetCustomAttributes ("Android.App.PermissionGroupAttribute"); foreach (var attr in attrs) { PermissionGroupAttribute self = new PermissionGroupAttribute (); diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionTreeAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionTreeAttribute.Partial.cs index 79ca7af4999..0d388e440d3 100644 --- a/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionTreeAttribute.Partial.cs +++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionTreeAttribute.Partial.cs @@ -21,12 +21,6 @@ partial class PermissionTreeAttribute { public static IEnumerable FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache) { - // `provider` might be null in situations when application configuration is broken, and it surfaces in a number of - // tests which check these situations. - if (provider == null) { - yield break; - } - var attrs = provider.GetCustomAttributes ("Android.App.PermissionTreeAttribute"); foreach (var attr in attrs) { PermissionTreeAttribute self = new PermissionTreeAttribute (); diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/SupportsGLTextureAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/SupportsGLTextureAttribute.Partial.cs index 45f4df2e91e..41d970eb8cb 100644 --- a/src/Xamarin.Android.Build.Tasks/Mono.Android/SupportsGLTextureAttribute.Partial.cs +++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/SupportsGLTextureAttribute.Partial.cs @@ -29,12 +29,6 @@ internal XElement ToElement (string packageName, TypeDefinitionCache cache) public static IEnumerable FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache) { - // `provider` might be null in situations when application configuration is broken, and it surfaces in a number of - // tests which check these situations. - if (provider == null) { - yield break; - } - var attrs = provider.GetCustomAttributes ("Android.App.SupportsGLTextureAttribute"); foreach (var attr in attrs) { if (attr.HasConstructorArguments && attr.ConstructorArguments.Count == 1) { diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/UsesFeatureAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/UsesFeatureAttribute.Partial.cs index d4d832d34f8..58fc679741a 100644 --- a/src/Xamarin.Android.Build.Tasks/Mono.Android/UsesFeatureAttribute.Partial.cs +++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/UsesFeatureAttribute.Partial.cs @@ -35,12 +35,6 @@ internal XElement ToElement (string packageName, TypeDefinitionCache cache) public static IEnumerable FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache) { - // `provider` might be null in situations when application configuration is broken, and it surfaces in a number of - // tests which check these situations. - if (provider == null) { - yield break; - } - var attrs = provider.GetCustomAttributes ("Android.App.UsesFeatureAttribute"); foreach (var attr in attrs) { diff --git a/src/Xamarin.Android.Build.Tasks/Mono.Android/UsesPermissionAttribute.Partial.cs b/src/Xamarin.Android.Build.Tasks/Mono.Android/UsesPermissionAttribute.Partial.cs index 2a850fe120e..5ecad9d4fdd 100644 --- a/src/Xamarin.Android.Build.Tasks/Mono.Android/UsesPermissionAttribute.Partial.cs +++ b/src/Xamarin.Android.Build.Tasks/Mono.Android/UsesPermissionAttribute.Partial.cs @@ -16,12 +16,6 @@ partial class UsesPermissionAttribute { public static IEnumerable FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache) { - // `provider` might be null in situations when application configuration is broken, and it surfaces in a number of - // tests which check these situations. - if (provider == null) { - yield break; - } - var attrs = provider.GetCustomAttributes ("Android.App.UsesPermissionAttribute"); foreach (var attr in attrs) { UsesPermissionAttribute self;