[mono] Fix race condition in Utils + remove duplicated code

src/tasks/AndroidAppBuilder/AndroidAppBuilder.csproj

@@ -20,7 +20,7 @@
     <Compile Include="ApkBuilder.cs" />
     <Compile Include="AndroidAppBuilder.cs" />
     <Compile Include="AndroidApkFileReplacerTask.cs" />
-    <Compile Include="Utils.cs" />
+    <Compile Include="..\Common\Utils.cs" />
   </ItemGroup>
 
   <Target Name="PublishBuilder"

src/tasks/AotCompilerTask/MonoAOTCompiler.csproj

@@ -15,7 +15,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="MonoAOTCompiler.cs" />
-    <Compile Include="Utils.cs" />
+    <Compile Include="..\Common\Utils.cs" />
   </ItemGroup>
   <ItemGroup>
     <Content Include="MonoAOTCompiler.props">

src/tasks/AppleAppBuilder/AppleAppBuilder.cs

@@ -16,7 +16,7 @@ public class AppleAppBuilderTask : Task
     /// The Apple OS we are targeting (iOS or tvOS)
     /// </summary>
     [Required]
-    public string TargetOS { get; set; } = Utils.TargetOS.iOS;
+    public string TargetOS { get; set; } = TargetNames.iOS;
 
     /// <summary>
     /// ProjectName is used as an app name, bundleId and xcode project name

src/tasks/AppleAppBuilder/AppleAppBuilder.csproj

@@ -18,7 +18,8 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="AppleAppBuilder.cs" />
-    <Compile Include="Utils.cs" />
+    <Compile Include="..\Common\Utils.cs" />
+    <Compile Include="TargetOS.cs" />
     <Compile Include="Xcode.cs" />
   </ItemGroup>
 

src/tasks/AppleAppBuilder/TargetOS.cs

@@ -0,0 +1,8 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+
+internal class TargetNames
+{
+    public const string iOS = "iOS";
+    public const string tvOS = "tvOS";
+}

src/tasks/AppleAppBuilder/Xcode.cs

@@ -15,7 +15,7 @@ internal class Xcode
     public Xcode(string target)
     {
         Target = target;
-        SysRoot = (Target == Utils.TargetOS.iOS) ?
+        SysRoot = (Target == TargetNames.iOS) ?
             Utils.RunProcess("xcrun", "--sdk iphoneos --show-sdk-path") :
             Utils.RunProcess("xcrun", "--sdk appletvos --show-sdk-path");
     }
@@ -95,7 +95,7 @@ public string GenerateXCode(
         }
 
         string frameworks = "";
-        if (Target == Utils.TargetOS.iOS)
+        if (Target == TargetNames.iOS)
         {
             frameworks = "\"-framework GSS\"";
         }
@@ -164,7 +164,7 @@ public string BuildAppBundle(
 
         if (architecture == "arm64")
         {
-            sdk = (Target == Utils.TargetOS.iOS) ? "iphoneos" : "appletvos";
+            sdk = (Target == TargetNames.iOS) ? "iphoneos" : "appletvos";
             args.Append(" -arch arm64")
                 .Append(" -sdk " + sdk);
 
@@ -182,7 +182,7 @@ public string BuildAppBundle(
         }
         else
         {
-            sdk = (Target == Utils.TargetOS.iOS) ? "iphonesimulator" : "appletvsimulator";
+            sdk = (Target == TargetNames.iOS) ? "iphonesimulator" : "appletvsimulator";
             args.Append(" -arch x86_64")
                 .Append(" -sdk " + sdk);
         }

src/tasks/AndroidAppBuilder/Utils.cs → src/tasks/Common/Utils.cs

@@ -11,6 +11,8 @@
 
 internal class Utils
 {
+    private static readonly object s_SyncObj = new object();
+
     public static string GetEmbeddedResource(string file)
     {
         using Stream stream = typeof(Utils).Assembly
@@ -55,19 +57,25 @@ public static string RunProcess(
 
         process.ErrorDataReceived += (sender, e) =>
         {
-            if (!silent)
+            lock (s_SyncObj)
             {
-                LogError(e.Data);
-                outputBuilder.AppendLine(e.Data);
+                if (!silent)
+                {
+                    LogError(e.Data);
+                    outputBuilder.AppendLine(e.Data);
+                }
+                errorBuilder.AppendLine(e.Data);
             }
-            errorBuilder.AppendLine(e.Data);
         };
         process.OutputDataReceived += (sender, e) =>
         {
-            if (!silent)
+            lock (s_SyncObj)
             {
-                LogInfo(e.Data);
-                outputBuilder.AppendLine(e.Data);
+                if (!silent)
+                {
+                    LogInfo(e.Data);
+                    outputBuilder.AppendLine(e.Data);
+                }
             }
         };
         process.BeginOutputReadLine();