diff --git a/Data~/hybridclr_version.json b/Data~/hybridclr_version.json
index bfa0e2b..de83632 100644
--- a/Data~/hybridclr_version.json
+++ b/Data~/hybridclr_version.json
@@ -24,6 +24,11 @@
         "unity_version":"2022-tuanjie",
         "hybridclr" : { "branch":"v5.4.0"},
         "il2cpp_plus": { "branch":"v2022-tuanjie-5.4.0"}
+    },
+    {
+        "unity_version":"6000",
+        "hybridclr" : { "branch":"v5.4.0"},
+        "il2cpp_plus": { "branch":"v6000-5.4.0"}
     }
     ]
 }
\ No newline at end of file
diff --git a/Editor/3rds/UnityHook/HybridCLRHooks/CopyStrippedAOTAssembliesHook.cs b/Editor/3rds/UnityHook/HybridCLRHooks/CopyStrippedAOTAssembliesHook.cs
index 7e3373d..ec3645d 100644
--- a/Editor/3rds/UnityHook/HybridCLRHooks/CopyStrippedAOTAssembliesHook.cs
+++ b/Editor/3rds/UnityHook/HybridCLRHooks/CopyStrippedAOTAssembliesHook.cs
@@ -12,7 +12,7 @@ using System.IO;
 
 namespace HybridCLR.MonoHook
 {
-#if UNITY_2021_1_OR_NEWER
+#if UNITY_2021_1_OR_NEWER && !UNITY_6000_0_OR_NEWER
     [InitializeOnLoad]
     public class CopyStrippedAOTAssembliesHook
     {
diff --git a/Editor/3rds/UnityHook/HybridCLRHooks/GetIl2CppFolderHook.cs b/Editor/3rds/UnityHook/HybridCLRHooks/GetIl2CppFolderHook.cs
index c3ce1f5..fe4134c 100644
--- a/Editor/3rds/UnityHook/HybridCLRHooks/GetIl2CppFolderHook.cs
+++ b/Editor/3rds/UnityHook/HybridCLRHooks/GetIl2CppFolderHook.cs
@@ -12,7 +12,7 @@ using System.IO;
 
 namespace HybridCLR.MonoHook
 {
-#if UNITY_2022
+#if UNITY_2022 || UNITY_6000_0_OR_NEWER
     [InitializeOnLoad]
     public class GetIl2CppFolderHook
     {
diff --git a/Editor/BuildProcessors/CopyStrippedAOTAssemblies.cs b/Editor/BuildProcessors/CopyStrippedAOTAssemblies.cs
index 076fffc..7a529ec 100644
--- a/Editor/BuildProcessors/CopyStrippedAOTAssemblies.cs
+++ b/Editor/BuildProcessors/CopyStrippedAOTAssemblies.cs
@@ -8,9 +8,11 @@ using System.Threading.Tasks;
 using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
-using UnityEditor.Il2Cpp;
 using UnityEditor.UnityLinker;
 using UnityEngine;
+#if !UNITY_2021_1_OR_NEWER
+using UnityEditor.Il2Cpp;
+#endif
 
 namespace HybridCLR.Editor.BuildProcessors
 {
diff --git a/Editor/BuildProcessors/PatchScriptingAssemblyList.cs b/Editor/BuildProcessors/PatchScriptingAssemblyList.cs
index 2d49543..b633c20 100644
--- a/Editor/BuildProcessors/PatchScriptingAssemblyList.cs
+++ b/Editor/BuildProcessors/PatchScriptingAssemblyList.cs
@@ -9,10 +9,12 @@ using UnityEditor;
 using UnityEditor.Android;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
-using UnityEditor.Il2Cpp;
 using UnityEditor.UnityLinker;
 using UnityEngine;
 using UnityFS;
+#if !UNITY_2021_1_OR_NEWER
+using UnityEditor.Il2Cpp;
+#endif
 
 namespace HybridCLR.Editor.BuildProcessors
 {
diff --git a/Editor/Il2CppDef/Il2CppDefGenerator.cs b/Editor/Il2CppDef/Il2CppDefGenerator.cs
index e3296ac..6765d35 100644
--- a/Editor/Il2CppDef/Il2CppDefGenerator.cs
+++ b/Editor/Il2CppDef/Il2CppDefGenerator.cs
@@ -52,7 +52,14 @@ namespace HybridCLR.Editor.Il2CppDef
 
             lines.Add($"#define HYBRIDCLR_UNITY_VERSION {majorVer}{minorVer1.ToString("D2")}{minorVer2.ToString("D2")}");
             lines.Add($"#define HYBRIDCLR_UNITY_{majorVer} 1");
-            for (int ver = 2019; ver <= 2024; ver++)
+            for (int ver = 2019; ver <= 2023; ver++)
+            {
+                if (majorVer >= ver)
+                {
+                    lines.Add($"#define HYBRIDCLR_UNITY_{ver}_OR_NEW 1");
+                }
+            }
+            for (int ver = 6000; ver <= 6100; ver++)
             {
                 if (majorVer >= ver)
                 {
diff --git a/Editor/Installer/InstallerController.cs b/Editor/Installer/InstallerController.cs
index 2f7895e..5cbe7a1 100644
--- a/Editor/Installer/InstallerController.cs
+++ b/Editor/Installer/InstallerController.cs
@@ -122,10 +122,11 @@ namespace HybridCLR.Editor.Installer
         {
             switch(majorVersion)
             {
-                case 2019: return $"2019.4.0";
-                case 2020: return $"2020.3.0";
-                case 2021: return $"2021.3.0";
-                case 2022: return $"2022.3.0";
+                case 2019: return "2019.4.0";
+                case 2020: return "2020.3.0";
+                case 2021: return "2021.3.0";
+                case 2022: return "2022.3.0";
+                case 6000: return "6000.0.0";
                 default: return $"2020.3.0";
             }
         }
@@ -144,7 +145,7 @@ namespace HybridCLR.Editor.Installer
             {
                 return CompatibleType.Incompatible;
             }
-            if ((version.major == 2019 && version.minor1 < 4) || (version.major >= 2020 &&  version.minor1 < 3))
+            if ((version.major == 2019 && version.minor1 < 4) || (version.major >= 2020 &&  version.major < 6000 && version.minor1 < 3))
             {
                 return CompatibleType.MaybeIncompatible;
             }