Skip to content

Commit 4106f7e

Browse files
Remove whitespace-only diff noise
Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com>
1 parent 4c2268c commit 4106f7e

7 files changed

Lines changed: 99 additions & 98 deletions

File tree

src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/JavaPeerScanner.cs

Lines changed: 37 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -46,20 +46,20 @@ bool TryResolveType (string typeName, string assemblyName, out TypeDefinitionHan
4646

4747
var scope = typeRef.ResolutionScope;
4848
switch (scope.Kind) {
49-
case HandleKind.AssemblyReference: {
50-
var asmRef = index.Reader.GetAssemblyReference ((AssemblyReferenceHandle) scope);
51-
var fullName = MetadataTypeNameResolver.JoinNamespaceAndName (ns, name);
52-
return (fullName, index.Reader.GetString (asmRef.Name));
53-
}
54-
case HandleKind.TypeReference: {
55-
// Nested type: recurse to get the declaring type's full name and assembly
56-
var (parentFullName, assemblyName) = ResolveTypeReference ((TypeReferenceHandle) scope, index);
57-
return (MetadataTypeNameResolver.JoinNestedTypeName (parentFullName, name), assemblyName);
58-
}
59-
default: {
60-
var fullName = MetadataTypeNameResolver.JoinNamespaceAndName (ns, name);
61-
return (fullName, index.AssemblyName);
62-
}
49+
case HandleKind.AssemblyReference: {
50+
var asmRef = index.Reader.GetAssemblyReference ((AssemblyReferenceHandle)scope);
51+
var fullName = MetadataTypeNameResolver.JoinNamespaceAndName (ns, name);
52+
return (fullName, index.Reader.GetString (asmRef.Name));
53+
}
54+
case HandleKind.TypeReference: {
55+
// Nested type: recurse to get the declaring type's full name and assembly
56+
var (parentFullName, assemblyName) = ResolveTypeReference ((TypeReferenceHandle)scope, index);
57+
return (MetadataTypeNameResolver.JoinNestedTypeName (parentFullName, name), assemblyName);
58+
}
59+
default: {
60+
var fullName = MetadataTypeNameResolver.JoinNamespaceAndName (ns, name);
61+
return (fullName, index.AssemblyName);
62+
}
6363
}
6464
}
6565

