refactor

Author: mob-sakai

Plugins/CSharpCompilerSettings/Core.cs

@@ -15,7 +15,7 @@ namespace Coffee.CSharpCompilerSettings
     [InitializeOnLoad]
     internal static class Core
     {
-        public static bool IsGlobal { get; private set; }
+        private static bool IsGlobal { get; }
 
         public static void DirtyScriptsIfNeeded()
         {
@@ -266,13 +266,12 @@ public static void OnAssemblyCompilationStarted(string name)
             }
         }
 
-        public static void Initialize()
+        static Core()
         {
-            IsGlobal = new[]
-            {
-                "CSharpCompilerSettings",
-                "CSharpCompilerSettings_",
-            }.Contains(typeof(Core).Assembly.GetName().Name);
+            var coreAssemblyName = typeof(Core).Assembly.GetName().Name;
+            if (coreAssemblyName == "CSharpCompilerSettings_") return;
+
+            IsGlobal = coreAssemblyName == "CSharpCompilerSettings";
 
             // Setup logger.
             if (IsGlobal)
@@ -332,10 +331,5 @@ public static void Initialize()
             if (2021 <= major || (major == 2020 && 2 <= minor))
                 DirtyScriptsIfNeeded();
         }
-
-        static Core()
-        {
-            Initialize();
-        }
     }
 }

Plugins/CSharpCompilerSettings/CscSettingsAsset.cs

@@ -77,10 +77,10 @@ public override string ToString()
     [Serializable]
     public struct AssemblyFilter
     {
-        [Tooltip("Include predefined assemblies (e.g. Assembly-CSharp.dll)")] [SerializeField]
+        [Tooltip("Include predefined assemblies (Assembly-CSharp-firstpass.dll, Assembly-CSharp-Editor-firstpass.dll, Assembly-CSharp.dll and Assembly-CSharp-Editor.dll)")] [SerializeField]
         private bool m_PredefinedAssemblies;
 
-        [Tooltip("Include assemblies filter. Prefix '!' to exclude (e.g. 'Assets/;!Packages/')")] [SerializeField]
+        [Tooltip("Assemblies filter. Prefix '!' to exclude. (e.g. 'Assets/', '!Packages/')")] [SerializeField]
         private string[] m_IncludedAssemblies;
 
         public AssemblyFilter(bool predefinedAssemblies, string[] includedAssemblies)

Plugins/CSharpCompilerSettings/Dev/CSharpCompilerSettings.Editor.asmdef.dev~

@@ -0,0 +1,14 @@
+/target:library
+/nowarn:0169
+/langversion:latest
+/out:"${DLL_PATH}"
+/nostdlib
+/deterministic
+/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"
+
+"${PLUGIN_SOURCE}/ExternalCSharpCompiler.cs"

Plugins/CSharpCompilerSettings/Dev/CSharpCompilerSettings.Editor.asmdef~

@@ -1,5 +1,5 @@
 {
-    "name": "CSharpCompilerSettings.Dev",
+    "name": "CSharpCompilerSettings.Recompiler",
     "references": [],
     "optionalUnityReferences": [],
     "includePlatforms": [
@@ -10,5 +10,7 @@
     "overrideReferences": false,
     "precompiledReferences": [],
     "autoReferenced": false,
-    "defineConstraints": []
+    "defineConstraints": [
+        "CSC_SETTINGS_DEVELOP"
+    ]
 }