Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Workflow Versions #771

Merged
merged 9 commits into from
Oct 20, 2024
Merged

Workflow Versions #771

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0cdc619
Redesigned metadata structure and workflow versioning
slxdy Oct 13, 2024
81707dc
Updated nuget workflow output path
slxdy Oct 13, 2024
57ab8ce
Cleanup
slxdy Oct 13, 2024
1906317
Fixed internal versioning
slxdy Oct 13, 2024
acc6b36
Cleanup
slxdy Oct 13, 2024
4583979
Minor fixes
slxdy Oct 13, 2024
fd0f266
Fixed workflows
slxdy Oct 13, 2024
7b98436
Fixed run name for PRs
slxdy Oct 13, 2024
f05c252
Optimized/simplified the Build workflow
slxdy Oct 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
364 changes: 172 additions & 192 deletions .github/workflows/build.yml
View file
Open in desktop

Large diffs are not rendered by default.

26 changes: 0 additions & 26 deletions .github/workflows/nuget.yml
View file
Open in desktop

This file was deleted.

6 changes: 1 addition & 5 deletions Dependencies/CompatibilityLayers/Demeo/Demeo.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
2 changes: 2 additions & 0 deletions Dependencies/CompatibilityLayers/Demeo/Module.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,8 @@
using System.Reflection;
using MelonLoader.Modules;

[assembly: MelonLoader.PatchShield]

namespace MelonLoader.CompatibilityLayers
{
internal class Demeo_Module : MelonModule
Expand Down
13 changes: 0 additions & 13 deletions Dependencies/CompatibilityLayers/Demeo/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

2 changes: 0 additions & 2 deletions Dependencies/CompatibilityLayers/IPA/IPA.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions Dependencies/CompatibilityLayers/IPA/Module.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@
using MelonLoader.Modules;
using MelonLoader.Resolver;

[assembly: MelonLoader.PatchShield]

namespace MelonLoader.CompatibilityLayers
{
internal class IPA_Module : MelonModule
Expand Down
13 changes: 0 additions & 13 deletions Dependencies/CompatibilityLayers/IPA/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Dependencies/CompatibilityLayers/Muse_Dash_Mono/Module.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
using ModHelper;
using MelonLoader.Resolver;

[assembly: MelonLoader.PatchShield]

namespace MelonLoader.CompatibilityLayers
{
internal class Muse_Dash_Mono_Module : MelonModule
Expand Down
2 changes: 0 additions & 2 deletions Dependencies/CompatibilityLayers/Muse_Dash_Mono/Muse_Dash_Mono.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
13 changes: 0 additions & 13 deletions Dependencies/CompatibilityLayers/Muse_Dash_Mono/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Dependencies/CompatibilityLayers/Stress_Level_Zero_Il2Cpp/Module.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,8 @@
using MelonLoader.Modules;
using System.Collections.Generic;

[assembly: MelonLoader.PatchShield]

namespace MelonLoader.CompatibilityLayers
{
internal class SLZ_Module : MelonModule
Expand Down
13 changes: 0 additions & 13 deletions Dependencies/CompatibilityLayers/Stress_Level_Zero_Il2Cpp/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

10 changes: 4 additions & 6 deletions Dependencies/CompatibilityLayers/Stress_Level_Zero_Il2Cpp/Stress_Level_Zero_Il2Cpp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
2 changes: 0 additions & 2 deletions Dependencies/Il2CppAssemblyGenerator/Il2CppAssemblyGenerator.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
12 changes: 0 additions & 12 deletions Dependencies/Il2CppAssemblyGenerator/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

47 changes: 23 additions & 24 deletions Dependencies/MelonStartScreen/MelonStartScreen.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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>
12 changes: 0 additions & 12 deletions Dependencies/MelonStartScreen/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

26 changes: 11 additions & 15 deletions Dependencies/SupportModules/Il2Cpp/Il2Cpp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand All @@ -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>
Expand Down
2 changes: 2 additions & 0 deletions Dependencies/SupportModules/Il2Cpp/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
13 changes: 0 additions & 13 deletions Dependencies/SupportModules/Il2Cpp/Properties/AssemblyInfo.cs
View file
Open in desktop

This file was deleted.

2 changes: 2 additions & 0 deletions Dependencies/SupportModules/Mono/Main.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@
using MelonLoader.Support.Preferences;
using UnityEngine;

[assembly: MelonLoader.PatchShield]

namespace MelonLoader.Support
{
internal static class Main
Expand Down
Loading
Loading