Merge pull request #771 from slxdy/metadata-versioning

Workflow Versions
LavaGang · Oct 20, 2024 · 3c26264 · 3c26264
2 parents b6d35c7 + f05c252
commit 3c26264
Show file tree

Hide file tree

Showing 43 changed files with 362 additions and 766 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
diff --git a/.github/workflows/nuget.yml b/.github/workflows/nuget.yml
diff --git a/Dependencies/CompatibilityLayers/Demeo/Demeo.csproj b/Dependencies/CompatibilityLayers/Demeo/Demeo.csproj
@@ -2,18 +2,14 @@
 	<PropertyGroup>
 		<RootNamespace>MelonLoader.CompatibilityLayers</RootNamespace>
 		<TargetFramework>net472</TargetFramework>
-		<LangVersion>Latest</LangVersion>
 		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\Dependencies\CompatibilityLayers\</OutputPath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<DebugType>embedded</DebugType>
 	</PropertyGroup>
 	<ItemGroup>
 		<ProjectReference Include="..\..\..\MelonLoader\MelonLoader.csproj" Private="false" />
-		<PackageReference Include="HarmonyX" Version="2.10.2">
-		  <ExcludeAssets>Runtime</ExcludeAssets>
-		</PackageReference>
+		<PackageReference Include="HarmonyX" Version="2.10.2" ExcludeAssets="Runtime" />
 	</ItemGroup>
 </Project>
diff --git a/Dependencies/CompatibilityLayers/Demeo/Module.cs b/Dependencies/CompatibilityLayers/Demeo/Module.cs
@@ -4,6 +4,8 @@
 using System.Reflection;
 using MelonLoader.Modules;
 
