Merge pull request #34 from Gilford92/update-tomlyn-dll

Updated Tomlyn dll with latest version (0.16.2)
1x-technologies · Aug 29, 2023 · c53ed7b · c53ed7b
2 parents f30f1cc + a354a8e
commit c53ed7b
Show file tree

Hide file tree

Showing 6 changed files with 46 additions and 75 deletions.
diff --git a/Editor/Halodi.PackageRegistryManager.Editor.asmdef b/Editor/Halodi.PackageRegistryManager.Editor.asmdef
@@ -11,9 +11,9 @@
     "allowUnsafeCode": false,
     "overrideReferences": true,
     "precompiledReferences": [
-        "860BB79D.Tomlyn.dll",
         "Newtonsoft.Json.dll",
-        "Unity.SharpZipLib.dll"
+        "Unity.SharpZipLib.dll",
+        "Tomlyn.dll"
     ],
     "autoReferenced": false,
     "defineConstraints": [],

diff --git a/Editor/Halodi/PackageRegistry/Core/UpgradePackagesManager.cs b/Editor/Halodi/PackageRegistry/Core/UpgradePackagesManager.cs
@@ -82,22 +82,29 @@ public PackageUpgradeState(UnityEditor.PackageManager.PackageInfo info)
                         }
                     }
 
-                    hasVerified = !String.IsNullOrWhiteSpace(info.versions.verified);
+#if UNITY_2022_2_OR_NEWER
+                    string verified = info.versions.recommended;
+#else
+                    string verified = info.versions.verified;
+#endif
+
+                    hasVerified = !String.IsNullOrWhiteSpace(verified);
+
                     if(hasVerified)
                     {
                         try
                         {
-                            verifiedVersion = SemVer.Parse(info.versions.verified);
+                            verifiedVersion = SemVer.Parse(verified);
                             if(verifiedVersion > current)
                             {
                                 verifiedAvailable = verifiedVersion > current;
-                                verified = info.name + "@" + info.versions.verified;
+                                verified = info.name + "@" + verified;
                             }
 
                         }
                         catch
                         {
-                            Debug.LogError("Cannot parse version for package " + info.displayName + ": " + info.versions.verified);
+                            Debug.LogError("Cannot parse version for package " + info.displayName + ": " + verified);
                         }
                     }
                 }

diff --git a/Editor/ThirdParty/860BB79D.Tomlyn.dll b/Editor/ThirdParty/860BB79D.Tomlyn.dll
diff --git a/Editor/ThirdParty/860BB79D.Tomlyn.dll.meta b/Editor/ThirdParty/860BB79D.Tomlyn.dll.meta
diff --git a/Editor/ThirdParty/Tomlyn.dll b/Editor/ThirdParty/Tomlyn.dll
diff --git a/Editor/ThirdParty/Tomlyn.dll.meta b/Editor/ThirdParty/Tomlyn.dll.meta