From b848fc2c0a3440fc381c7f4e1a5bf628c131bff3 Mon Sep 17 00:00:00 2001 From: Merijn Hendriks Date: Fri, 26 Apr 2024 20:43:56 +0200 Subject: [PATCH 1/6] Add runner assemblies --- .gitignore | 3 +-- .gitmodules | 3 +++ References | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .gitmodules create mode 160000 References diff --git a/.gitignore b/.gitignore index 5cf05e7d..8087d5cf 100644 --- a/.gitignore +++ b/.gitignore @@ -371,5 +371,4 @@ FodyWeavers.xsd # Fika /Build /Properties/private.snk -/Properties/public.snk -/References \ No newline at end of file +/Properties/public.snk \ No newline at end of file diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..a647a612 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "References"] + path = References + url = https://github.com/project-fika/References.git diff --git a/References b/References new file mode 160000 index 00000000..c79307a8 --- /dev/null +++ b/References @@ -0,0 +1 @@ +Subproject commit c79307a8011144ad54d2bc6afb1f7e46c607f71c From dcbcec28d0a1f0c228198bd847fef053577c4938 Mon Sep 17 00:00:00 2001 From: Merijn Hendriks Date: Fri, 26 Apr 2024 20:44:47 +0200 Subject: [PATCH 2/6] Fix hollowed reference --- Fika.Core/Fika.Core.csproj | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Fika.Core/Fika.Core.csproj b/Fika.Core/Fika.Core.csproj index 07689c06..7d7b9d12 100644 --- a/Fika.Core/Fika.Core.csproj +++ b/Fika.Core/Fika.Core.csproj @@ -60,7 +60,7 @@ False - ..\References\Assembly-CSharp.dll + ..\References\hollowed.dll False From dce52fbea51b8d6ee9866d12b14d9edd987a78be Mon Sep 17 00:00:00 2001 From: Merijn Hendriks Date: Fri, 26 Apr 2024 20:47:10 +0200 Subject: [PATCH 3/6] Update readme --- README.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/README.md b/README.md index ac40ed23..6d6dbdf0 100644 --- a/README.md +++ b/README.md @@ -15,6 +15,15 @@ You are free to fork, improve and send PRs to improve the project. Please try to - [Visual Studio Code](https://code.visualstudio.com/) - [.NET SDK 8.0.x](https://dotnet.microsoft.com/en-us/download/dotnet/8.0) +## Setup + +- Fika developer: `git submodule update --init --recursive` +- Collaborator: + 1. Copy-paste the contents of `EscapeFromTarkov_Data/Managed/` into + `References/` + 2. Copy-paste from Aki.Modules `project/Shared/Hollowed/hollowed.dll` into + `References/` + ## Build ### Debug / Release From 1856913477a25c7542b312f8f2b696e5a5896c56 Mon Sep 17 00:00:00 2001 From: Merijn Hendriks Date: Sat, 27 Apr 2024 01:05:28 +0200 Subject: [PATCH 4/6] Add workflows --- .github/workflows/dotnet.yml | 40 ++++++++++++++++++++++++++++++++++++ 1 file changed, 40 insertions(+) create mode 100644 .github/workflows/dotnet.yml diff --git a/.github/workflows/dotnet.yml b/.github/workflows/dotnet.yml new file mode 100644 index 00000000..ea241d51 --- /dev/null +++ b/.github/workflows/dotnet.yml @@ -0,0 +1,40 @@ +name: .NET Test + +on: + workflow_dispatch: + push: + paths-ignore: + - '**/*.md' + pull_request: + paths-ignore: + - '**/*.md' + +jobs: + test: + runs-on: ubuntu-latest + + env: + DOTNET_NOLOGO: true + DOTNET_CLI_TELEMETRY_OPTOUT: true + + steps: + - name: Checkout repository + uses: actions/checkout@v4 + with: + submodules: recursive + token: ${{ secrets.FIKA_GITMODULES }} + + - name: Setup dotnet + uses: actions/setup-dotnet@v4 + with: + dotnet-version: '8.0.x' + + - name: Install dependencies + run: dotnet restore --configfile Nuget.config + + - name: Build + run: dotnet build --nologo --no-restore --configuration Debug + + - name: Test + run: dotnet test --nologo --no-restore --no-build --blame-hang-timeout 1min + \ No newline at end of file From 8f9f04cdde5d7c7d22301f2509d5ff720582d95a Mon Sep 17 00:00:00 2001 From: Merijn Hendriks Date: Sat, 27 Apr 2024 01:06:56 +0200 Subject: [PATCH 5/6] Change nuget caps pt.1 --- NuGet.Config => Nuget.config1 | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename NuGet.Config => Nuget.config1 (100%) diff --git a/NuGet.Config b/Nuget.config1 similarity index 100% rename from NuGet.Config rename to Nuget.config1 From 8ab2421dc2d54446f7c94fc376041e5f9b104d4c Mon Sep 17 00:00:00 2001 From: Merijn Hendriks Date: Sat, 27 Apr 2024 01:07:10 +0200 Subject: [PATCH 6/6] Change nuget caps pt.2 --- Nuget.config1 => Nuget.config | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename Nuget.config1 => Nuget.config (100%) diff --git a/Nuget.config1 b/Nuget.config similarity index 100% rename from Nuget.config1 rename to Nuget.config