build: update Recompiler (for develop)

Author: mob-sakai

Plugins/CSharpCompilerSettings/AssemblyInfo.cs

@@ -1,4 +1,5 @@
 using System.Runtime.CompilerServices;
 
+[assembly: InternalsVisibleTo("CSharpCompilerSettings.Recompiler")]
 [assembly: InternalsVisibleTo("CSharpCompilerSettings.Editor")]
 [assembly: InternalsVisibleTo("CSharpCompilerSettingsTests")]

Plugins/Recompiler/CSharpCompilerSettings.rsp

@@ -11,9 +11,9 @@
 /r:"${APP_CONTENTS}/Managed/UnityEngine/UnityEngine.IMGUIModule.dll"
 /r:"${APP_CONTENTS}/Managed/UnityEngine/UnityEngine.JSONSerializeModule.dll"
 /r:"${APP_CONTENTS}/Managed/UnityEditor.dll"
-/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/2.0-api/mscorlib.dll"
-/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/2.0-api/System.dll"
-/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/2.0-api/System.Core.dll"
+/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/4.0-api/mscorlib.dll"
+/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/4.0-api/System.dll"
+/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/4.0-api/System.Core.dll"
 
 "${PLUGIN_SOURCE}/AssemblyInfo.cs"
 "${PLUGIN_SOURCE}/Core.cs"

Plugins/Recompiler/ExternalCSharpCompiler.rsp

@@ -7,8 +7,8 @@
 /optimize+
 
 /r:"${APP_CONTENTS}/Managed/UnityEditor.dll"
-/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/2.0-api/mscorlib.dll"
-/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/2.0-api/System.dll"
-/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/2.0-api/System.Core.dll"
+/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/4.0-api/mscorlib.dll"
+/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/4.0-api/System.dll"
+/r:"${APP_CONTENTS}/MonoBleedingEdge/lib/mono/4.0-api/System.Core.dll"
 
 "${PLUGIN_SOURCE}/ExternalCSharpCompiler.cs"

Plugins/Recompiler/Recompiler.asmdef

@@ -1,6 +1,8 @@
 {
     "name": "CSharpCompilerSettings.Recompiler",
-    "references": [],
+    "references": [
+        "CSharpCompilerSettings_"
+    ],
     "optionalUnityReferences": [],
     "includePlatforms": [
         "Editor"

Plugins/Recompiler/Recompiler.cs

@@ -56,49 +56,27 @@ public void Compile()
             rspPath = "Temp/" + Path.GetFileName(rspPath);
             File.WriteAllText(rspPath, rsp);
 
-            // Detect csc tool exe.
-            var mono = Application.platform != RuntimePlatform.WindowsEditor;
-            var cscToolExe = appContents + "/Tools/RoslynNet46/csc.exe".Replace('/', Path.DirectorySeparatorChar);
-            if (!File.Exists(cscToolExe))
-                cscToolExe = appContents + "/Tools/Roslyn/csc.exe".Replace('/', Path.DirectorySeparatorChar);
-            if (!File.Exists(cscToolExe))
-            {
-                cscToolExe = appContents + "/Tools/Roslyn/csc".Replace('/', Path.DirectorySeparatorChar);
-                mono = false;
-            }
+            var compilerInfo = CompilerInfo.GetInstalledInfo("Microsoft.Net.Compilers.Toolset.3.5.0");
 
-            // Create compilation process.
-            var psi = new ProcessStartInfo
-            {
-                CreateNoWindow = true,
-                UseShellExecute = false,
-                RedirectStandardError = true,
-                RedirectStandardOutput = true,
-            };
+            // Setup recompile process.
+            var psi = new ProcessStartInfo();
+            compilerInfo.Setup(psi, rspPath, Application.platform);
 
-            if (!mono)
-            {
-                psi.FileName = Path.GetFullPath(cscToolExe);
-                psi.Arguments = "/shared /noconfig @" + rspPath;
-            }
-            else
+            using (var program = Type.GetType("UnityEditor.Utils.Program, UnityEditor").New(psi) as IDisposable)
             {
-                psi.FileName = Path.Combine(appContents, "MonoBleedingEdge/bin/mono");
-                psi.Arguments = cscToolExe + " /noconfig @" + rspPath;
-            }
-
-            // Start compilation process.
-            var assemblyName = Path.GetFileName(dllPath);
-            Debug.LogFormat("<b>Recompile [{0}]: start compilation.</b>\n  command = {1} {2}\n", assemblyName, psi.FileName, psi.Arguments);
-            var p = Process.Start(psi);
-            p.Exited += (_, __) =>
-            {
-                if (p.ExitCode == 0)
+                // Start recompile.
+                var assemblyName = Path.GetFileName(dllPath);
+                Debug.LogFormat("<b>Recompile [{0}]: start compilation.</b>\n  command = {1} {2}\n", assemblyName, psi.FileName, psi.Arguments);
+                program.Call("Start");
+                program.Call("WaitForExit");
+
+                // Check outputs.
+                var exitCode = (int)program.Get("ExitCode");
+                if (exitCode == 0)
                     Debug.LogFormat("<b><color=#22aa22>Recompile [{0}]: success.</color></b>", assemblyName);
                 else
-                    Debug.LogErrorFormat("<b><color=#aa2222>Recompile [{0}]: failure.</color></b>\n{1}\n\n{2}", assemblyName, p.StandardError.ReadToEnd(), p.StandardOutput.ReadToEnd());
-            };
-            p.EnableRaisingEvents = true;
+                    Debug.LogErrorFormat("<b><color=#aa2222>Recompile [{0}]: failure.</color></b>\n{1}", assemblyName, program.Call("GetAllOutput"));
+            }
         }
     }
 
@@ -137,7 +115,6 @@ private static void InitializeOnLoadMethod()
 
         private static void RequestToRecompileIfNeeded(string assemblyPath, CompilerMessage[] messages)
         {
-            Debug.Log(">>>>" + assemblyPath);
             // Skip: Compile error.
             if (messages.Any(x => x.type == CompilerMessageType.Error)) return;