[+] Support all Melonloader versions

MewoLab · Sep 4, 2024 · 84c59e2 · 84c59e2
1 parent 212f60d
commit 84c59e2
Show file tree

Hide file tree

Showing 7 changed files with 148 additions and 4 deletions.
diff --git a/.github/workflows/aquamai.yaml b/.github/workflows/aquamai.yaml
@@ -36,7 +36,7 @@ jobs:
         run: |
           copy /y build-assets\${{ matrix.target }}\* AquaMai\Libs
           cd AquaMai
-          msbuild /p:Configuration=Release /p:DefineConstants="${{ matrix.target }}"
+          msbuild /t:Restore,Build /p:Configuration=Release /p:DefineConstants="${{ matrix.target }}" /p:RestorePackagesConfig=true
 
       - uses: actions/upload-artifact@v4
         with:

diff --git a/AquaMai/App.config b/AquaMai/App.config
@@ -9,6 +9,10 @@
         <assemblyIdentity name="System.Xml" publicKeyToken="b77a5c561934e089" culture="neutral" />
         <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="Tomlet" publicKeyToken="null" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-5.4.0.0" newVersion="5.4.0.0" />
+      </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>
diff --git a/AquaMai/AquaMai.csproj b/AquaMai/AquaMai.csproj
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="packages\ILMerge.Fody.1.24.0\build\ILMerge.Fody.props" Condition="Exists('packages\ILMerge.Fody.1.24.0\build\ILMerge.Fody.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Release</Configuration>
@@ -49,6 +50,9 @@
     <Reference Include="Assembly-CSharp-firstpass">
       <HintPath>Libs\Assembly-CSharp-firstpass.dll</HintPath>
     </Reference>
+    <Reference Include="ILMerge, Version=1.24.0.0, Culture=neutral, PublicKeyToken=4d0e9a1cbec0d397, processorArchitecture=MSIL">
+      <HintPath>packages\ILMerge.Fody.1.24.0\lib\net452\ILMerge.dll</HintPath>
+    </Reference>
     <Reference Include="MelonLoader">
       <HintPath>Libs\MelonLoader.dll</HintPath>
     </Reference>
@@ -74,8 +78,8 @@
     <Reference Include="System.Xml">
       <HintPath>Libs\System.Xml.dll</HintPath>
     </Reference>
-    <Reference Include="Tomlet">
-      <HintPath>Libs\Tomlet.dll</HintPath>
+    <Reference Include="Tomlet, Version=5.4.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>packages\Samboy063.Tomlet.5.4.0\lib\net35\Tomlet.dll</HintPath>
     </Reference>
     <Reference Include="Unity.Analytics.DataPrivacy">
       <HintPath>Libs\Unity.Analytics.DataPrivacy.dll</HintPath>
@@ -312,9 +316,21 @@
   <ItemGroup>
     <None Include="App.config" />
     <None Include="AquaMai.zh.toml" />
+    <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
     <None Include="AquaMai.toml" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="FodyWeavers.xml" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <Import Project="packages\Fody.6.8.1\build\Fody.targets" Condition="Exists('packages\Fody.6.8.1\build\Fody.targets')" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>This project references NuGet package(s) that are missing on this computer. Enable NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105.The missing file is {0}.</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('packages\Fody.6.8.1\build\Fody.targets')" Text="$([System.String]::Format('$(ErrorText)', 'packages\Fody.6.8.1\build\Fody.targets'))" />
+    <Error Condition="!Exists('packages\ILMerge.Fody.1.24.0\build\ILMerge.Fody.props')" Text="$([System.String]::Format('$(ErrorText)', 'packages\ILMerge.Fody.1.24.0\build\ILMerge.Fody.props'))" />
+  </Target>
 </Project>
diff --git a/AquaMai/FodyWeavers.xml b/AquaMai/FodyWeavers.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Weavers xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="FodyWeavers.xsd">
+  <ILMerge>
+    <IncludeAssemblies>tomlet</IncludeAssemblies>
+    <NamespacePrefix>$AquaMai$_</NamespacePrefix>
+  </ILMerge>
+</Weavers>
diff --git a/AquaMai/FodyWeavers.xsd b/AquaMai/FodyWeavers.xsd
@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="utf-8"?>
+<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema">
+  <!-- This file was generated by Fody. Manual changes to this file will be lost when your project is rebuilt. -->
+  <xs:element name="Weavers">
+    <xs:complexType>
+      <xs:all>
+        <xs:element name="ILMerge" minOccurs="0" maxOccurs="1">
+          <xs:complexType>
+            <xs:all>
+              <xs:element name="IncludeAssemblies" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>A regular expression matching the assembly names to include in merging.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="ExcludeAssemblies" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>A regular expression matching the assembly names to exclude from merging.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="IncludeResources" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>A regular expression matching the resource names to include in merging.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="ExcludeResources" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>A regular expression matching the resource names to exclude from merging.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="HideImportedTypes" type="xs:boolean" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>A switch to control whether the imported types are hidden (made private) or keep their visibility unchanged. Default is 'true'</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="NamespacePrefix" type="xs:string" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>A string that is used as prefix for the namespace of the imported types.</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="FullImport" type="xs:boolean" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>A switch to control whether to import the full assemblies or only the referenced types. Default is 'false'</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+              <xs:element name="CompactMode" type="xs:boolean" minOccurs="0" maxOccurs="1">
+                <xs:annotation>
+                  <xs:documentation>A switch to enable compacting of the target assembly by skipping properties, events and unused methods. Default is 'false'</xs:documentation>
+                </xs:annotation>
+              </xs:element>
+            </xs:all>
+            <xs:attribute name="IncludeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A regular expression matching the assembly names to include in merging.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ExcludeAssemblies" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A regular expression matching the assembly names to exclude from merging.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="IncludeResources" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A regular expression matching the resource names to include in merging.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="ExcludeResources" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A regular expression matching the resource names to exclude from merging.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="HideImportedTypes" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>A switch to control whether the imported types are hidden (made private) or keep their visibility unchanged. Default is 'true'</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="NamespacePrefix" type="xs:string">
+              <xs:annotation>
+                <xs:documentation>A string that is used as prefix for the namespace of the imported types.</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="FullImport" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>A switch to control whether to import the full assemblies or only the referenced types. Default is 'false'</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+            <xs:attribute name="CompactMode" type="xs:boolean">
+              <xs:annotation>
+                <xs:documentation>A switch to enable compacting of the target assembly by skipping properties, events and unused methods. Default is 'false'</xs:documentation>
+              </xs:annotation>
+            </xs:attribute>
+          </xs:complexType>
+        </xs:element>
+      </xs:all>
+      <xs:attribute name="VerifyAssembly" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="VerifyIgnoreCodes" type="xs:string">
+        <xs:annotation>
+          <xs:documentation>A comma-separated list of error codes that can be safely ignored in assembly verification.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+      <xs:attribute name="GenerateXsd" type="xs:boolean">
+        <xs:annotation>
+          <xs:documentation>'false' to turn off automatic generation of the XML Schema file.</xs:documentation>
+        </xs:annotation>
+      </xs:attribute>
+    </xs:complexType>
+  </xs:element>
+</xs:schema>
diff --git a/AquaMai/Libs/Tomlet.dll b/AquaMai/Libs/Tomlet.dll
diff --git a/AquaMai/packages.config b/AquaMai/packages.config
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Fody" version="6.8.1" targetFramework="net472" developmentDependency="true" />
+  <package id="ILMerge.Fody" version="1.24.0" targetFramework="net472" />
+  <package id="Samboy063.Tomlet" version="5.4.0" targetFramework="net472" />
+</packages>