diff --git a/.github/workflows/aquamai.yaml b/.github/workflows/aquamai.yaml index dfc47b74..0a2a4044 100644 --- 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 index 6b90b201..1f101c88 100644 --- a/AquaMai/App.config +++ b/AquaMai/App.config @@ -9,6 +9,10 @@ + + + + - \ No newline at end of file + diff --git a/AquaMai/AquaMai.csproj b/AquaMai/AquaMai.csproj index fb34fd1b..e7d11e79 100644 --- a/AquaMai/AquaMai.csproj +++ b/AquaMai/AquaMai.csproj @@ -1,5 +1,6 @@  + Release @@ -49,6 +50,9 @@ Libs\Assembly-CSharp-firstpass.dll + + packages\ILMerge.Fody.1.24.0\lib\net452\ILMerge.dll + Libs\MelonLoader.dll @@ -74,8 +78,8 @@ Libs\System.Xml.dll - - Libs\Tomlet.dll + + packages\Samboy063.Tomlet.5.4.0\lib\net35\Tomlet.dll Libs\Unity.Analytics.DataPrivacy.dll @@ -312,9 +316,21 @@ + + + + + + + + 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}. + + + + diff --git a/AquaMai/FodyWeavers.xml b/AquaMai/FodyWeavers.xml new file mode 100644 index 00000000..4c95b1d1 --- /dev/null +++ b/AquaMai/FodyWeavers.xml @@ -0,0 +1,7 @@ + + + + tomlet + $AquaMai$_ + + \ No newline at end of file diff --git a/AquaMai/FodyWeavers.xsd b/AquaMai/FodyWeavers.xsd new file mode 100644 index 00000000..968f9b5e --- /dev/null +++ b/AquaMai/FodyWeavers.xsd @@ -0,0 +1,111 @@ + + + + + + + + + + + + A regular expression matching the assembly names to include in merging. + + + + + A regular expression matching the assembly names to exclude from merging. + + + + + A regular expression matching the resource names to include in merging. + + + + + A regular expression matching the resource names to exclude from merging. + + + + + A switch to control whether the imported types are hidden (made private) or keep their visibility unchanged. Default is 'true' + + + + + A string that is used as prefix for the namespace of the imported types. + + + + + A switch to control whether to import the full assemblies or only the referenced types. Default is 'false' + + + + + A switch to enable compacting of the target assembly by skipping properties, events and unused methods. Default is 'false' + + + + + + A regular expression matching the assembly names to include in merging. + + + + + A regular expression matching the assembly names to exclude from merging. + + + + + A regular expression matching the resource names to include in merging. + + + + + A regular expression matching the resource names to exclude from merging. + + + + + A switch to control whether the imported types are hidden (made private) or keep their visibility unchanged. Default is 'true' + + + + + A string that is used as prefix for the namespace of the imported types. + + + + + A switch to control whether to import the full assemblies or only the referenced types. Default is 'false' + + + + + A switch to enable compacting of the target assembly by skipping properties, events and unused methods. Default is 'false' + + + + + + + + 'true' to run assembly verification (PEVerify) on the target assembly after all weavers have been executed. + + + + + A comma-separated list of error codes that can be safely ignored in assembly verification. + + + + + 'false' to turn off automatic generation of the XML Schema file. + + + + + \ No newline at end of file diff --git a/AquaMai/Libs/Tomlet.dll b/AquaMai/Libs/Tomlet.dll deleted file mode 100644 index 0f941446..00000000 Binary files a/AquaMai/Libs/Tomlet.dll and /dev/null differ diff --git a/AquaMai/packages.config b/AquaMai/packages.config new file mode 100644 index 00000000..8addfc70 --- /dev/null +++ b/AquaMai/packages.config @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file