From b27127c70127f6e1761d453d6086cee0760aa110 Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:05:13 -0500 Subject: [PATCH 01/12] initial workflow deployment --- .github/workflows/verify-build.yml | 37 ++++++++++++++++++++++++++++++ 1 file changed, 37 insertions(+) create mode 100644 .github/workflows/verify-build.yml diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml new file mode 100644 index 00000000..99593419 --- /dev/null +++ b/.github/workflows/verify-build.yml @@ -0,0 +1,37 @@ +name: Verify Successful Build + +on: + pull_request: + branches: + - bleeding-edge + - stable + +jobs: + build: + name: Verify Successful Build + runs-on: ubuntu-latest + + steps: + - name: Checkout Repo + uses: actions/checkout@v4 + + - name: Clone Game Assemblies + run: | + git clone https://x-access-token:${{ secrets.GH_PAT }}@github.com/KaBooMa/ScheduleOneAssemblies.git ./ScheduleOneAssemblies + + - name: Setup .NET + uses: actions/setup-dotnet@v4 + + - name: Restore .NET Dependencies + run: dotnet restore + + - name: Copy Game Assemblies into Project + run: | + cp -r ./ScheduleOneAssemblies/Il2CppAssemblies ./S1API/Il2CppAssemblies + cp -r ./ScheduleOneAssemblies/Managed ./S1API/Managed + + - name: Run .NET Build for Mono + run: dotnet build ./S1API/S1API/S1API.csproj -c Mono -f netstandard2.1 + + - name: Run .NET Build for Il2Cpp + run: dotnet build ./S1API/S1API/S1API.csproj -c Il2Cpp -f netstandard2.1 \ No newline at end of file From fd54b798d0a59e3055415204a3a5f9551f9f0d32 Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:07:09 -0500 Subject: [PATCH 02/12] Debug project files --- .github/workflows/verify-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml index 99593419..df325eb3 100644 --- a/.github/workflows/verify-build.yml +++ b/.github/workflows/verify-build.yml @@ -30,6 +30,10 @@ jobs: cp -r ./ScheduleOneAssemblies/Il2CppAssemblies ./S1API/Il2CppAssemblies cp -r ./ScheduleOneAssemblies/Managed ./S1API/Managed + - name: Debug project files + run: | + ls -R + - name: Run .NET Build for Mono run: dotnet build ./S1API/S1API/S1API.csproj -c Mono -f netstandard2.1 From 36ee20699404a5a1a75079487fb83cdb30f48082 Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:09:02 -0500 Subject: [PATCH 03/12] Added additional reruns for workflow --- .github/workflows/verify-build.yml | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml index df325eb3..113e9d52 100644 --- a/.github/workflows/verify-build.yml +++ b/.github/workflows/verify-build.yml @@ -2,6 +2,10 @@ name: Verify Successful Build on: pull_request: + types: + - opened + - reopened + - synchronize branches: - bleeding-edge - stable From 0e3fb8aefe87b6bad6f84e58fa295a914f4a2273 Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:17:41 -0500 Subject: [PATCH 04/12] * Updated assembly references * Removed debugging --- .github/workflows/verify-build.yml | 4 ---- .gitignore | 6 +++++- S1API/S1API.csproj | 26 +++++++++++++------------- 3 files changed, 18 insertions(+), 18 deletions(-) diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml index 113e9d52..d989ade8 100644 --- a/.github/workflows/verify-build.yml +++ b/.github/workflows/verify-build.yml @@ -33,10 +33,6 @@ jobs: run: | cp -r ./ScheduleOneAssemblies/Il2CppAssemblies ./S1API/Il2CppAssemblies cp -r ./ScheduleOneAssemblies/Managed ./S1API/Managed - - - name: Debug project files - run: | - ls -R - name: Run .NET Build for Mono run: dotnet build ./S1API/S1API/S1API.csproj -c Mono -f netstandard2.1 diff --git a/.gitignore b/.gitignore index 67dd7af1..a4b2271e 100644 --- a/.gitignore +++ b/.gitignore @@ -4,4 +4,8 @@ obj/ bin/ *.user -*Assemblies/ \ No newline at end of file + +# Local assembly references +Il2CppAssemblies/ +Managed/ +MelonLoader/ \ No newline at end of file diff --git a/S1API/S1API.csproj b/S1API/S1API.csproj index d34054dd..4da14bfb 100644 --- a/S1API/S1API.csproj +++ b/S1API/S1API.csproj @@ -14,16 +14,16 @@ ..\Il2CppAssemblies\Assembly-CSharp.dll - ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Schedule I\MelonLoader\net6\Il2CppInterop.Runtime.dll + ..\Il2CppAssemblies\Il2CppInterop.Runtime.dll - ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Schedule I\MelonLoader\net6\Il2CppInterop.Common.dll + ..\Il2CppAssemblies\Il2CppInterop.Common.dll - ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Schedule I\MelonLoader\net6\Il2CppInterop.HarmonySupport.dll + ..\Il2CppAssemblies\Il2CppInterop.HarmonySupport.dll - ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Schedule I\MelonLoader\net6\Il2CppInterop.Generator.dll + ..\Il2CppAssemblies\Il2CppInterop.Generator.dll ..\Il2CppAssemblies\Il2CppFishNet.Runtime.dll @@ -51,35 +51,35 @@ - ..\MonoAssemblies\Assembly-CSharp.dll + ..\Managed\Assembly-CSharp.dll - ..\MonoAssemblies\UnityEngine.dll + ..\Managed\UnityEngine.dll - ..\MonoAssemblies\UnityEngine.CoreModule.dll + ..\Managed\UnityEngine.CoreModule.dll - ..\MonoAssemblies\FishNet.Runtime.dll + ..\Managed\FishNet.Runtime.dll - ..\MonoAssemblies\UnityEngine.UI.dll + ..\Managed\UnityEngine.UI.dll - ..\MonoAssemblies\UnityEngine.UIModule.dll + ..\Managed\UnityEngine.UIModule.dll - ..\MonoAssemblies\UnityEngine.JSONSerializeModule.dll + ..\Managed\UnityEngine.JSONSerializeModule.dll - ..\..\..\..\..\Program Files (x86)\Steam\steamapps\common\Schedule I\MelonLoader\net6\0Harmony.dll + ..\MelonLoader\0Harmony.dll - ..\MonoAssemblies\Newtonsoft.Json.dll + ..\Managed\Newtonsoft.Json.dll From 1587dc0aa1312a431d3f1c9224bc0f06cec305a1 Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:20:24 -0500 Subject: [PATCH 05/12] * Updated assembly references * Updated proj path in workflow --- .github/workflows/verify-build.yml | 9 ++----- .gitignore | 4 +-- S1API/S1API.csproj | 40 +++++++++++++++--------------- 3 files changed, 23 insertions(+), 30 deletions(-) diff --git a/.github/workflows/verify-build.yml b/.github/workflows/verify-build.yml index d989ade8..8ed2d388 100644 --- a/.github/workflows/verify-build.yml +++ b/.github/workflows/verify-build.yml @@ -28,14 +28,9 @@ jobs: - name: Restore .NET Dependencies run: dotnet restore - - - name: Copy Game Assemblies into Project - run: | - cp -r ./ScheduleOneAssemblies/Il2CppAssemblies ./S1API/Il2CppAssemblies - cp -r ./ScheduleOneAssemblies/Managed ./S1API/Managed - name: Run .NET Build for Mono - run: dotnet build ./S1API/S1API/S1API.csproj -c Mono -f netstandard2.1 + run: dotnet build ./S1API/S1API.csproj -c Mono -f netstandard2.1 - name: Run .NET Build for Il2Cpp - run: dotnet build ./S1API/S1API/S1API.csproj -c Il2Cpp -f netstandard2.1 \ No newline at end of file + run: dotnet build ./S1API/S1API.csproj -c Il2Cpp -f netstandard2.1 \ No newline at end of file diff --git a/.gitignore b/.gitignore index a4b2271e..4ed0e2fc 100644 --- a/.gitignore +++ b/.gitignore @@ -6,6 +6,4 @@ bin/ *.user # Local assembly references -Il2CppAssemblies/ -Managed/ -MelonLoader/ \ No newline at end of file +ScheduleOneAssemblies/ \ No newline at end of file diff --git a/S1API/S1API.csproj b/S1API/S1API.csproj index 4da14bfb..a352422b 100644 --- a/S1API/S1API.csproj +++ b/S1API/S1API.csproj @@ -11,75 +11,75 @@ - ..\Il2CppAssemblies\Assembly-CSharp.dll + ..\ScheduleOneAssemblies\Il2CppAssemblies\Assembly-CSharp.dll - ..\Il2CppAssemblies\Il2CppInterop.Runtime.dll + ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2CppInterop.Runtime.dll - ..\Il2CppAssemblies\Il2CppInterop.Common.dll + ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2CppInterop.Common.dll ..\Il2CppAssemblies\Il2CppInterop.HarmonySupport.dll - ..\Il2CppAssemblies\Il2CppInterop.Generator.dll + ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2CppInterop.Generator.dll - ..\Il2CppAssemblies\Il2CppFishNet.Runtime.dll + ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2CppFishNet.Runtime.dll - ..\Il2CppAssemblies\Il2Cppmscorlib.dll + ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2Cppmscorlib.dll - ..\IL2CppAssemblies\UnityEngine.dll + ..\ScheduleOneAssemblies\IL2CppAssemblies\UnityEngine.dll - ..\IL2CppAssemblies\UnityEngine.CoreModule.dll + ..\ScheduleOneAssemblies\IL2CppAssemblies\UnityEngine.CoreModule.dll - ..\IL2CppAssemblies\UnityEngine.UI.dll + ..\ScheduleOneAssemblies\IL2CppAssemblies\UnityEngine.UI.dll - ..\IL2CppAssemblies\UnityEngine.UIModule.dll + ..\ScheduleOneAssemblies\IL2CppAssemblies\UnityEngine.UIModule.dll - ..\Il2CppAssemblies\UnityEngine.JSONSerializeModule.dll + ..\ScheduleOneAssemblies\Il2CppAssemblies\UnityEngine.JSONSerializeModule.dll - ..\Managed\Assembly-CSharp.dll + ..\ScheduleOneAssemblies\Managed\Assembly-CSharp.dll - ..\Managed\UnityEngine.dll + ..\ScheduleOneAssemblies\Managed\UnityEngine.dll - ..\Managed\UnityEngine.CoreModule.dll + ..\ScheduleOneAssemblies\Managed\UnityEngine.CoreModule.dll - ..\Managed\FishNet.Runtime.dll + ..\ScheduleOneAssemblies\Managed\FishNet.Runtime.dll - ..\Managed\UnityEngine.UI.dll + ..\ScheduleOneAssemblies\Managed\UnityEngine.UI.dll - ..\Managed\UnityEngine.UIModule.dll + ..\ScheduleOneAssemblies\Managed\UnityEngine.UIModule.dll - ..\Managed\UnityEngine.JSONSerializeModule.dll + ..\ScheduleOneAssemblies\Managed\UnityEngine.JSONSerializeModule.dll - ..\MelonLoader\0Harmony.dll + ..\ScheduleOneAssemblies\MelonLoader\0Harmony.dll - ..\Managed\Newtonsoft.Json.dll + ..\ScheduleOneAssemblies\Managed\Newtonsoft.Json.dll From 73c2c71789e937bd1408a4291218d835fc53150e Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:27:49 -0500 Subject: [PATCH 06/12] * Resolved PhoneApp deps * Disabled BuildUI in PhoneApp til @omar-akermi can review --- S1API/PhoneApp/PhoneApp.cs | 3 ++- S1API/S1API.csproj | 12 ++++++++++++ 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/S1API/PhoneApp/PhoneApp.cs b/S1API/PhoneApp/PhoneApp.cs index 53f6136d..9242e836 100644 --- a/S1API/PhoneApp/PhoneApp.cs +++ b/S1API/PhoneApp/PhoneApp.cs @@ -160,7 +160,8 @@ private void SetupExistingAppPanel(GameObject panel, MelonLogger.Instance logger if (container.transform.childCount < 2) { ClearContainer(container); - BuildUI(container); + // TODO: (@omar-akermi) Looks like a method got relabeled. Need to resolve :( + // BuildUI(container); } } diff --git a/S1API/S1API.csproj b/S1API/S1API.csproj index a352422b..b1006e88 100644 --- a/S1API/S1API.csproj +++ b/S1API/S1API.csproj @@ -46,6 +46,12 @@ ..\ScheduleOneAssemblies\Il2CppAssemblies\UnityEngine.JSONSerializeModule.dll + + ..\ScheduleOneAssemblies\Il2CppAssemblies\UnityEngine.TextRenderingModule.dll + + + ..\ScheduleOneAssemblies\Il2CppAssemblies\UnityEngine.ImageConversionModule.dll + @@ -71,6 +77,12 @@ ..\ScheduleOneAssemblies\Managed\UnityEngine.JSONSerializeModule.dll + + ..\ScheduleOneAssemblies\Managed\UnityEngine.TextRenderingModule.dll + + + ..\ScheduleOneAssemblies\Managed\UnityEngine.ImageConversionModule.dll + From 759882c6c6d5c9e832bb2f4685630d6882d6dce6 Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:32:27 -0500 Subject: [PATCH 07/12] Removed local post-build scripts --- S1API/S1API.csproj | 6 ------ 1 file changed, 6 deletions(-) diff --git a/S1API/S1API.csproj b/S1API/S1API.csproj index b1006e88..093c47e1 100644 --- a/S1API/S1API.csproj +++ b/S1API/S1API.csproj @@ -97,10 +97,4 @@ - - - - - - From abf990d7ca20dbad384407c010722ffc67f4d174 Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:34:22 -0500 Subject: [PATCH 08/12] Updated .csproj --- S1API/S1API.csproj | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/S1API/S1API.csproj b/S1API/S1API.csproj index 093c47e1..1b395f79 100644 --- a/S1API/S1API.csproj +++ b/S1API/S1API.csproj @@ -93,8 +93,6 @@ ..\ScheduleOneAssemblies\Managed\Newtonsoft.Json.dll - - - + From b3e1c457e34827f6ad3a83b17a3051bb3f88f022 Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:40:58 -0500 Subject: [PATCH 09/12] Fixed casing on deps --- S1API/S1API.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/S1API/S1API.csproj b/S1API/S1API.csproj index 1b395f79..b1266853 100644 --- a/S1API/S1API.csproj +++ b/S1API/S1API.csproj @@ -32,16 +32,16 @@ ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2Cppmscorlib.dll - ..\ScheduleOneAssemblies\IL2CppAssemblies\UnityEngine.dll + ..\ScheduleOneAssemblies\Il2CppAssemblies\UnityEngine.dll - ..\ScheduleOneAssemblies\IL2CppAssemblies\UnityEngine.CoreModule.dll + ..\ScheduleOneAssemblies\Il2CppAssemblies\UnityEngine.CoreModule.dll - ..\ScheduleOneAssemblies\IL2CppAssemblies\UnityEngine.UI.dll + ..\ScheduleOneAssemblies\Il2CppAssemblies\UnityEngine.UI.dll - ..\ScheduleOneAssemblies\IL2CppAssemblies\UnityEngine.UIModule.dll + ..\ScheduleOneAssemblies\Il2CppAssemblies\UnityEngine.UIModule.dll ..\ScheduleOneAssemblies\Il2CppAssemblies\UnityEngine.JSONSerializeModule.dll From 6f45359609603a2fac57a7a80d47fbaf7d3c2056 Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:43:57 -0500 Subject: [PATCH 10/12] Fixed deps --- S1API/S1API.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/S1API/S1API.csproj b/S1API/S1API.csproj index b1266853..6453b12e 100644 --- a/S1API/S1API.csproj +++ b/S1API/S1API.csproj @@ -14,13 +14,13 @@ ..\ScheduleOneAssemblies\Il2CppAssemblies\Assembly-CSharp.dll - ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2CppInterop.Runtime.dll + ..\MelonLoader\Il2CppAssemblies\Il2CppInterop.Runtime.dll - ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2CppInterop.Common.dll + ..\MelonLoader\Il2CppAssemblies\Il2CppInterop.Common.dll - ..\Il2CppAssemblies\Il2CppInterop.HarmonySupport.dll + ..\MelonLoader\Il2CppInterop.HarmonySupport.dll ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2CppInterop.Generator.dll From b370e1dcd6de13e2ecb56dba0a2f56889b52d84c Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:46:38 -0500 Subject: [PATCH 11/12] Fixed deps --- S1API/S1API.csproj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/S1API/S1API.csproj b/S1API/S1API.csproj index 6453b12e..661ed022 100644 --- a/S1API/S1API.csproj +++ b/S1API/S1API.csproj @@ -14,16 +14,16 @@ ..\ScheduleOneAssemblies\Il2CppAssemblies\Assembly-CSharp.dll - ..\MelonLoader\Il2CppAssemblies\Il2CppInterop.Runtime.dll + ..\MelonLoader\Il2CppInterop.Runtime.dll - ..\MelonLoader\Il2CppAssemblies\Il2CppInterop.Common.dll + ..\MelonLoader\Il2CppInterop.Common.dll ..\MelonLoader\Il2CppInterop.HarmonySupport.dll - ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2CppInterop.Generator.dll + ..\MelonLoader\Il2CppInterop.Generator.dll ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2CppFishNet.Runtime.dll From 3008366c9354cc65b614b40182756777163215e3 Mon Sep 17 00:00:00 2001 From: KaBooMa Date: Sun, 20 Apr 2025 01:48:54 -0500 Subject: [PATCH 12/12] Fixed deps --- S1API/S1API.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/S1API/S1API.csproj b/S1API/S1API.csproj index 661ed022..e09844d5 100644 --- a/S1API/S1API.csproj +++ b/S1API/S1API.csproj @@ -14,16 +14,16 @@ ..\ScheduleOneAssemblies\Il2CppAssemblies\Assembly-CSharp.dll - ..\MelonLoader\Il2CppInterop.Runtime.dll + ..\ScheduleOneAssemblies\MelonLoader\Il2CppInterop.Runtime.dll - ..\MelonLoader\Il2CppInterop.Common.dll + ..\ScheduleOneAssemblies\MelonLoader\Il2CppInterop.Common.dll - ..\MelonLoader\Il2CppInterop.HarmonySupport.dll + ..\ScheduleOneAssemblies\MelonLoader\Il2CppInterop.HarmonySupport.dll - ..\MelonLoader\Il2CppInterop.Generator.dll + ..\ScheduleOneAssemblies\MelonLoader\Il2CppInterop.Generator.dll ..\ScheduleOneAssemblies\Il2CppAssemblies\Il2CppFishNet.Runtime.dll