Merge pull request #690 from ds5678/nuget-bump

Bump AsmResolver and AssetRipper.VersionUtilities
LavaGang · Jul 8, 2024 · c31f479 · c31f479
2 parents d738cbc + 979fe2e
commit c31f479
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 10 deletions.
diff --git a/Dependencies/Il2CppAssemblyGenerator/Il2CppAssemblyGenerator.csproj b/Dependencies/Il2CppAssemblyGenerator/Il2CppAssemblyGenerator.csproj
@@ -19,6 +19,6 @@
 		<PackageReference Include="Il2CppInterop.Common" Version="1.4.5" ExcludeAssets="Runtime" />
 		<PackageReference Include="Il2CppInterop.Runtime" Version="1.4.5" ExcludeAssets="Runtime" />
 		<PackageReference Include="Mono.Cecil" Version="0.11.5" ExcludeAssets="Runtime" />
-		<PackageReference Include="AssetRipper.VersionUtilities" Version="1.5.0" ExcludeAssets="Runtime" />
+		<PackageReference Include="AssetRipper.Primitives" Version="3.1.2" ExcludeAssets="Runtime" />
 	</ItemGroup>
 </Project>
diff --git a/Dependencies/MelonStartScreen/MelonStartScreen.csproj b/Dependencies/MelonStartScreen/MelonStartScreen.csproj
@@ -18,7 +18,7 @@
     </ItemGroup>
     <ItemGroup>
         <ProjectReference Include="..\..\MelonLoader\MelonLoader.csproj" Private="false" />
-        <PackageReference Include="AssetRipper.VersionUtilities" Version="1.5.0">
+        <PackageReference Include="AssetRipper.Primitives" Version="3.1.2">
           <ExcludeAssets>Runtime</ExcludeAssets>
         </PackageReference>
         <PackageReference Include="Samboy063.Tomlet" Version="5.3.1">

diff --git a/Dependencies/SupportModules/Il2Cpp/Il2Cpp.csproj b/Dependencies/SupportModules/Il2Cpp/Il2Cpp.csproj
@@ -39,7 +39,7 @@
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\MelonLoader\MelonLoader.csproj" Private="false" />
 		<PackageReference Include="HarmonyX" Version="2.10.2" ExcludeAssets="Runtime" />
-		<PackageReference Include="AssetRipper.VersionUtilities" Version="1.5.0" ExcludeAssets="Runtime" />
+		<PackageReference Include="AssetRipper.Primitives" Version="3.1.2" ExcludeAssets="Runtime" />
 		<PackageReference Include="Iced" Version="1.21.0" ExcludeAssets="Runtime" />
 		<PackageReference Include="Il2CppInterop.Common" Version="1.4.5" ExcludeAssets="Runtime" />
 		<PackageReference Include="Il2CppInterop.Runtime" Version="1.4.5" ExcludeAssets="Runtime" />

diff --git a/MelonLoader/InternalUtils/MelonStartScreen.cs b/MelonLoader/InternalUtils/MelonStartScreen.cs
@@ -1,7 +1,7 @@
 using System.IO;
 using MelonLoader.Modules;
 using MelonLoader.Utils;
-using UnityVersion = AssetRipper.VersionUtilities.UnityVersion;
+using UnityVersion = AssetRipper.Primitives.UnityVersion;
 
 namespace MelonLoader.InternalUtils
 {

diff --git a/MelonLoader/InternalUtils/UnityInformationHandler.cs b/MelonLoader/InternalUtils/UnityInformationHandler.cs
@@ -7,7 +7,7 @@
 using System.Text.RegularExpressions;
 using AssetsTools.NET;
 using AssetsTools.NET.Extra;
-using UnityVersion = AssetRipper.VersionUtilities.UnityVersion;
+using UnityVersion = AssetRipper.Primitives.UnityVersion;
 using System.Drawing;
 using MelonLoader.Utils;
 

diff --git a/MelonLoader/MelonLoader.csproj b/MelonLoader/MelonLoader.csproj
@@ -32,7 +32,7 @@
 		</PackageReference>
 	</ItemDefinitionGroup>
 	<ItemGroup>
-		<PackageReference Include="AssetRipper.VersionUtilities" Version="1.5.0" />
+		<PackageReference Include="AssetRipper.Primitives" Version="3.1.2" />
 		<PackageReference Include="AssetsTools.NET" Version="3.0.0" />
 		<PackageReference Include="HarmonyX" Version="2.10.2" />
 		<PackageReference Include="MonoMod.RuntimeDetour" Version="22.7.31.1" />
@@ -44,7 +44,7 @@
 		<PackageReference Include="MonoMod.RuntimeDetour.HookGen" Version="22.7.31.1" />
 	</ItemGroup>
 	<ItemGroup Condition="'$(TargetFramework)' == 'net6'">
-		<PackageReference Include="AsmResolver.DotNet" Version="5.5.1" />
+		<PackageReference Include="AsmResolver.DotNet" Version="6.0.0-beta.1" />
 		<PackageReference Include="Microsoft.Diagnostics.Runtime" Version="3.1.512801" />
 		<PackageReference Include="System.Configuration.ConfigurationManager" Version="8.0.0" />
 		<PackageReference Include="System.Drawing.Common" Version="8.0.6" />

diff --git a/MelonLoader/Utils/AssemblyVerifier.cs b/MelonLoader/Utils/AssemblyVerifier.cs
@@ -1,8 +1,7 @@
 #if NET6_0
 using AsmResolver.DotNet;
-using AsmResolver.PE.DotNet.Metadata.Strings;
+using AsmResolver.PE.DotNet.Metadata;
 using AsmResolver.PE.DotNet.Metadata.Tables;
-using AsmResolver.PE.DotNet.Metadata.Tables.Rows;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -42,7 +41,7 @@ internal static void EnsureInitialized()
             var dummyListToEnsureThisCodeDoesntGetNuked = new List<object>();
 
             //Force load AsmResolver
-            dummyListToEnsureThisCodeDoesntGetNuked.Add(new Constant(AsmResolver.PE.DotNet.Metadata.Tables.Rows.ElementType.Class, null));
+            dummyListToEnsureThisCodeDoesntGetNuked.Add(new Constant(AsmResolver.PE.DotNet.Metadata.Tables.ElementType.Class, null));
             dummyListToEnsureThisCodeDoesntGetNuked.Add(typeof(AsmResolver.PE.File.PEFile));
         }