Merge pull request #52 from Lordfirespeed/restructure

Restructure
u-2018 · Dec 29, 2023 · 2f729c4 · 2f729c4
2 parents a3ec109 + bb21b39
commit 2f729c4
Show file tree

Hide file tree

Showing 43 changed files with 998 additions and 1,028 deletions.
diff --git a/.github/actions/setup-netcode-weaver/NetcodePatcher.runtimeconfig.json b/.github/actions/setup-netcode-weaver/NetcodePatcher.runtimeconfig.json
diff --git a/.github/actions/setup-netcode-weaver/action.yml b/.github/actions/setup-netcode-weaver/action.yml
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -28,17 +28,20 @@ jobs:
           dotnet restore
       
       - name: Setup NetcodeWeaver
-        uses: ./.github/actions/setup-netcode-weaver
+        id: setup-netcode-weaver
+        uses: Lordfirespeed/setup-netcode-weaver@v0
         with:
           netcode-weaver-version: 2.4.0
+          deps-packages: '[{"id": "UnityEngine.Modules", "version": "2022.3.9"}, {"id": "LethalCompany.GameLibs.Steam", "version": "45.0.2-alpha.1"}]'
+          target-framework: "netstandard2.1"
 
       - name: Install Thunderstore CLI
         run: |
           dotnet tool install -g tcli
       
       - name: Build solution
         run: |
-          dotnet build
+          dotnet build -p:NETCODE_PATCHER_DIR="${{ steps.setup-netcode-weaver.outputs.netcode-weaver-directory }}"
           
       - name: Upload Artifacts
         uses: actions/upload-artifact@v4

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -26,17 +26,20 @@ jobs:
           dotnet restore
           
       - name: Setup NetcodeWeaver
-        uses: ./.github/actions/setup-netcode-weaver
+        id: setup-netcode-weaver
+        uses: Lordfirespeed/setup-netcode-weaver@v0
         with:
           netcode-weaver-version: 2.4.0
+          deps-packages: '[{"id": "UnityEngine.Modules", "version": "2022.3.9"}, {"id": "LethalCompany.GameLibs.Steam", "version": "45.0.2-alpha.1"}]'
+          target-framework: "netstandard2.1"
 
       - name: Install Thunderstore CLI
         run: |
           dotnet tool install -g tcli
           
       - name: Build and pack solution
         run: |
-          dotnet pack
+          dotnet pack -p:NETCODE_PATCHER_DIR="${{ steps.setup-netcode-weaver.outputs.netcode-weaver-directory }}"
 
       - name: Upload Thunderstore artifact
         uses: actions/upload-artifact@v4

diff --git a/.gitignore b/.gitignore
@@ -35,7 +35,11 @@ LC_API.dll
 
 ## Projects
 !LC-API.sln
-!LC-API.csproj
+
+### LC-API
+!LC-API/
+LC-API/[Bb]in/
+LC-API/[Oo]bj/
 
 ### Source Modules
 !BundleAPI

diff --git a/LC-API.sln b/LC-API.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.6.33829.357
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LC-API", "LC-API.csproj", "{D1BF6DDB-3AEE-4EF0-B6C8-4FBED65C75B9}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "LC-API", "LC-API/LC-API.csproj", "{D1BF6DDB-3AEE-4EF0-B6C8-4FBED65C75B9}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution