fix SA1000

dotnet · akoeplinger · Feb 10, 2025 · Feb 8, 2025 · Feb 8, 2025 · Feb 8, 2025
commit 57a6156b965e66e0dea0c72c9f133fed7ff20848
diff --git a/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs b/src/coreclr/tools/aot/ILCompiler.ReadyToRun/JitInterface/CorInfoImpl.ReadyToRun.cs
@@ -311,7 +311,7 @@ public override bool Equals(object obj)
 
         public override int GetHashCode()
         {
-            return Method.GetHashCode() ^ unchecked(17 * Token.GetHashCode()) ^ unchecked (39 * (ConstrainedType?.GetHashCode() ?? 0));
+            return Method.GetHashCode() ^ unchecked(17 * Token.GetHashCode()) ^ unchecked(39 * (ConstrainedType?.GetHashCode() ?? 0));
         }
 
         public bool Equals(MethodWithToken methodWithToken)
@@ -2113,7 +2113,7 @@ private void ceeInfoGetCallInfo(
                 // of shared generic code calling a shared generic implementation method, which should be rare.
                 //
                 // An alternative design would be to add a new generic dictionary entry kind to hold the MethodDesc
-                // of the constrained target instead, and use that in some circumstances; however, implementation of 
+                // of the constrained target instead, and use that in some circumstances; however, implementation of
                 // that design requires refactoring variuos parts of the JIT interface as well as
                 // TryResolveConstraintMethodApprox. In particular we would need to be abled to embed a constrained lookup
                 // via EmbedGenericHandle, as well as decide in TryResolveConstraintMethodApprox if the call can be made

diff --git a/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.PERF_INFO.cs b/src/libraries/Common/src/Interop/Windows/Advapi32/Interop.PERF_INFO.cs
@@ -116,7 +116,7 @@ public readonly void Validate(int bufferSize)
                     ByteLength > bufferSize ||
                     NameOffset < 0 ||
                     NameLength < 0 ||
-                    checked (NameOffset + NameLength) > ByteLength)
+                    checked(NameOffset + NameLength) > ByteLength)
                 {
                     ThrowInvalidOperationException(typeof(PERF_INSTANCE_DEFINITION));
                 }

