1 files changed, 76 insertions, 67 deletions
diff --git a/src/csharp/Grpc.Tools/Common.cs b/src/csharp/Grpc.Tools/Common.cs
index 9f8600bad0..e6acdd6393 100644
--- a/src/csharp/Grpc.Tools/Common.cs
+++ b/src/csharp/Grpc.Tools/Common.cs
@@ -24,82 +24,91 @@ using System.Security;
 
 [assembly: InternalsVisibleTo("Grpc.Tools.Tests")]
 
-namespace Grpc.Tools {
-  // Metadata names (MSBuild item attributes) that we refer to often.
-  static class Metadata {
-    // On output dependency lists.
-    public static string Source = "Source";
-    // On ProtoBuf items.
-    public static string ProtoRoot = "ProtoRoot";
-    public static string OutputDir = "OutputDir";
-    public static string GrpcServices = "GrpcServices";
-    public static string GrpcOutputDir = "GrpcOutputDir";
-  };
+namespace Grpc.Tools
+{
+    // Metadata names (MSBuild item attributes) that we refer to often.
+    static class Metadata
+    {
+        // On output dependency lists.
+        public static string Source = "Source";
+        // On ProtoBuf items.
+        public static string ProtoRoot = "ProtoRoot";
+        public static string OutputDir = "OutputDir";
+        public static string GrpcServices = "GrpcServices";
+        public static string GrpcOutputDir = "GrpcOutputDir";
+    };
 
-  // A few flags used to control the behavior under various platforms.
-  internal static class Platform {
-    public enum OsKind { Unknown, Windows, Linux, MacOsX };
-    public static readonly OsKind Os;
+    // A few flags used to control the behavior under various platforms.
+    internal static class Platform
+    {
+        public enum OsKind { Unknown, Windows, Linux, MacOsX };
+        public static readonly OsKind Os;
 
-    public enum CpuKind { Unknown, X86, X64 };
-    public static readonly CpuKind Cpu;
+        public enum CpuKind { Unknown, X86, X64 };
+        public static readonly CpuKind Cpu;
 
-    // This is not necessarily true, but good enough. BCL lacks a per-FS
-    // API to determine file case sensitivity.
-    public static bool IsFsCaseInsensitive => Os == OsKind.Windows;
-    public static bool IsWindows => Os == OsKind.Windows;
+        // This is not necessarily true, but good enough. BCL lacks a per-FS
+        // API to determine file case sensitivity.
+        public static bool IsFsCaseInsensitive => Os == OsKind.Windows;
+        public static bool IsWindows => Os == OsKind.Windows;
 
-    static Platform() {
+        static Platform()
+        {
 #if NETCORE
-      Os = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? OsKind.Windows
-         : RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? OsKind.Linux
-         : RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? OsKind.MacOsX
-         : OsKind.Unknown;
+            Os = RuntimeInformation.IsOSPlatform(OSPlatform.Windows) ? OsKind.Windows
+               : RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? OsKind.Linux
+               : RuntimeInformation.IsOSPlatform(OSPlatform.OSX) ? OsKind.MacOsX
+               : OsKind.Unknown;
 
-      switch (RuntimeInformation.OSArchitecture) {
-        case Architecture.X86: Cpu = CpuKind.X86; break;
-        case Architecture.X64: Cpu = CpuKind.X64; break;
-        // We do not have build tools for other architectures.
-        default: Cpu = CpuKind.Unknown; break;
-      }
+            switch (RuntimeInformation.OSArchitecture)
+            {
+                case Architecture.X86: Cpu = CpuKind.X86; break;
+                case Architecture.X64: Cpu = CpuKind.X64; break;
+                // We do not have build tools for other architectures.
+                default: Cpu = CpuKind.Unknown; break;
+            }
 #else
-      // Running under either Mono or full MS framework.
-      Os = OsKind.Windows;
-      if (Type.GetType("Mono.Runtime", throwOnError: false) != null) {
-        // Congratulations. We are running under Mono.
-        var plat = Environment.OSVersion.Platform;
-        if (plat == PlatformID.MacOSX) {
-          Os = OsKind.MacOsX;
-        } else if (plat == PlatformID.Unix || (int)plat == 128) {
-          // TODO(kkm): This is how Mono detects OSX internally. Looks cheesy
-          // to me. Would not testing for /proc absence be more reliable? OSX
-          // did never have it, AFAIK.
-          Os = File.Exists("/usr/lib/libc.dylib") ? OsKind.MacOsX : OsKind.Linux;
-        }
-      }
+            // Running under either Mono or full MS framework.
+            Os = OsKind.Windows;
+            if (Type.GetType("Mono.Runtime", throwOnError: false) != null)
+            {
+                // Congratulations. We are running under Mono.
+                var plat = Environment.OSVersion.Platform;
+                if (plat == PlatformID.MacOSX)
+                {
+                    Os = OsKind.MacOsX;
+                }
+                else if (plat == PlatformID.Unix || (int)plat == 128)
+                {
+                    // This is how Mono detects OSX internally.
+                    Os = File.Exists("/usr/lib/libc.dylib") ? OsKind.MacOsX : OsKind.Linux;
+                }
+            }
 
-      // Hope we are not building on ARM under Xamarin!
-      Cpu = Environment.Is64BitOperatingSystem ? CpuKind.X64 : CpuKind.X86;
+            // Hope we are not building on ARM under Xamarin!
+            Cpu = Environment.Is64BitOperatingSystem ? CpuKind.X64 : CpuKind.X86;
 #endif
-    }
-  };
+        }
+    };
 
-  // Exception handling helpers.
-  static class Exceptions {
-    // Returns true iff the exception indicates an error from an I/O call. See
-    // https://github.com/Microsoft/msbuild/blob/v15.4.8.50001/src/Shared/ExceptionHandling.cs#L101
-    static public bool IsIoRelated(Exception ex) =>
-      ex is IOException ||
-      (ex is ArgumentException && !(ex is ArgumentNullException)) ||
-      ex is SecurityException ||
-      ex is UnauthorizedAccessException ||
-      ex is NotSupportedException;
-  };
+    // Exception handling helpers.
+    static class Exceptions
+    {
+        // Returns true iff the exception indicates an error from an I/O call. See
+        // https://github.com/Microsoft/msbuild/blob/v15.4.8.50001/src/Shared/ExceptionHandling.cs#L101
+        static public bool IsIoRelated(Exception ex) =>
+            ex is IOException ||
+            (ex is ArgumentException && !(ex is ArgumentNullException)) ||
+            ex is SecurityException ||
+            ex is UnauthorizedAccessException ||
+            ex is NotSupportedException;
+    };
 
-  // String helpers.
-  static class Strings {
-    // Compare string to argument using OrdinalIgnoreCase comparison.
-    public static bool EqualNoCase(this string a, string b) =>
-      string.Equals(a, b, StringComparison.OrdinalIgnoreCase);
-  }
+    // String helpers.
+    static class Strings
+    {
+        // Compare string to argument using OrdinalIgnoreCase comparison.
+        public static bool EqualNoCase(this string a, string b) =>
+            string.Equals(a, b, StringComparison.OrdinalIgnoreCase);
+    }
 }