Merge branch 'focus-creative-games:main' into main

Author: AlianBlank

Data~/hybridclr_version.json

@@ -2,27 +2,27 @@
     "versions": [
     {
         "unity_version":"2019",
-        "hybridclr" : { "branch":"v7.2.0"},
-        "il2cpp_plus": { "branch":"v2019-7.0.0"}
+        "hybridclr" : { "branch":"v7.3.0"},
+        "il2cpp_plus": { "branch":"v2019-7.3.0"}
     },
     {
         "unity_version":"2020",
-        "hybridclr" : { "branch":"v7.2.0"},
-        "il2cpp_plus": { "branch":"v2020-7.0.0"}
+        "hybridclr" : { "branch":"v7.3.0"},
+        "il2cpp_plus": { "branch":"v2020-7.3.0"}
     },
     {
         "unity_version":"2021",
-        "hybridclr" : { "branch":"v7.2.0"},
-        "il2cpp_plus": { "branch":"v2021-7.0.0"}
+        "hybridclr" : { "branch":"v7.3.0"},
+        "il2cpp_plus": { "branch":"v2021-7.3.0"}
     },
     {
         "unity_version":"2022",
-        "hybridclr" : { "branch":"v7.2.0"},
+        "hybridclr" : { "branch":"v7.3.0"},
         "il2cpp_plus": { "branch":"v2022-7.2.0"}
     },
     {
         "unity_version":"2022-tuanjie",
-        "hybridclr" : { "branch":"v7.2.0"},
+        "hybridclr" : { "branch":"v7.3.0"},
         "il2cpp_plus": { "branch":"v2022-tuanjie-7.1.0"}
     },
     {
@@ -32,7 +32,7 @@
     },
     {
         "unity_version":"6000",
-        "hybridclr" : { "branch":"v7.2.0"},
+        "hybridclr" : { "branch":"v7.3.0"},
         "il2cpp_plus": { "branch":"v6000-7.2.0"}
     }
     ]

Editor/BuildProcessors/CopyStrippedAOTAssemblies.cs

@@ -47,10 +47,15 @@ public static string GetStripAssembliesDir2021(BuildTarget target)
 #if UNITY_TVOS
                 case BuildTarget.tvOS:
 #endif
+                return $"{projectDir}/Library/Bee/artifacts/iOS/ManagedStripped";
 #if UNITY_VISIONOS
                 case BuildTarget.VisionOS:
+#if UNITY_6000_0_OR_NEWER
+                return $"{projectDir}/Library/Bee/artifacts/VisionOS/ManagedStripped";
+#else
+                return $"{projectDir}/Library/Bee/artifacts/iOS/ManagedStripped";
+#endif
 #endif
-                    return $"{projectDir}/Library/Bee/artifacts/iOS/ManagedStripped";
                 case BuildTarget.WebGL:
                     return $"{projectDir}/Library/Bee/artifacts/WebGL/ManagedStripped";
                 case BuildTarget.StandaloneOSX:

Editor/HotUpdate/MissingMetadataChecker.cs

@@ -13,17 +13,19 @@ public class MissingMetadataChecker
     {
         private readonly HashSet<string> _aotAssNames;
 
+        private readonly HashSet<string> _hotUpdateAssNames;
+
         private readonly AssemblyCache _assCache;
 
-        public MissingMetadataChecker(string aotDllDir, IEnumerable<string> excludeDllNames)
+        public MissingMetadataChecker(string aotDllDir, IEnumerable<string> hotUpdateAssNames)
         {
 
-            var excludeDllNameSet = new HashSet<string>(excludeDllNames ?? new List<string>());
+            _hotUpdateAssNames = new HashSet<string>(hotUpdateAssNames ?? new List<string>());
             _aotAssNames = new HashSet<string>();
             foreach (var aotFile in Directory.GetFiles(aotDllDir, "*.dll"))
             {
                 string aotAssName = Path.GetFileNameWithoutExtension(aotFile);
-                if (excludeDllNameSet.Contains(aotAssName))
+                if (_hotUpdateAssNames.Contains(aotAssName))
                 {
                     continue;
                 }
@@ -34,6 +36,8 @@ public MissingMetadataChecker(string aotDllDir, IEnumerable<string> excludeDllNa
 
         public bool Check(string hotUpdateDllPath)
         {
+            bool anyMissing = false;
+
             ModuleDef mod = ModuleDefMD.Load(File.ReadAllBytes(hotUpdateDllPath), _assCache.ModCtx);
 
             foreach (var refass in mod.GetAssemblyRefs())
@@ -43,9 +47,13 @@ public bool Check(string hotUpdateDllPath)
                 {
                     _assCache.LoadModule(refass.Name, true);
                 }
+                else if (!_hotUpdateAssNames.Contains(refAssName))
+                {
+                    UnityEngine.Debug.LogError($"Missing AOT Assembly: {refAssName}");
+                    anyMissing = true;
+                }
             }
 
-            bool anyMissing = false;
 
             foreach (TypeRef typeRef in mod.GetTypeRefs())
             {

RELEASELOG.md

@@ -1,5 +1,24 @@
 # ReleaseLog
 
+## 7.3.0
+
+Release Date: 2024-12-31.
+
+### Runtime
+
+- [fix] fix bug that Image::ReadRuntimeHandleFromMemberRef didn't inflate parent type when read field of GenericType
+- [fix] fix an issue occurred in InterpreterImage::GenerateCustomAttributesCacheInternal where HYBRIDCLR_METADATA_MALLOC was incorrectly used to allocate the cache. When occasional contention occurs, releasing memory using HYBRIDCLR_FREE causes a crash.
+- [fix] fixed a potential deadlock issue in Unity 2019 and 2020 versions within InterpreterImage::GenerateCustomAttributesCacheInternal, where il2cpp::vm::g_MetadataLock was held before running ConstructCustomAttribute.
+- [fix] fixed a bug in Unity 2019 and 2020 within InterpreterImage::GenerateCustomAttributesCacheInternal, where cache memory leaks occurred under multithreading contention.
+- [fix] fix the bug that InterpreterImage::ConstructCustomAttribute doesn't set write barrier for field
+- [fix] fix the bug that `InterpreterImage::InitTypeDefs_2` runs after `InitClassLayouts`, causing the `packingSize` field to be incorrectly initialized.
+- [fix] fix the bug in ClassFieldLayoutCalculator::LayoutFields where the alignment calculation incorrectly considers naturalAlignment, resulting in field offsets that are inconsistent with the actual field offsets in AOT. This bug originates from IL2CPP itself and only occurs in Unity 2021 and earlier versions.
+
+### Editor
+
+- [fix] fix the issue in Unity 6000 where the modification of the trimmed AOT DLL output directory for the visionOS build target caused CopyStrippedAOTAssemblies::GetStripAssembliesDir2021 to fail in copying AOT DLLs.
+- [fix] fix the bug where MissingMetadataChecker can't detect references to newly added AOT assemblies.
+
 ## 7.2.0
 
 Release Date: 2024-12-9.

package.json

@@ -1,6 +1,6 @@
 {
   "name": "com.code-philosophy.hybridclr",
-  "version": "7.2.0",
+  "version": "7.3.0",
   "displayName": "HybridCLR",
   "description": "HybridCLR is a fully featured, zero-cost, high-performance, low-memory solution for Unity's all-platform native c# hotupdate.",
   "category": "Runtime",