+[assembly: MelonLoader.PatchShield]
+
 namespace MelonLoader.CompatibilityLayers
 {
     internal class Demeo_Module : MelonModule

diff --git a/Dependencies/CompatibilityLayers/Demeo/Properties/AssemblyInfo.cs b/Dependencies/CompatibilityLayers/Demeo/Properties/AssemblyInfo.cs
diff --git a/Dependencies/CompatibilityLayers/IPA/IPA.csproj b/Dependencies/CompatibilityLayers/IPA/IPA.csproj
@@ -2,9 +2,7 @@
 	<PropertyGroup>
 		<RootNamespace>MelonLoader.CompatibilityLayers</RootNamespace>
 		<TargetFramework>net35</TargetFramework>
-		<LangVersion>Latest</LangVersion>
 		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\Dependencies\CompatibilityLayers\</OutputPath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/Dependencies/CompatibilityLayers/IPA/Module.cs b/Dependencies/CompatibilityLayers/IPA/Module.cs
@@ -7,6 +7,8 @@
 using MelonLoader.Modules;
 using MelonLoader.Resolver;
 
+[assembly: MelonLoader.PatchShield]
+
 namespace MelonLoader.CompatibilityLayers
 {
     internal class IPA_Module : MelonModule

diff --git a/Dependencies/CompatibilityLayers/IPA/Properties/AssemblyInfo.cs b/Dependencies/CompatibilityLayers/IPA/Properties/AssemblyInfo.cs
diff --git a/Dependencies/CompatibilityLayers/Muse_Dash_Mono/Module.cs b/Dependencies/CompatibilityLayers/Muse_Dash_Mono/Module.cs
@@ -6,6 +6,8 @@
 using ModHelper;
 using MelonLoader.Resolver;
 
+[assembly: MelonLoader.PatchShield]
+
 namespace MelonLoader.CompatibilityLayers
 {
     internal class Muse_Dash_Mono_Module : MelonModule

diff --git a/Dependencies/CompatibilityLayers/Muse_Dash_Mono/Muse_Dash_Mono.csproj b/Dependencies/CompatibilityLayers/Muse_Dash_Mono/Muse_Dash_Mono.csproj
@@ -2,9 +2,7 @@
 	<PropertyGroup>
 		<RootNamespace>MelonLoader.CompatibilityLayers</RootNamespace>
 		<TargetFramework>net35</TargetFramework>
-		<LangVersion>Latest</LangVersion>
 		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\Dependencies\CompatibilityLayers\</OutputPath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>

diff --git a/Dependencies/CompatibilityLayers/Muse_Dash_Mono/Properties/AssemblyInfo.cs b/Dependencies/CompatibilityLayers/Muse_Dash_Mono/Properties/AssemblyInfo.cs
diff --git a/Dependencies/CompatibilityLayers/Stress_Level_Zero_Il2Cpp/Module.cs b/Dependencies/CompatibilityLayers/Stress_Level_Zero_Il2Cpp/Module.cs
@@ -1,6 +1,8 @@
 using MelonLoader.Modules;
 using System.Collections.Generic;
 
+[assembly: MelonLoader.PatchShield]
+
 namespace MelonLoader.CompatibilityLayers
 {
     internal class SLZ_Module : MelonModule

diff --git a/Dependencies/CompatibilityLayers/Stress_Level_Zero_Il2Cpp/Properties/AssemblyInfo.cs b/Dependencies/CompatibilityLayers/Stress_Level_Zero_Il2Cpp/Properties/AssemblyInfo.cs
diff --git a/Dependencies/CompatibilityLayers/Stress_Level_Zero_Il2Cpp/Stress_Level_Zero_Il2Cpp.csproj b/Dependencies/CompatibilityLayers/Stress_Level_Zero_Il2Cpp/Stress_Level_Zero_Il2Cpp.csproj
@@ -2,9 +2,7 @@
 	<PropertyGroup>
 		<RootNamespace>MelonLoader.CompatibilityLayers</RootNamespace>
 		<TargetFramework>net472</TargetFramework>
-		<LangVersion>Latest</LangVersion>
 		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\Dependencies\CompatibilityLayers\</OutputPath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
@@ -17,9 +15,9 @@
 		<DefineConstants />
 	</PropertyGroup>
 	<ItemGroup>
-	  <ProjectReference Include="..\..\..\MelonLoader\MelonLoader.csproj">
-	    <Private>false</Private>
-	    <CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
-	  </ProjectReference>
+		<ProjectReference Include="..\..\..\MelonLoader\MelonLoader.csproj">
+			<Private>false</Private>
+			<CopyLocalSatelliteAssemblies>false</CopyLocalSatelliteAssemblies>
+		</ProjectReference>
 	</ItemGroup>
 </Project>
diff --git a/Dependencies/Il2CppAssemblyGenerator/Il2CppAssemblyGenerator.csproj b/Dependencies/Il2CppAssemblyGenerator/Il2CppAssemblyGenerator.csproj
@@ -2,9 +2,7 @@
 	<PropertyGroup>
 		<RootNamespace>MelonLoader.Il2CppAssemblyGenerator</RootNamespace>
 		<TargetFramework>net6</TargetFramework>
-		<LangVersion>Latest</LangVersion>
 		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\Dependencies\Il2CppAssemblyGenerator\</OutputPath>

diff --git a/Dependencies/Il2CppAssemblyGenerator/Properties/AssemblyInfo.cs b/Dependencies/Il2CppAssemblyGenerator/Properties/AssemblyInfo.cs
diff --git a/Dependencies/MelonStartScreen/MelonStartScreen.csproj b/Dependencies/MelonStartScreen/MelonStartScreen.csproj
@@ -1,26 +1,25 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <RootNamespace>MelonLoader.MelonStartScreen</RootNamespace>
-        <TargetFrameworks>net35;net6</TargetFrameworks>
-        <LangVersion>Latest</LangVersion>
-        <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-        <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
-        <AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
-        <OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\</OutputPath>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <DebugType>embedded</DebugType>
-    </PropertyGroup>
-    <ItemGroup>
-        <EmbeddedResource Include="Resources\Loading_Lemon.dat" />
-        <EmbeddedResource Include="Resources\Loading_Melon.dat" />
-        <EmbeddedResource Include="Resources\Logo_Lemon.dat" />
-        <EmbeddedResource Include="Resources\Logo_Melon.dat" />
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\..\MelonLoader\MelonLoader.csproj" Private="false" />
-		<PackageReference Include="AssetRipper.VersionUtilities" Version="1.5.0" ExcludeAssets="Runtime" />
-        <PackageReference Include="Samboy063.Tomlet" Version="5.4.0">
-          <ExcludeAssets>Runtime</ExcludeAssets>
-        </PackageReference>
-    </ItemGroup>
+	<PropertyGroup>
+		<RootNamespace>MelonLoader.MelonStartScreen</RootNamespace>
+		<TargetFrameworks>net35;net6</TargetFrameworks>
+		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+		<AppendTargetFrameworkToOutputPath>true</AppendTargetFrameworkToOutputPath>
+		<OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\</OutputPath>
+		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+		<DebugType>embedded</DebugType>
+	</PropertyGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="Resources\Loading_Lemon.dat" />
+		<EmbeddedResource Include="Resources\Loading_Melon.dat" />
+		<EmbeddedResource Include="Resources\Logo_Lemon.dat" />
+		<EmbeddedResource Include="Resources\Logo_Melon.dat" />
+	</ItemGroup>
+	<ItemGroup>
+		<ProjectReference Include="..\..\MelonLoader\MelonLoader.csproj" Private="false" />
+		<PackageReference Include="AssetRipper.VersionUtilities" Version="1.5.0"
+			ExcludeAssets="Runtime" />
+		<PackageReference Include="Samboy063.Tomlet" Version="5.4.0">
+			<ExcludeAssets>Runtime</ExcludeAssets>
+		</PackageReference>
+	</ItemGroup>
 </Project>
diff --git a/Dependencies/MelonStartScreen/Properties/AssemblyInfo.cs b/Dependencies/MelonStartScreen/Properties/AssemblyInfo.cs
diff --git a/Dependencies/SupportModules/Il2Cpp/Il2Cpp.csproj b/Dependencies/SupportModules/Il2Cpp/Il2Cpp.csproj
@@ -2,25 +2,16 @@
 	<PropertyGroup>
 		<RootNamespace>MelonLoader.Support</RootNamespace>
 		<TargetFramework>net6</TargetFramework>
-		<LangVersion>Latest</LangVersion>
 		<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-		<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
 		<AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
 		<OutputPath>$(SolutionDir)Output\$(Configuration)\MelonLoader\Dependencies\SupportModules\</OutputPath>
 		<AllowUnsafeBlocks>true</AllowUnsafeBlocks>
 		<DebugType>embedded</DebugType>
 		<DefineConstants>SM_Il2Cpp</DefineConstants>
 		<CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
 
-		<RestoreAdditionalProjectSources>
-			https://nuget.bepinex.dev/v3/index.json
-		</RestoreAdditionalProjectSources>
+		<RestoreAdditionalProjectSources>https://nuget.bepinex.dev/v3/index.json</RestoreAdditionalProjectSources>
 	</PropertyGroup>
-	<ItemGroup>
-	  <Compile Remove="Libs\**" />
-	  <EmbeddedResource Remove="Libs\**" />
-	  <None Remove="Libs\**" />
-	</ItemGroup>
 	<ItemGroup>
 		<Reference Include="Il2Cppmscorlib">
 			<HintPath>Libs\Il2Cppmscorlib.dll</HintPath>
@@ -44,13 +35,18 @@
 	<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.VersionUtilities" Version="1.5.0"
+			ExcludeAssets="Runtime" />
 		<PackageReference Include="Iced" Version="1.21.0" ExcludeAssets="Runtime" />
-		<PackageReference Include="Il2CppInterop.Common" Version="1.4.6-ci.579" ExcludeAssets="Runtime" />
-		<PackageReference Include="Il2CppInterop.Runtime" Version="1.4.6-ci.579" ExcludeAssets="Runtime" />
-		<PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.4.6-ci.579" ExcludeAssets="Runtime" />
+		<PackageReference Include="Il2CppInterop.Common" Version="1.4.6-ci.579"
+			ExcludeAssets="Runtime" />
+		<PackageReference Include="Il2CppInterop.Runtime" Version="1.4.6-ci.579"
+			ExcludeAssets="Runtime" />
+		<PackageReference Include="Il2CppInterop.HarmonySupport" Version="1.4.6-ci.579"
+			ExcludeAssets="Runtime" />
 		<PackageReference Include="Mono.Cecil" Version="0.11.5" ExcludeAssets="Runtime" />
-		<PackageReference Include="MonoMod.RuntimeDetour" Version="22.7.31.1" ExcludeAssets="Runtime" />
+		<PackageReference Include="MonoMod.RuntimeDetour" Version="22.7.31.1"
+			ExcludeAssets="Runtime" />
 		<PackageReference Include="MonoMod.Utils" Version="22.7.31.1" ExcludeAssets="Runtime" />
 		<PackageReference Include="Samboy063.Tomlet" Version="5.4.0" ExcludeAssets="Runtime" />
 	</ItemGroup>

diff --git a/Dependencies/SupportModules/Il2Cpp/Main.cs b/Dependencies/SupportModules/Il2Cpp/Main.cs
@@ -12,6 +12,8 @@
 using MelonLoader.Utils;
 using System.IO;
 
+[assembly: MelonLoader.PatchShield]
+
 #pragma warning disable CS0618 // Type or member is obsolete
 
 namespace MelonLoader.Support

diff --git a/Dependencies/SupportModules/Il2Cpp/Properties/AssemblyInfo.cs b/Dependencies/SupportModules/Il2Cpp/Properties/AssemblyInfo.cs
diff --git a/Dependencies/SupportModules/Mono/Main.cs b/Dependencies/SupportModules/Mono/Main.cs
@@ -3,6 +3,8 @@
 using MelonLoader.Support.Preferences;
 using UnityEngine;
 
+[assembly: MelonLoader.PatchShield]
+
 namespace MelonLoader.Support
 {
     internal static class Main