Autoformat cecil-tests.csproj. (#16103)

All other changes should be blank space only.

Co-authored-by: GitHub Actions Autoformatter <[email protected]>

Author: rolfbjarne

.github/workflows/autoformat.yml

@@ -43,6 +43,7 @@ jobs:
         SRC_DIR=$(pwd)
         cd ..
         dotnet format "$SRC_DIR/tools/xibuild/xibuild.csproj"
+        dotnet format whitespace "$SRC_DIR/tests/cecil-tests/cecil-tests.csproj"
         # dotnet format "$SRC_DIR/[...]"
         # add more projects here...
         cd "$SRC_DIR"

tests/cecil-tests/AttributeTest.cs

@@ -91,25 +91,24 @@ public void DoubleAttributedElements (string assemblyPath)
 				return;
 			}
 
-			var doubleAttributed = new List<string>();
+			var doubleAttributed = new List<string> ();
 			foreach (var type in Helper.FilterTypes (assembly, a => HasAnyAvailabilityAttribute (a))) {
 				var platformCount = new Dictionary<string, int> ();
 				foreach (var attribute in type.CustomAttributes.Where (a => IsAvailabilityAttribute (a))) {
 					var kind = FindAvailabilityKind (attribute);
 					if (kind is not null) {
-						string key = $"{attribute.AttributeType.Name}-{kind}";						
+						string key = $"{attribute.AttributeType.Name}-{kind}";
 						if (platformCount.ContainsKey (key)) {
-							platformCount[key] += 1;
-						}
-						else {
-							platformCount[key] = 1;
+							platformCount [key] += 1;
+						} else {
+							platformCount [key] = 1;
 						}
 					}
 				}
 				foreach (var (kind, count) in platformCount) {
 					// AVFoundation.AVMetadataIdentifiers uses an old pattern of a parent
 					// class and many child classes with constants.
-					if (type.ToString() == "AVFoundation.AVMetadataIdentifiers") {
+					if (type.ToString () == "AVFoundation.AVMetadataIdentifiers") {
 						continue;
 					}
 					if (count != 1) {
@@ -133,13 +132,12 @@ void CheckAllPlatformsOnParent (ICustomAttributeProvider item, string fullName,
 
 			var myAvailability = GetAvailabilityAttributes (item);
 			if (!FirstContainsAllOfSecond (myAvailability, parentAvailability)) {
-					DebugPrint (fullName, parentAvailability, myAvailability);
-					found.Add (fullName);
+				DebugPrint (fullName, parentAvailability, myAvailability);
+				found.Add (fullName);
 			}
 		}
 
-		public class PlatformClaimInfo
-		{
+		public class PlatformClaimInfo {
 			public HashSet<string> MentionedPlatforms { get; set; } // Mentioned in both Supported and Unsupported contexts
 			public HashSet<string> ClaimedPlatforms { get; set; } // Mentioned only in Supported contexts
 
@@ -192,59 +190,58 @@ public void FindSupportedOnElementsThatDoNotExistInThatAssembly ()
 				foreach (var module in assembly.Modules) {
 					foreach (var type in module.Types) {
 						foreach (var member in GetAllTypeMembers (type)) {
-							var mentionedPlatforms = GetAvailabilityAttributes (member).ToList();
-							if (mentionedPlatforms.Any()) {
-								var claimedPlatforms = GetSupportedAvailabilityAttributes (member).ToList();
+							var mentionedPlatforms = GetAvailabilityAttributes (member).ToList ();
+							if (mentionedPlatforms.Any ()) {
+								var claimedPlatforms = GetSupportedAvailabilityAttributes (member).ToList ();
 								string key = GetMemberLookupKey (member);
 								if (!harvestedInfo.ContainsKey (key)) {
-									harvestedInfo[key] = new Dictionary<string, PlatformClaimInfo>();
+									harvestedInfo [key] = new Dictionary<string, PlatformClaimInfo> ();
 								}
 								var claimInfo = new PlatformClaimInfo (mentionedPlatforms, claimedPlatforms);
-								if (harvestedInfo[key].ContainsKey(currentPlatform)) {
-									harvestedInfo[key][currentPlatform].UnionWith (claimInfo);
-								}
-								else {
-									harvestedInfo[key][currentPlatform] = claimInfo;
+								if (harvestedInfo [key].ContainsKey (currentPlatform)) {
+									harvestedInfo [key] [currentPlatform].UnionWith (claimInfo);
+								} else {
+									harvestedInfo [key] [currentPlatform] = claimInfo;
 								}
 							}
 						}
 					}
 				}
 			}
-					
+
 			// Now walk every item found above and check two things:
-			var attributesWereCompiledOut = new List<string>();			
-			var doesNotExistWhereClaimed = new List<string>();
+			var attributesWereCompiledOut = new List<string> ();
+			var doesNotExistWhereClaimed = new List<string> ();
 			foreach (var (member, info) in harvestedInfo) {
 				// 1. All platforms match in count of mentioned (we did not conditionally compile out attributes)
-				int expectedPlatformCount = info.First().Value.MentionedPlatforms.Count();
-				if (info.Any (i => i.Value.MentionedPlatforms.Count() != expectedPlatformCount)) {
-						if (IgnoreElementsThatDoNotExistInThatAssembly (member)) {
-							continue;
-						}
-						string detailedPlatformBreakdown = string.Join ("\n", info.Select(x => ($"Assembly {x.Key} => {x.Value}")));
-						string errorMessage = $"{member} did not have the same number of SupportedOSPlatformAttribute in every assembly:\n{detailedPlatformBreakdown}";
-						attributesWereCompiledOut.Add (errorMessage);
+				int expectedPlatformCount = info.First ().Value.MentionedPlatforms.Count ();
+				if (info.Any (i => i.Value.MentionedPlatforms.Count () != expectedPlatformCount)) {
+					if (IgnoreElementsThatDoNotExistInThatAssembly (member)) {
+						continue;
+					}
+					string detailedPlatformBreakdown = string.Join ("\n", info.Select (x => ($"Assembly {x.Key} => {x.Value}")));
+					string errorMessage = $"{member} did not have the same number of SupportedOSPlatformAttribute in every assembly:\n{detailedPlatformBreakdown}";
+					attributesWereCompiledOut.Add (errorMessage);
 #if DEBUG
-						Console.Error.WriteLine (errorMessage);
+					Console.Error.WriteLine (errorMessage);
 #endif
 				}
 
 
 				// 2. For each supported attribute claim exist, that it exists on that platform
 				// Since we know each platform claims are now equal, just use the first one
-				var claimedPlatforms = info.First().Value.ClaimedPlatforms;
+				var claimedPlatforms = info.First ().Value.ClaimedPlatforms;
 				foreach (var platform in claimedPlatforms) {
 					if (!info.ContainsKey (platform)) {
 						if (IgnoreElementsThatDoNotExistInThatAssembly (member)) {
 							continue;
 						}
-						string detailedPlatformBreakdown = string.Join ("\n", info.Select(x => ($"Assembly {x.Key} => Declares ({string.Join (" ", x.Value)})")));
+						string detailedPlatformBreakdown = string.Join ("\n", info.Select (x => ($"Assembly {x.Key} => Declares ({string.Join (" ", x.Value)})")));
 						string errorMessage = $"{member} was not found on {platform} despite being declared supported there.";
 						doesNotExistWhereClaimed.Add (errorMessage);
 #if DEBUG
 						Console.Error.WriteLine (errorMessage);
-#endif		
+#endif
 					}
 				}
 			}
@@ -260,7 +257,7 @@ static bool IgnoreElementsThatDoNotExistInThatAssembly (string member)
 				return true;
 			}
 			// QuickLook is aliased with QuickLookUI on some platforms
-			if (member.StartsWith("QuickLook")) {
+			if (member.StartsWith ("QuickLook")) {
 				return true;
 			}
 			// These two types are defined with non-trivial define magic and one platform doesn't necessarily have
@@ -275,7 +272,7 @@ static bool IgnoreElementsThatDoNotExistInThatAssembly (string member)
 				return true;
 			}
 			// Generator Bug - Protocol inline with different attribute bug
-			if (member.StartsWith ("SceneKit.SCNLayer") || 
+			if (member.StartsWith ("SceneKit.SCNLayer") ||
 				member.StartsWith ("AVFoundation.AVAudioSession")) {
 				return true;
 			}
@@ -459,7 +456,7 @@ static string GetMemberLookupKey (IMemberDefinition member)
 			// Members of xkit and other places conditionally inline and include members in one of two namespaces
 			// based upon platform assembly. Cludge them to the same key, so we don't mistakenly think members are missing
 			// from some platforms
-			return $"{member.DeclaringType.FullName}.{member.Name}".Replace("AppKit", "Kit").Replace("UIKit", "Kit");
+			return $"{member.DeclaringType.FullName}.{member.Name}".Replace ("AppKit", "Kit").Replace ("UIKit", "Kit");
 		}
 
 		IEnumerable<IMemberDefinition> GetAllTypeMembers (TypeDefinition type)
@@ -525,7 +522,7 @@ void CheckCurrentPlatformIncludedIfAny (ICustomAttributeProvider item, string pl
 				if (!supportedAttributes.Any (a => FindAvailabilityKind (a) == platformName)) {
 #if DEBUG
 					Console.WriteLine (fullName);
-					Console.WriteLine (String.Join(" ", supportedAttributes.Select (x => FindAvailabilityKind(x))));
+					Console.WriteLine (String.Join (" ", supportedAttributes.Select (x => FindAvailabilityKind (x))));
 					Console.WriteLine (platformName);
 #endif
 					found.Add (fullName);
@@ -617,7 +614,7 @@ IEnumerable<string> GetAvailabilityAttributesCore (IEnumerable<CustomAttribute>
 
 		bool HasAnyAvailabilityAttribute (ICustomAttributeProvider provider) => provider.CustomAttributes.Any (a => IsAvailabilityAttribute (a));
 		bool HasAnySupportedAttribute (ICustomAttributeProvider provider) => provider.CustomAttributes.Any (a => IsSupportedAttribute (a));
-		
+
 		bool IsAvailabilityAttribute (CustomAttribute attribute) => IsSupportedAttribute (attribute) || attribute.AttributeType.Name == "UnsupportedOSPlatformAttribute";
 		bool IsSupportedAttribute (CustomAttribute attribute) => attribute.AttributeType.Name == "SupportedOSPlatformAttribute";
 	}

tests/cecil-tests/GenericPInvokes.cs

@@ -97,7 +97,7 @@ string ListOfFailingGenerics (IEnumerable<MethodAndResult> methodAndResults)
 		{
 			var list = new StringBuilder ();
 			foreach (var mar in methodAndResults) {
-				list.Append ("\n\"").Append (mar.Method.FullName).Append("\" : ");
+				list.Append ("\n\"").Append (mar.Method.FullName).Append ("\" : ");
 				switch (mar.Result) {
 				case GenericCheckResult.ContainsGenerics:
 					list.Append ("method contains a generic argument for the first arg of SetupBlockUnsafe. This is problematic in .NET 7 and above.");
@@ -151,7 +151,7 @@ IEnumerable<MethodDefinition> AllSetupBlocks (AssemblyDefinition assembly)
 				if (method.Body is null)
 					return false;
 				return method.Body.Instructions.Any (IsCallToSetupBlockUnsafe);
-				});
+			});
 		}
 
 		static bool IsCallToSetupBlockUnsafe (Instruction instr)
@@ -160,7 +160,8 @@ static bool IsCallToSetupBlockUnsafe (Instruction instr)
 				instr.Operand.ToString () == "System.Void ObjCRuntime.BlockLiteral::SetupBlockUnsafe(System.Delegate,System.Delegate)";
 		}
 
-		static bool IsCall (Instruction instr) {
+		static bool IsCall (Instruction instr)
+		{
 			return instr.OpCode == OpCodes.Call ||
 				instr.OpCode == OpCodes.Calli;
 		}
@@ -229,7 +230,7 @@ static bool IsBranch (Instruction instr)
 
 		static TypeReference GetLastArgType (MethodDefinition method, Instruction instr)
 		{
-			var paramDef = GetOperandType(method, instr);
+			var paramDef = GetOperandType (method, instr);
 			if (paramDef is null) {
 				throw new NotImplementedException ($"Last instruction before call to SetupBlockUnsafe ({instr.ToString ()}) was not a Ldfld, Ldarg or Ldloc - this is quite unexpected - something's changed in the code base!");
 			}

tests/cecil-tests/Helper.cs

@@ -198,7 +198,7 @@ public static IEnumerable TaskAssemblies {
 				if (Configuration.include_ios)
 					yield return CreateTestFixtureDataFromPath (Path.Combine (Configuration.SdkRootXI, "lib", "msbuild", "iOS", "Xamarin.iOS.Tasks.dll"));
 				if (Configuration.include_mac)
-					yield return CreateTestFixtureDataFromPath (Path.Combine (Configuration.SdkRootXM, "lib", "msbuild",  "Xamarin.Mac.Tasks.dll"));
+					yield return CreateTestFixtureDataFromPath (Path.Combine (Configuration.SdkRootXM, "lib", "msbuild", "Xamarin.Mac.Tasks.dll"));
 			}
 		}
 
@@ -210,10 +210,9 @@ static TestFixtureData CreateTestFixtureDataFromPath (string path)
 		}
 	}
 
-	public static class CompatExtensions
-	{
+	public static class CompatExtensions {
 		// cecil-tests is not NET5 yet, this is required to foreach over a dictionary
-		public static void Deconstruct<T1, T2>(this KeyValuePair<T1, T2> tuple, out T1 key, out T2 value)
+		public static void Deconstruct<T1, T2> (this KeyValuePair<T1, T2> tuple, out T1 key, out T2 value)
 		{
 			key = tuple.Key;
 			value = tuple.Value;

tests/cecil-tests/Test.cs

@@ -50,7 +50,7 @@ public void IdentifyBackingFieldAssignation (string assemblyPath)
 			}
 		}
 
-		[TestCaseSource (typeof (Helper),  nameof (Helper.PlatformAssemblies))]
+		[TestCaseSource (typeof (Helper), nameof (Helper.PlatformAssemblies))]
 		[TestCaseSource (typeof (Helper), nameof (Helper.NetPlatformImplementationAssemblies))]
 		// ref: https://github.com/xamarin/xamarin-macios/issues/8249
 		public void EnsureUIThreadOnInit (string assemblyPath)

tests/common/Configuration.cs

@@ -11,10 +11,8 @@
 
 #nullable disable // until we get around to fixing this file
 
-namespace Xamarin.Tests
-{
-	static partial class Configuration
-	{
+namespace Xamarin.Tests {
+	static partial class Configuration {
 		public const string XI_ProductName = "MonoTouch";
 		public const string XM_ProductName = "Xamarin.Mac";
 
@@ -89,7 +87,7 @@ public static string XcodeLocation {
 		}
 
 		public static string IOS_DESTDIR {
-			get { return ios_destdir;  }
+			get { return ios_destdir; }
 		}
 
 		public static string MAC_DESTDIR {
@@ -121,8 +119,7 @@ public static string GetOldXcodeRoot (Version min_version = null)
 			if (with_versions.Count == 0)
 				return null;
 
-			with_versions.Sort ((x, y) =>
-			{
+			with_versions.Sort ((x, y) => {
 				if (x.Item1 > y.Item1)
 					return -1;
 				else if (x.Item1 < y.Item1)
@@ -354,7 +351,7 @@ public static bool TryGetRootPath (out string rootPath)
 				return false;
 			}
 		}
-			
+
 		static string TestAssemblyDirectory {
 			get {
 				return TestContext.CurrentContext.WorkDirectory;
@@ -417,15 +414,15 @@ public static string SdkBinDir {
 
 		public static string TargetDirectoryXI {
 			get {
-				if (UseSystem) 
+				if (UseSystem)
 					return "/";
 				return make_config ["IOS_DESTDIR"];
 			}
 		}
 
 		public static string TargetDirectoryXM {
 			get {
-				if (UseSystem) 
+				if (UseSystem)
 					return "/";
 				return make_config ["MAC_DESTDIR"];
 			}
@@ -450,7 +447,7 @@ public static string SdkRoot {
 		static string GetRefNuGetName (TargetFramework targetFramework) => GetRefNuGetName (targetFramework.Platform);
 
 		static string GetRefNuGetName (ApplePlatform platform)
-        {
+		{
 			switch (platform) {
 			case ApplePlatform.iOS:
 				return "Microsoft.iOS.Ref";
@@ -747,7 +744,7 @@ public static ApplePlatform GetPlatform (string assemblyName, bool isDotNet)
 					throw new NotSupportedException ($"Unknown assembly: {assemblyName}");
 				}
 			}
-		}		
+		}
 
 		public static string GetBaseLibrary (TargetFramework targetFramework)
 		{
@@ -901,7 +898,7 @@ public static string GetCompiler (Profile profile, IList<string> args)
 			return "/Library/Frameworks/Mono.framework/Commands/csc";
 		}
 #endif // !XAMMAC_TESTS
-		
+
 		public static IEnumerable<ApplePlatform> GetIncludedPlatforms (bool dotnet)
 		{
 			if (include_ios)
@@ -1021,7 +1018,7 @@ public static void SetBuildVariables (ApplePlatform platform, ref Dictionary<str
 			environment ["MD_APPLE_SDK_ROOT"] = Path.GetDirectoryName (Path.GetDirectoryName (xcode_root));
 			environment ["TargetFrameworkFallbackSearchPaths"] = Path.Combine (rootDirectory, "Library", "Frameworks", "Mono.framework", "External", "xbuild-frameworks");
 			environment ["MSBuildExtensionsPathFallbackPathsOverride"] = Path.Combine (rootDirectory, "Library", "Frameworks", "Mono.framework", "External", "xbuild");
-			
+
 			// This is set by `dotnet test` and can cause building legacy projects to fail to build with:
 			// Microsoft.NET.Build.Extensions.ConflictResolution.targets(30,5):
 			// error MSB4062: The "ResolvePackageFileConflicts" task could not be loaded from the assembly Microsoft.NET.Build.Extensions.Tasks.dll.
@@ -1063,7 +1060,7 @@ public static void IgnoreIfIgnoredPlatform (ApplePlatform platform)
 				if (!include_dotnet_watchos)
 					Assert.Ignore ("watchOS is not included in this build");
 #endif
-					
+
 				break;
 			case ApplePlatform.MacOSX:
 				if (!include_mac)

tests/common/ExecutionHelper.cs

@@ -10,13 +10,10 @@
 
 #nullable disable // until we get around to fixing this file
 
-namespace Xamarin.Tests
-{
-	class XBuild
-	{
+namespace Xamarin.Tests {
+	class XBuild {
 		public static string ToolPath {
-			get
-			{
+			get {
 				return Configuration.XIBuildPath;
 			}
 		}

tests/common/Profile.cs

@@ -1,10 +1,8 @@
 using System;
 using Xamarin.Utils;
 
-namespace Xamarin.Tests
-{
-	public enum Profile
-	{
+namespace Xamarin.Tests {
+	public enum Profile {
 		None,
 		iOS,
 		tvOS,

tests/mtouch/Cache.cs

@@ -5,8 +5,7 @@
 
 #nullable enable
 
-namespace Xamarin
-{
+namespace Xamarin {
 	// A class that creates temporary directories next to the test assembly, and cleans the output on startup
 	// Advantages:
 	// * The temporary directories are automatically cleaned on Wrench (unlike /tmp, which isn't)