fix: in Unity 2020.2 or later, some fields in CscSettingsAsset will b…

…e not deserialized on first compilation
mob-sakai · Dec 16, 2020 · 1858247 · 1858247
1 parent acfa0e6
commit 1858247
Showing 1 changed file with 25 additions and 3 deletions.
diff --git a/Plugins/CSharpCompilerSettings/CscSettingsAsset.cs b/Plugins/CSharpCompilerSettings/CscSettingsAsset.cs
@@ -2,6 +2,7 @@
 using System.IO;
 using System.Linq;
 using System.Text;
+using System.Text.RegularExpressions;
 using UnityEditor;
 using UnityEngine;
 using LVersion = Coffee.CSharpCompilerSettings.CSharpLanguageVersion;
@@ -119,9 +120,9 @@ internal class CscSettingsAsset : ScriptableObject, ISerializationCallbackReceiv
 
         private static CscSettingsAsset CreateFromProjectSettings()
         {
-            s_Instance = CreateInstance<CscSettingsAsset>();
-            if (File.Exists(k_SettingsPath))
-                JsonUtility.FromJsonOverwrite(File.ReadAllText(k_SettingsPath), s_Instance);
+            s_Instance = File.Exists(k_SettingsPath)
+                ? CreateFromJson(File.ReadAllText(k_SettingsPath))
+                : CreateInstance<CscSettingsAsset>();
             s_Instance.IsProjectSetting = true;
             return s_Instance;
         }
@@ -225,6 +226,27 @@ public static CscSettingsAsset CreateFromJson(string json = "")
         {
             var setting = CreateInstance<CscSettingsAsset>();
             JsonUtility.FromJsonOverwrite(json, setting);
+
+            // In Unity 2020.2 or later, some fields will be not deserialized on first compilation.
+            var serializedJson = JsonUtility.ToJson(setting);
+            if (!serializedJson.Contains("\"m_CompilerPackage\":"))
+            {
+                var m = Regex.Match(json, "\"m_CompilerPackage\":\\s*({[^}]+})");
+                if (m.Success)
+                {
+                    setting.m_CompilerPackage = JsonUtility.FromJson<NugetPackage>(m.Groups[1].Value);
+                }
+            }
+
+            if (!serializedJson.Contains("\"m_CompilerFilter\":"))
+            {
+                var m = Regex.Match(json, "\"m_CompilerFilter\":\\s*({[^}]+})");
+                if (m.Success)
+                {
+                    setting.m_CompilerFilter = JsonUtility.FromJson<AssemblyFilter>(m.Groups[1].Value);
+                }
+            }
+
             return setting;
         }