diff --git a/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs b/src/libraries/System.Net.Sockets/src/System/Net/Sockets/SocketPal.Unix.cs
@@ -1073,7 +1073,7 @@ public static bool TryCompleteSendFile(SafeSocketHandle socket, SafeFileHandle h
 
         public static SocketError SetBlocking(SafeSocketHandle handle, bool shouldBlock, out bool willBlock)
         {
-            if(OperatingSystem.IsWasi() && shouldBlock) throw new PlatformNotSupportedException();
+            if (OperatingSystem.IsWasi() && shouldBlock) throw new PlatformNotSupportedException();
 
             handle.IsNonBlocking = !shouldBlock;
             willBlock = shouldBlock;

diff --git a/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/ILGeneratorImpl.cs b/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/ILGeneratorImpl.cs
@@ -57,7 +57,7 @@ internal ILGeneratorImpl(MethodBuilderImpl methodBuilder, int size)
 
         internal void AddExceptionBlocks()
         {
-            foreach(ExceptionHandlerInfo eb in _exceptionBlocks)
+            foreach (ExceptionHandlerInfo eb in _exceptionBlocks)
             {
                 switch (eb.Kind)
                 {

diff --git a/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs b/src/libraries/System.Reflection.Emit/src/System/Reflection/Emit/TypeBuilderImpl.cs
@@ -993,7 +993,7 @@ public override Type[] GetInterfaces()
 
             List<Type> interfaces = _interfaces ?? [];
 
-            if(_typeParent != null)
+            if (_typeParent != null)
             {
                 interfaces.AddRange(_typeParent.GetInterfaces());
             }

@@ -547,7 +547,7 @@ private bool ExecuteInternal()
                 if (be9 is not null)
                     allowedParallelism = be9.RequestCores(allowedParallelism);
             }
-            catch(NotImplementedException)
+            catch (NotImplementedException)
             {
                 // RequestCores is not implemented in TaskHostFactory
                 be9 = null;

diff --git a/src/tasks/AppleAppBuilder/AppleAppBuilder.cs b/src/tasks/AppleAppBuilder/AppleAppBuilder.cs
@@ -316,7 +316,7 @@ public override bool Execute()
         }
 
         List<string> extraLinkerArgs = new List<string>();
-        foreach(ITaskItem item in ExtraLinkerArguments)
+        foreach (ITaskItem item in ExtraLinkerArguments)
         {
             extraLinkerArgs.Add(item.ItemSpec);
         }

diff --git a/src/tasks/MobileBuildTasks/Android/AndroidProject.cs b/src/tasks/MobileBuildTasks/Android/AndroidProject.cs
@@ -95,30 +95,30 @@ private static string BuildClangArgs(ClangBuildOptions buildOptions)
         {
             StringBuilder ret = new StringBuilder();
 
-            foreach(string compilerArg in buildOptions.CompilerArguments)
+            foreach (string compilerArg in buildOptions.CompilerArguments)
             {
                 ret.Append(compilerArg);
                 ret.Append(' ');
             }
 
-            foreach(string includeDir in buildOptions.IncludePaths)
+            foreach (string includeDir in buildOptions.IncludePaths)
             {
                 ret.Append($"-I {includeDir} ");
             }
 
-            foreach(string linkerArg in buildOptions.LinkerArguments)
+            foreach (string linkerArg in buildOptions.LinkerArguments)
             {
                 ret.Append($"-Xlinker {linkerArg} ");
             }
 
-            foreach(string source in buildOptions.Sources)
+            foreach (string source in buildOptions.Sources)
             {
                 ret.Append(source);
                 ret.Append(' ');
             }
 
             HashSet<string> libDirs = new HashSet<string>();
-            foreach(string lib in buildOptions.NativeLibraryPaths)
+            foreach (string lib in buildOptions.NativeLibraryPaths)
             {
                 string rootPath = Path.GetDirectoryName(lib)!;
                 string libName = Path.GetFileName(lib);

diff --git a/src/tasks/MobileBuildTasks/Android/Ndk/Ndk.cs b/src/tasks/MobileBuildTasks/Android/Ndk/Ndk.cs
@@ -48,7 +48,7 @@ private static string GetNdkPath(IEnumerable<string> probingPaths)
         {
             string ret = "";
 
-            foreach(string path in probingPaths)
+            foreach (string path in probingPaths)
             {
                 if (Directory.Exists(path))
                 {
@@ -104,7 +104,7 @@ private static NdkVersion ReadVersion()
 
             var splitChars = new char[] {'='};
             string? ver = null;
-            foreach(string l in File.ReadAllLines(sourcePropertiesPath))
+            foreach (string l in File.ReadAllLines(sourcePropertiesPath))
             {
                 string line = l.Trim ();
                 if (!line.StartsWith("Pkg.Revision", StringComparison.Ordinal))

diff --git a/src/tasks/MobileBuildTasks/Android/Ndk/NdkTools.cs b/src/tasks/MobileBuildTasks/Android/Ndk/NdkTools.cs
@@ -119,7 +119,7 @@ private void ValidateRequiredProps(string hostOS)
             {
                 string host = validHosts[hostOS];
             }
-            catch(KeyNotFoundException)
+            catch (KeyNotFoundException)
             {
                 throw new Exception("An invalid HostOS value was supplied. Only windows, osx, and linux are supported.");
             }

diff --git a/src/tasks/MobileBuildTasks/Android/Ndk/NdkVersion.cs b/src/tasks/MobileBuildTasks/Android/Ndk/NdkVersion.cs
@@ -17,7 +17,7 @@ public NdkVersion(string? version)
             string? ver = version?.Trim();
             if (string.IsNullOrEmpty(ver))
             {
-                throw new ArgumentException ("must be a non-empty string", nameof (version));
+                throw new ArgumentException ("must be a non-empty string", nameof(version));
             }
 
             int tagIdx = ver!.IndexOf('-');

diff --git a/src/tasks/MobileBuildTasks/Apple/AppleProject.cs b/src/tasks/MobileBuildTasks/Apple/AppleProject.cs
@@ -82,23 +82,23 @@ private string BuildClangArgs(ClangBuildOptions buildOptions, string minOSVersio
                 buildOptions.CompilerArguments.Add($"-arch {targetAbi}");
             }
 
-            foreach(string compilerArg in buildOptions.CompilerArguments)
+            foreach (string compilerArg in buildOptions.CompilerArguments)
             {
                 ret.Append(compilerArg);
                 ret.Append(' ');
             }
 
-            foreach(string includeDir in buildOptions.IncludePaths)
+            foreach (string includeDir in buildOptions.IncludePaths)
             {
                 ret.Append($"-I {includeDir} ");
             }
 
-            foreach(string linkerArg in buildOptions.LinkerArguments)
+            foreach (string linkerArg in buildOptions.LinkerArguments)
             {
                 ret.Append($"{linkerArg} ");
             }
 
-            foreach(string source in buildOptions.Sources)
+            foreach (string source in buildOptions.Sources)
             {
                 string ext = Path.GetExtension(source);
 
@@ -115,7 +115,7 @@ private string BuildClangArgs(ClangBuildOptions buildOptions, string minOSVersio
             }
 
             HashSet<string> libDirs = new HashSet<string>();
-            foreach(string lib in buildOptions.NativeLibraryPaths)
+            foreach (string lib in buildOptions.NativeLibraryPaths)
             {
                 string rootPath = Path.GetDirectoryName(lib)!;
                 string libName = Path.GetFileName(lib);

diff --git a/src/tasks/MonoTargetsTasks/EmitBundleTask/EmitBundleBase.cs b/src/tasks/MonoTargetsTasks/EmitBundleTask/EmitBundleBase.cs
@@ -160,7 +160,7 @@ public override bool Execute()
             if (be9 is not null)
                 allowedParallelism = be9.RequestCores(allowedParallelism);
         }
-        catch(NotImplementedException)
+        catch (NotImplementedException)
         {
             // RequestCores is not implemented in TaskHostFactory
             be9 = null;
@@ -289,8 +289,8 @@ private static byte[] InitLookupTable()
 
     private string GatherUniqueExportedResourceDataSymbols(List<ITaskItem> uniqueDestinationFiles)
     {
-        StringBuilder resourceSymbols = new ();
-        HashSet<string> resourcesAdded = new (); // Different Timezone resources may have the same contents
+        StringBuilder resourceSymbols = new();
+        HashSet<string> resourcesAdded = new(); // Different Timezone resources may have the same contents
         foreach (var uniqueDestinationFile in uniqueDestinationFiles)
         {
             string registeredName = uniqueDestinationFile.GetMetadata(RegisteredName);
@@ -308,16 +308,16 @@ private string GatherUniqueExportedResourceDataSymbols(List<ITaskItem> uniqueDes
 
     private static void GenerateBundledResourcePreallocationAndRegistration(string resourceSymbols, string bundleRegistrationFunctionName, ICollection<(string resourceType, string registeredName, string resourceName, string resourceDataSymbol, string culture, string? resourceSymbolName)> files, StreamWriter outputUtf8Writer)
     {
-        List<string> preallocatedSource = new ();
+        List<string> preallocatedSource = new();
 
         string assemblyTemplate = Utils.GetEmbeddedResource("mono-bundled-assembly.template");
         string satelliteAssemblyTemplate = Utils.GetEmbeddedResource("mono-bundled-satellite-assembly.template");
         string symbolDataTemplate = Utils.GetEmbeddedResource("mono-bundled-data.template");
 
         var preallocatedResources = new StringBuilder();
-        List<string> preallocatedAssemblies = new ();
-        List<string> preallocatedSatelliteAssemblies = new ();
-        List<string> preallocatedData = new ();
+        List<string> preallocatedAssemblies = new();
+        List<string> preallocatedSatelliteAssemblies = new();
+        List<string> preallocatedData = new();
         int assembliesCount = 0;
         int satelliteAssembliesCount = 0;
         int dataCount = 0;
@@ -377,7 +377,7 @@ private static void GenerateBundledResourcePreallocationAndRegistration(string r
                                          .Replace("%Len%", $"{resourceDataSymbol}_data_len_val"));
         }
 
-        List<string> addPreallocatedResources = new ();
+        List<string> addPreallocatedResources = new();
         if (assembliesCount != 0) {
             preallocatedResources.AppendLine($"MonoBundledResource *{bundleRegistrationFunctionName}_assembly_resources[] = {{\n{string.Join(",\n", preallocatedAssemblies)}\n}};");
             addPreallocatedResources.Add($"    mono_bundled_resources_add ({bundleRegistrationFunctionName}_assembly_resources, {assembliesCount});");

diff --git a/src/tasks/MonoTargetsTasks/ILStrip/ILStrip.cs b/src/tasks/MonoTargetsTasks/ILStrip/ILStrip.cs
@@ -80,7 +80,7 @@ public override bool Execute()
             if (be9 is not null)
                 allowedParallelism = be9.RequestCores(allowedParallelism);
         }
-        catch(NotImplementedException)
+        catch (NotImplementedException)
         {
             // RequestCores is not implemented in TaskHostFactory
             be9 = null;

diff --git a/src/tasks/MonoTargetsTasks/MarshalingPInvokeScanner/MarshalingPInvokeScanner.cs b/src/tasks/MonoTargetsTasks/MarshalingPInvokeScanner/MarshalingPInvokeScanner.cs
@@ -82,7 +82,7 @@ private void ResolveInconclusiveTypes(HashSet<string> incompatible, string assyP
             MetadataReader mdtReader = peReader.GetMetadataReader();
             string assyName = mdtReader.GetString(mdtReader.GetAssemblyDefinition().Name);
             HashSet<string> inconclusiveTypes = mmtcp.GetInconclusiveTypesForAssembly(assyName);
-            if(inconclusiveTypes.Count == 0)
+            if (inconclusiveTypes.Count == 0)
                 return;
 
             SignatureDecoder<Compatibility, object> decoder = new(mmtcp, mdtReader, null!);
@@ -113,18 +113,18 @@ private bool IsAssemblyIncompatible(string assyPath, MinimalMarshalingTypeCompat
 
             MetadataReader mdtReader = peReader.GetMetadataReader();
 
-            foreach(CustomAttributeHandle attrHandle in mdtReader.CustomAttributes)
+            foreach (CustomAttributeHandle attrHandle in mdtReader.CustomAttributes)
             {
                 CustomAttribute attr = mdtReader.GetCustomAttribute(attrHandle);
 
-                if(attr.Constructor.Kind == HandleKind.MethodDefinition)
+                if (attr.Constructor.Kind == HandleKind.MethodDefinition)
                 {
                     MethodDefinitionHandle mdh = (MethodDefinitionHandle)attr.Constructor;
                     MethodDefinition md = mdtReader.GetMethodDefinition(mdh);
                     TypeDefinitionHandle tdh = md.GetDeclaringType();
                     TypeDefinition td = mdtReader.GetTypeDefinition(tdh);
 
-                    if(mdtReader.GetString(td.Namespace) == "System.Runtime.CompilerServices" &&
+                    if (mdtReader.GetString(td.Namespace) == "System.Runtime.CompilerServices" &&
                         mdtReader.GetString(td.Name) == "DisableRuntimeMarshallingAttribute")
                         return false;
                 }
@@ -136,17 +136,17 @@ private bool IsAssemblyIncompatible(string assyPath, MinimalMarshalingTypeCompat
                 string ns = mdtReader.GetString(typeDef.Namespace);
                 string name = mdtReader.GetString(typeDef.Name);
 
-                foreach(MethodDefinitionHandle mthDefHandle in typeDef.GetMethods())
+                foreach (MethodDefinitionHandle mthDefHandle in typeDef.GetMethods())
                 {
                     MethodDefinition mthDef = mdtReader.GetMethodDefinition(mthDefHandle);
-                    if(!mthDef.Attributes.HasFlag(MethodAttributes.PinvokeImpl))
+                    if (!mthDef.Attributes.HasFlag(MethodAttributes.PinvokeImpl))
                         continue;
 
                     BlobReader sgnBlobReader = mdtReader.GetBlobReader(mthDef.Signature);
                     SignatureDecoder<Compatibility, object> decoder = new(mmtcp, mdtReader, null!);
 
                     MethodSignature<Compatibility> sgn = decoder.DecodeMethodSignature(ref sgnBlobReader);
-                    if(sgn.ReturnType == Compatibility.Incompatible || sgn.ParameterTypes.Any(p => p == Compatibility.Incompatible))
+                    if (sgn.ReturnType == Compatibility.Incompatible || sgn.ParameterTypes.Any(p => p == Compatibility.Incompatible))
                     {
                         Log.LogMessage(MessageImportance.Low, string.Format("Assembly {0} requires marshal-ilgen for method {1}.{2}:{3} (first pass).",
                             assyPath, ns, name, mdtReader.GetString(mthDef.Name)));

diff --git a/...s/MonoTargetsTasks/MarshalingPInvokeScanner/MinimalMarshalingTypeCompatibilityProvider.cs b/...s/MonoTargetsTasks/MarshalingPInvokeScanner/MinimalMarshalingTypeCompatibilityProvider.cs
@@ -40,7 +40,7 @@ public void Add(string assyName, string namespaceName, string typeName)
         {
             HashSet<string>? incAssyTypes;
 
-            if(!_data.TryGetValue(assyName, out incAssyTypes))
+            if (!_data.TryGetValue(assyName, out incAssyTypes))
             {
                 incAssyTypes = new();
                 _data.Add(assyName, incAssyTypes);
@@ -51,7 +51,7 @@ public void Add(string assyName, string namespaceName, string typeName)
 
         public HashSet<string> EnumerateForAssembly(string assyName)
         {
-            if(_data.TryGetValue(assyName, out HashSet<string>? incAssyTypes))
+            if (_data.TryGetValue(assyName, out HashSet<string>? incAssyTypes))
                 return incAssyTypes!;
 
             return new HashSet<string>();
@@ -124,7 +124,7 @@ public Compatibility GetTypeFromDefinition(MetadataReader reader, TypeDefinition
                         return GetTypeFromDefinition(reader, handleInner, rawTypeKind);
                 }
             }
-            catch(BadImageFormatException ex)
+            catch (BadImageFormatException ex)
             {
                 _log.LogMessage(MessageImportance.Low, ex.Message);
             }

@@ -137,7 +137,7 @@ private bool ExecuteActual()
                     if (be9 is not null)
                         allowedParallelism = be9.RequestCores(allowedParallelism);
                 }
-                catch(NotImplementedException)
+                catch (NotImplementedException)
                 {
                     // RequestCores is not implemented in TaskHostFactory
                     be9 = null;

@@ -54,7 +54,7 @@ static IEnumerable<char> Args (string signature)
         }
 
         static (bool isVoid, string nativeType) Result (string signature)
-            => new (SignatureMapper.IsVoidSignature(signature), SignatureMapper.CharToNativeType(signature[0]));
+            => new(SignatureMapper.IsVoidSignature(signature), SignatureMapper.CharToNativeType(signature[0]));
 
         w.Write(
         """

@@ -246,7 +246,7 @@ public PInvokeCallback(MethodInfo method)
         {
             if (attr.AttributeType.Name == "UnmanagedCallersOnlyAttribute")
             {
-                foreach(var arg in attr.NamedArguments)
+                foreach (var arg in attr.NamedArguments)
                 {
                     if (arg.MemberName == "EntryPoint")
                     {