Skip to content

Commit 9aec552

Browse files
committed
Cleanup
1 parent 5822876 commit 9aec552

File tree

7 files changed

+11
-10
lines changed

7 files changed

+11
-10
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
@@ -13,7 +13,7 @@
1313
namespace Android.App {
1414

1515
partial class InstrumentationAttribute {
16-
16+
1717
ICollection<string> specified;
1818

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

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

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

1818
partial class PermissionAttribute {
19-
19+
2020
ICollection<string> specified;
2121

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

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

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

1818
partial class PermissionGroupAttribute {
19-
19+
2020
ICollection<string> specified;
2121

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

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

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

1818
partial class PermissionTreeAttribute {
19-
19+
2020
ICollection<string> specified;
2121

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

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,9 +43,10 @@ public static IEnumerable<SupportsGLTextureAttribute> FromCustomAttributeProvide
4343
SupportsGLTextureAttribute self = new SupportsGLTextureAttribute((string)attr.ConstructorArguments[0].Value);
4444
self.specified = mapping.Load (self, attr, cache);
4545
self.specified.Add("Name");
46-
yield return self;
46+
yield return self;
4747
}
4848
}
4949
}
5050
}
5151
}
52+

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static IEnumerable<UsesFeatureAttribute> FromCustomAttributeProvider (ICu
4848

4949
UsesFeatureAttribute self = new UsesFeatureAttribute ();
5050

51-
if (attr.HasProperties) {
51+
if (attr.HasProperties) {
5252
// handle the case where the user sets additional properties
5353
self.specified = mapping.Load (self, attr, cache);
5454
if (self.specified.Contains("GLESVersion") && self.GLESVersion==0) {
@@ -72,3 +72,4 @@ public static IEnumerable<UsesFeatureAttribute> FromCustomAttributeProvider (ICu
7272
}
7373
}
7474
}
75+

tests/MSBuildDeviceIntegration/Tests/InstallTests.cs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -201,7 +201,6 @@ public void InstallWithoutSharedRuntime ()
201201
//Assert.AreEqual (0, RunAdbCommand ("shell pm list packages Mono.Android.DebugRuntime").Trim ().Length,
202202
// "The Shared Runtime should not have been installed.");
203203
var directorylist = GetContentFromAllOverrideDirectories (proj.PackageName, DeviceAbi);
204-
Console.WriteLine ($"InstallWithoutSharedRuntime: directoryList == '{directorylist}'");
205204
StringAssert.Contains ($"{proj.ProjectName}.dll", directorylist, $"{proj.ProjectName}.dll should exist in the .__override__/{DeviceAbi} directory.");
206205
StringAssert.Contains ($"System.Private.CoreLib.dll", directorylist, $"System.Private.CoreLib.dll should exist in the .__override__/{DeviceAbi} directory.");
207206
StringAssert.Contains ($"Mono.Android.dll", directorylist, $"Mono.Android.dll should exist in the .__override__/{DeviceAbi} directory.");
@@ -547,7 +546,7 @@ public void IncrementalFastDeployment (string packageFormat)
547546
}
548547

549548
long lib1FirstBuildSize = new FileInfo (Path.Combine (rootPath, lib1.ProjectName, lib1.OutputPath, "Library1.dll")).Length;
550-
549+
551550
using (var builder = CreateApkBuilder (Path.Combine (rootPath, app.ProjectName))) {
552551
builder.Verbosity = LoggerVerbosity.Detailed;
553552
builder.ThrowOnBuildFailure = false;
@@ -654,7 +653,7 @@ public void AppWithAndroidJavaSource ()
654653
public class TestJavaClass2 {
655654
656655
public String test(){
657-
656+
658657
return ""Java is called"";
659658
}
660659
}",
@@ -672,7 +671,7 @@ public String test(){
672671
public class TestJavaClass {
673672
674673
public String test(){
675-
674+
676675
return ""Java is called"";
677676
}
678677
}",

0 commit comments

Comments
 (0)