@@ -987,7 +987,7 @@ bool TryGetMethodRegisterInfo (MethodDefinition methodDef, AssemblyIndex index,
987987
// Single arg = JNI signature; name is always ".ctor", connector is empty.
988988
if (attrName == "JniConstructorSignatureAttribute") {
989989
var value = index.DecodeAttribute (ca);
990-
var jniSignature = value.FixedArguments.Length > 0 ? (string?) value.FixedArguments [0].Value : null;
990+
var jniSignature = value.FixedArguments.Length > 0 ? (string?)value.FixedArguments [0].Value : null;
991991
if (jniSignature is not null) {
992992
registerInfo = new RegisterInfo { JniName = ".ctor", Signature = jniSignature, Connector = "", DoNotGenerateAcw = false };
993993
return true;
@@ -1018,7 +1018,7 @@ bool TryGetMethodRegisterInfo (MethodDefinition methodDef, AssemblyIndex index,
10181018
// [Export("name")] or [Export] (uses method name)
10191019
string? exportName = null;
10201020
if (value.FixedArguments.Length > 0) {
1021-
exportName = (string?) value.FixedArguments [0].Value;
1021+
exportName = (string?)value.FixedArguments [0].Value;
10221022
}
10231023

10241024
List<string>? thrownNames = null;
@@ -1315,15 +1315,15 @@ string ManagedTypeToJniDescriptor (TypeRefData managedType, ExportParameterKindI
13151315
var row = codedToken >> 2;
13161316

13171317
switch (tag) {
1318-
case 0: { // TypeDef
1319-
var handle = MetadataTokens.TypeDefinitionHandle (row);
1320-
var baseDef = index.Reader.GetTypeDefinition (handle);
1321-
return (MetadataTypeNameResolver.GetFullName (baseDef, index.Reader), index.AssemblyName);
1322-
}
1323-
case 1: // TypeRef
1324-
return ResolveTypeReference (MetadataTokens.TypeReferenceHandle (row), index);
1325-
default:
1326-
return null;
1318+
case 0: { // TypeDef
1319+
var handle = MetadataTokens.TypeDefinitionHandle (row);
1320+
var baseDef = index.Reader.GetTypeDefinition (handle);
1321+
return (MetadataTypeNameResolver.GetFullName (baseDef, index.Reader), index.AssemblyName);
1322+
}
1323+
case 1: // TypeRef
1324+
return ResolveTypeReference (MetadataTokens.TypeReferenceHandle (row), index);
1325+
default:
1326+
return null;
13271327
}
13281328
}
13291329

@@ -1334,16 +1334,16 @@ string ManagedTypeToJniDescriptor (TypeRefData managedType, ExportParameterKindI
13341334
(string typeName, string assemblyName)? ResolveEntityHandle (EntityHandle handle, AssemblyIndex index)
13351335
{
13361336
switch (handle.Kind) {
1337-
case HandleKind.TypeDefinition: {
1338-
var td = index.Reader.GetTypeDefinition ((TypeDefinitionHandle) handle);
1339-
return (MetadataTypeNameResolver.GetFullName (td, index.Reader), index.AssemblyName);
1340-
}
1341-
case HandleKind.TypeReference:
1342-
return ResolveTypeReference ((TypeReferenceHandle) handle, index);
1343-
case HandleKind.TypeSpecification:
1344-
return ResolveTypeSpecification ((TypeSpecificationHandle) handle, index);
1345-
default:
1346-
return null;
1337+
case HandleKind.TypeDefinition: {
1338+
var td = index.Reader.GetTypeDefinition ((TypeDefinitionHandle)handle);
1339+
return (MetadataTypeNameResolver.GetFullName (td, index.Reader), index.AssemblyName);
1340+
}
1341+
case HandleKind.TypeReference:
1342+
return ResolveTypeReference ((TypeReferenceHandle)handle, index);
1343+
case HandleKind.TypeSpecification:
1344+
return ResolveTypeSpecification ((TypeSpecificationHandle)handle, index);
1345+
default:
1346+
return null;
13471347
}
13481348
}
13491349

@@ -1635,7 +1635,7 @@ void CollectExportField (MethodDefinition methodDef, AssemblyIndex index, List<J
16351635
continue;
16361636
}
16371637

1638-
var fieldName = (string?) value.FixedArguments [0].Value;
1638+
var fieldName = (string?)value.FixedArguments [0].Value;
16391639
if (fieldName is null) {
16401640
continue;
16411641
}
@@ -1671,7 +1671,7 @@ void CollectExportField (MethodDefinition methodDef, AssemblyIndex index, List<J
16711671
"ContentProviderAttribute" => ComponentKind.ContentProvider,
16721672
"ApplicationAttribute" => ComponentKind.Application,
16731673
"InstrumentationAttribute" => ComponentKind.Instrumentation,
1674-
_ => (ComponentKind?) null,
1674+
_ => (ComponentKind?)null,
16751675
};
16761676

16771677
if (kind is null) {

src/Microsoft.Android.Sdk.TrimmableTypeMap/Scanner/MetadataTypeNameResolver.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ public static string GetTypeFromReference (MetadataReader reader, TypeReferenceH
4848
var typeRef = reader.GetTypeReference (handle);
4949
var name = reader.GetString (typeRef.Name);
5050
if (typeRef.ResolutionScope.Kind == HandleKind.TypeReference) {
51-
var parent = GetTypeFromReference (reader, (TypeReferenceHandle) typeRef.ResolutionScope, rawTypeKind);
51+
var parent = GetTypeFromReference (reader, (TypeReferenceHandle)typeRef.ResolutionScope, rawTypeKind);
5252
return JoinNestedTypeName (parent, name);
5353
}
5454
var ns = reader.GetString (typeRef.Namespace);
@@ -71,9 +71,9 @@ static string GetAssemblyNameFromResolutionScope (MetadataReader reader, EntityH
7171
{
7272
switch (scope.Kind) {
7373
case HandleKind.AssemblyReference:
74-
return reader.GetString (reader.GetAssemblyReference ((AssemblyReferenceHandle) scope).Name);
74+
return reader.GetString (reader.GetAssemblyReference ((AssemblyReferenceHandle)scope).Name);
7575
case HandleKind.TypeReference:
76-
return GetAssemblyNameFromResolutionScope (reader, reader.GetTypeReference ((TypeReferenceHandle) scope).ResolutionScope, fallbackAssemblyName);
76+
return GetAssemblyNameFromResolutionScope (reader, reader.GetTypeReference ((TypeReferenceHandle)scope).ResolutionScope, fallbackAssemblyName);
7777
default:
7878
return fallbackAssemblyName;
7979
}

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

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,15 @@
77
using System.Reflection.Metadata.Ecma335;
88
using System.Reflection.PortableExecutable;
99
using System.Text;
10+
using Microsoft.Build.Framework;
11+
1012
using Java.Interop.Tools.TypeNameMappings;
1113
using Microsoft.Android.Build.Tasks;
12-
using Microsoft.Build.Framework;
1314
using Xamarin.Android.Tools;
1415

1516
namespace Xamarin.Android.Tasks
1617
{
17-
using PackageNamingPolicyEnum = PackageNamingPolicy;
18+
using PackageNamingPolicyEnum = PackageNamingPolicy;
1819

1920
/// <summary>
2021
/// Creates the native assembly containing the application config.
@@ -24,15 +25,15 @@ public class GenerateNativeApplicationConfigSources : AndroidTask
2425
public override string TaskPrefix => "GCA";
2526

2627
[Required]
27-
public ITaskItem [] ResolvedAssemblies { get; set; } = [];
28+
public ITaskItem[] ResolvedAssemblies { get; set; } = [];
2829

29-
public ITaskItem []? NativeLibraries { get; set; }
30-
public ITaskItem []? NativeLibrariesNoJniPreload { get; set; }
31-
public ITaskItem []? NativeLibrariesAlwaysJniPreload { get; set; }
30+
public ITaskItem[]? NativeLibraries { get; set; }
31+
public ITaskItem[]? NativeLibrariesNoJniPreload { get; set; }
32+
public ITaskItem[]? NativeLibrariesAlwaysJniPreload { get; set; }
3233

33-
public ITaskItem []? MonoComponents { get; set; }
34+
public ITaskItem[]? MonoComponents { get; set; }
3435

35-
public ITaskItem []? SatelliteAssemblies { get; set; }
36+
public ITaskItem[]? SatelliteAssemblies { get; set; }
3637

3738
public bool UseAssemblyStore { get; set; }
3839

@@ -62,7 +63,7 @@ public class GenerateNativeApplicationConfigSources : AndroidTask
6263

6364
public string? PackageNamingPolicy { get; set; }
6465
public string? Debug { get; set; }
65-
public ITaskItem []? Environments { get; set; }
66+
public ITaskItem[]? Environments { get; set; }
6667
public string? AndroidAotMode { get; set; }
6768
public bool AndroidAotEnableLazyLoad { get; set; }
6869
public bool EnableLLVM { get; set; }
@@ -293,7 +294,7 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
293294
HaveRuntimeConfigBlob = haveRuntimeConfigBlob,
294295
NumberOfAssembliesInApk = assemblyCount,
295296
BundledAssemblyNameWidth = assemblyNameWidth,
296-
MonoComponents = (MonoComponent) monoComponents,
297+
MonoComponents = (MonoComponent)monoComponents,
297298
NativeLibraries = uniqueNativeLibraries,
298299
NativeLibrariesNoJniPreload = NativeLibrariesNoJniPreload,
299300
NativeLibrariesAlwaysJniPreload = NativeLibrariesAlwaysJniPreload,
@@ -313,7 +314,7 @@ static bool ShouldSkipAssembly (ITaskItem assembly)
313314
foreach (string abi in SupportedAbis) {
314315
string targetAbi = abi.ToLowerInvariant ();
315316
string environmentBaseAsmFilePath = Path.Combine (EnvironmentOutputDirectory, $"environment.{targetAbi}");
316-
string environmentLlFilePath = $"{environmentBaseAsmFilePath}.ll";
317+
string environmentLlFilePath = $"{environmentBaseAsmFilePath}.ll";
317318
AndroidTargetArch targetArch = GetAndroidTargetArchForAbi (abi);
318319

319320
using var appConfigWriter = MemoryStreamPool.Shared.CreateStreamWriter ();

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/PackagingTest.cs

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
using System;
2-
using System.Collections.Generic;
32
using System.IO;
3+
using NUnit.Framework;
4+
using Xamarin.ProjectTools;
45
using System.Linq;
56
using System.Text;
7+
using System.Collections.Generic;
68
using System.Xml.Linq;
7-
using Microsoft.Build.Framework;
8-
using NUnit.Framework;
9+
using Xamarin.Tools.Zip;
910
using Xamarin.Android.Tasks;
1011
using Xamarin.Android.Tools;
11-
using Xamarin.ProjectTools;
12-
using Xamarin.Tools.Zip;
12+
using Microsoft.Build.Framework;
1313

1414
namespace Xamarin.Android.Build.Tests
1515
{
@@ -106,7 +106,7 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto
106106
IsRelease = true
107107
};
108108

109-
AndroidTargetArch [] supportedArches = new [] {
109+
AndroidTargetArch[] supportedArches = new[] {
110110
runtime switch {
111111
AndroidRuntime.MonoVM => AndroidTargetArch.Arm,
112112
AndroidRuntime.CoreCLR => AndroidTargetArch.Arm64,
@@ -172,9 +172,9 @@ public void CheckIncludedAssemblies ([Values (false, true)] bool usesAssemblySto
172172
}
173173
}
174174

175-
static IEnumerable<object []> Get_CheckProjectWithSpaceInNameWorks_Data ()
175+
static IEnumerable<object[]> Get_CheckProjectWithSpaceInNameWorks_Data ()
176176
{
177-
var ret = new List<object []> ();
177+
var ret = new List<object[]> ();
178178

179179
foreach (AndroidRuntime runtime in Enum.GetValues (typeof (AndroidRuntime))) {
180180
AddTestData ("Test Me", runtime);
@@ -191,7 +191,7 @@ static IEnumerable<object []> Get_CheckProjectWithSpaceInNameWorks_Data ()
191191

192192
void AddTestData (string projectName, AndroidRuntime runtime)
193193
{
194-
ret.Add (new object [] {
194+
ret.Add (new object[] {
195195
projectName,
196196
runtime,
197197
});
@@ -251,7 +251,7 @@ public void CheckIncludedNativeLibraries ([Values] bool compressNativeLibraries,
251251
IsRelease = isRelease,
252252
};
253253
proj.SetRuntime (runtime);
254-
proj.PackageReferences.Add (KnownPackages.SQLitePCLRaw_Core);
254+
proj.PackageReferences.Add(KnownPackages.SQLitePCLRaw_Core);
255255
proj.SetAndroidSupportedAbis ("x86_64");
256256
proj.SetProperty (proj.ReleaseProperties, "AndroidStoreUncompressedFileExtensions", compressNativeLibraries ? "" : "so");
257257
using (var b = CreateApkBuilder ()) {
@@ -261,8 +261,8 @@ public void CheckIncludedNativeLibraries ([Values] bool compressNativeLibraries,
261261
proj.OutputPath, $"{proj.PackageName}-Signed.apk");
262262
CompressionMethod method = compressNativeLibraries ? CompressionMethod.Deflate : CompressionMethod.Store;
263263
using (var zip = ZipHelper.OpenZip (apk)) {
264-
var libFiles = zip.Where (x => x.FullName.StartsWith ("lib/", StringComparison.Ordinal) && !x.FullName.Equals ("lib/", StringComparison.InvariantCultureIgnoreCase));
265-
var abiPaths = new string [] { "lib/x86_64/" };
264+
var libFiles = zip.Where (x => x.FullName.StartsWith("lib/", StringComparison.Ordinal) && !x.FullName.Equals("lib/", StringComparison.InvariantCultureIgnoreCase));
265+
var abiPaths = new string[] { "lib/x86_64/" };
266266
foreach (var file in libFiles) {
267267
Assert.IsTrue (abiPaths.Any (x => file.FullName.Contains (x)), $"Apk contains an unnesscary lib file: {file.FullName}");
268268
Assert.IsTrue (file.CompressionMethod == method, $"{file.FullName} should have been CompressionMethod.{method} in the apk, but was CompressionMethod.{file.CompressionMethod}");
@@ -519,7 +519,7 @@ public void CheckSignApk ([Values] bool useApkSigner, [Values] bool perAbiApk, [
519519
return;
520520
}
521521
string ext = Environment.OSVersion.Platform != PlatformID.Unix ? ".bat" : "";
522-
var foundApkSigner = Directory.EnumerateDirectories (Path.Combine (AndroidSdkPath, "build-tools")).Any (dir => Directory.EnumerateFiles (dir, "apksigner" + ext).Any ());
522+
var foundApkSigner = Directory.EnumerateDirectories (Path.Combine (AndroidSdkPath, "build-tools")).Any (dir => Directory.EnumerateFiles (dir, "apksigner"+ ext).Any ());
523523
if (useApkSigner && !foundApkSigner) {
524524
Assert.Ignore ("Skipping test. Required build-tools verison which contains apksigner is not installed.");
525525
}
@@ -536,10 +536,10 @@ public void CheckSignApk ([Values] bool useApkSigner, [Values] bool perAbiApk, [
536536
StorePass = pass,
537537
KeyAlias = alias,
538538
KeyPass = pass,
539-
KeyAlgorithm = "RSA",
540-
Validity = 30,
541-
StoreType = "pkcs12",
542-
Command = "-genkeypair",
539+
KeyAlgorithm="RSA",
540+
Validity=30,
541+
StoreType="pkcs12",
542+
Command="-genkeypair",
543543
ToolPath = keyToolPath,
544544
};
545545
Assert.IsTrue (task.Execute (), "Task should have succeeded.");
@@ -685,7 +685,7 @@ public void MissingSatelliteAssemblyInLibrary ([Values] AndroidRuntime runtime)
685685
};
686686
lib.SetRuntime (runtime);
687687

688-
var languages = new string [] { "es", "de", "fr", "he", "it", "pl", "pt", "ru", "sl" };
688+
var languages = new string[] {"es", "de", "fr", "he", "it", "pl", "pt", "ru", "sl" };
689689
foreach (string lang in languages) {
690690
lib.OtherBuildItems.Add (
691691
new BuildItem ("EmbeddedResource", $"Foo.{lang}.resx") {
@@ -990,9 +990,9 @@ public void CheckIncludedFilesArePresent ([Values] AndroidRuntime runtime)
990990
}
991991
}
992992

993-
static IEnumerable<object []> Get_BuildApkWithZipFlushLimits_Data ()
993+
static IEnumerable<object[]> Get_BuildApkWithZipFlushLimits_Data ()
994994
{
995-
var ret = new List<object []> ();
995+
var ret = new List<object[]> ();
996996

997997
foreach (AndroidRuntime runtime in Enum.GetValues (typeof (AndroidRuntime))) {
998998
AddTestData (1, -1, runtime);
@@ -1012,7 +1012,7 @@ static IEnumerable<object []> Get_BuildApkWithZipFlushLimits_Data ()
10121012

10131013
void AddTestData (int filesLimit, int sizeLimit, AndroidRuntime runtime)
10141014
{
1015-
ret.Add (new object [] {
1015+
ret.Add (new object[] {
10161016
filesLimit,
10171017
sizeLimit,
10181018
runtime,

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/Tasks/GeneratePackageManagerJavaTests.cs

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
#nullable disable
22

3+
using NUnit.Framework;
34
using System;
45
using System.Collections.Generic;
56
using System.IO;
67
using System.Linq;
78
using System.Text;
8-
using Microsoft.Android.Build.Tasks;
99
using Microsoft.Build.Framework;
1010
using Microsoft.Build.Utilities;
11-
using NUnit.Framework;
11+
using Microsoft.Android.Build.Tasks;
1212
using Xamarin.Android.Tasks;
1313
using Xamarin.ProjectTools;
1414

@@ -47,7 +47,7 @@ public class GeneratePackageManagerJavaTests : BaseTest
4747
#pragma warning restore 414
4848
[Test]
4949
[TestCaseSource (nameof (CheckPackageManagerAssemblyOrderChecks))]
50-
public void CheckPackageManagerAssemblyOrder (string [] resolvedUserAssemblies, string [] resolvedAssemblies)
50+
public void CheckPackageManagerAssemblyOrder (string[] resolvedUserAssemblies, string[] resolvedAssemblies)
5151
{
5252
// avoid a PathTooLongException because using the TestName will include ALL the arguments.
5353
var testHash = Files.HashString (string.Join ("", resolvedUserAssemblies) + string.Join ("", resolvedAssemblies));
@@ -82,7 +82,7 @@ public void CheckPackageManagerAssemblyOrder (string [] resolvedUserAssemblies,
8282
BuildEngine = new MockBuildEngine (TestContext.Out),
8383
ResolvedAssemblies = resolvedAssembliesList.ToArray (),
8484
EnvironmentOutputDirectory = Path.Combine (path, "env"),
85-
SupportedAbis = new string [] { "x86", "arm64-v8a" },
85+
SupportedAbis = new string [] { "x86" , "arm64-v8a" },
8686
AndroidPackageName = "com.microsoft.net6.helloandroid",
8787
EnablePreloadAssembliesDefault = false,
8888
Environments = new ITaskItem [] { new TaskItem (Path.Combine (path, "myenv.txt")) },
@@ -91,7 +91,7 @@ public void CheckPackageManagerAssemblyOrder (string [] resolvedUserAssemblies,
9191
Assert.IsTrue (packageManagerTask.Execute (), "GeneratePackageManagerJava task should have executed.");
9292
Assert.IsTrue (configTask.Execute (), "GenerateNativeApplicationConfigSources task should have executed.");
9393

94-
AssertFileContentsMatch (Path.Combine (XABuildPaths.TestAssemblyOutputDirectory, "Expected", "CheckPackageManagerAssemblyOrder.java"), Path.Combine (path, "src", "mono", "MonoPackageManager_Resources.java"));
94+
AssertFileContentsMatch (Path.Combine (XABuildPaths.TestAssemblyOutputDirectory, "Expected", "CheckPackageManagerAssemblyOrder.java"), Path.Combine(path, "src", "mono", "MonoPackageManager_Resources.java"));
9595
var txt = File.ReadAllText (Path.Combine (path, "env", "environment.arm64-v8a.ll"));
9696
StringAssert.Contains ("YYYY", txt, "environment.arm64-v8a.ll should contain 'YYYY'");
9797
txt = File.ReadAllText (Path.Combine (path, "env", "environment.x86.ll"));

tests/Microsoft.Android.Sdk.TrimmableTypeMap.Tests/Generator/TypeMapAssemblyGeneratorTests.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ public void Generate_JiStyleCtor_EmitsDeleteRefCall ()
425425
"JI-style activation must emit a DeleteRef member reference for JNI handle cleanup");
426426

427427
// Verify it's on the JNIEnv type
428-
var parentTypeRef = reader.GetTypeReference ((TypeReferenceHandle) deleteRefRef.Parent);
428+
var parentTypeRef = reader.GetTypeReference ((TypeReferenceHandle)deleteRefRef.Parent);
429429
Assert.Equal ("JNIEnv", reader.GetString (parentTypeRef.Name));
430430
Assert.Equal ("Android.Runtime", reader.GetString (parentTypeRef.Namespace));
431431
}

0 commit comments

Comments
 (0)