Skip to content

Commit e20f262

Browse files
committed
Fix after rebase
1 parent 1fc7f4b commit e20f262

20 files changed

+365
-720
lines changed

src/Xamarin.Android.Build.Tasks/Mono.Android/InstrumentationAttribute.Partial.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ namespace Android.App {
1414

1515
partial class InstrumentationAttribute {
1616

17-
ICollection<string> specified;
17+
ICollection<string>? specified;
1818

1919
public static IEnumerable<InstrumentationAttribute> FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache)
2020
{

src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionAttribute.Partial.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Android.App {
1717

1818
partial class PermissionAttribute {
1919

20-
ICollection<string> specified;
20+
ICollection<string>? specified;
2121

2222
public static IEnumerable<PermissionAttribute> FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache)
2323
{

src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionGroupAttribute.Partial.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Android.App {
1717

1818
partial class PermissionGroupAttribute {
1919

20-
ICollection<string> specified;
20+
ICollection<string>? specified;
2121

2222
public static IEnumerable<PermissionGroupAttribute> FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache)
2323
{

src/Xamarin.Android.Build.Tasks/Mono.Android/PermissionTreeAttribute.Partial.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace Android.App {
1717

1818
partial class PermissionTreeAttribute {
1919

20-
ICollection<string> specified;
20+
ICollection<string>? specified;
2121

2222
public static IEnumerable<PermissionTreeAttribute> FromCustomAttributeProvider (ICustomAttributeProvider provider, TypeDefinitionCache cache)
2323
{

src/Xamarin.Android.Build.Tasks/Tasks/CompileNativeAssembly.cs

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ public class CompileNativeAssembly : AsyncTask
1212
{
1313
public override string TaskPrefix => "CNA";
1414

15+
sealed class Config
16+
{
17+
public string? AssemblerPath;
18+
public string? AssemblerOptions;
19+
public string? InputSource;
20+
}
21+
1522
[Required]
1623
public ITaskItem[] Sources { get; set; } = [];
1724

0 commit comments

Comments
 (0)