Merge branch 'master' of github.com:hubastard/nebula

NebulaModTeam · Sep 2, 2021 · 48a7bae · 48a7bae
2 parents 4e82547 + 7953d19
commit 48a7bae
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 8 deletions.
diff --git a/.github/scripts/thunderstore_bundle.js b/.github/scripts/thunderstore_bundle.js
@@ -51,6 +51,7 @@ const GH_ARCHIVE_PATH = join(
 const MOD_ICON_PATH = "thunderstore_icon.png";
 const README_PATH = "README.md";
 const CHANGELOG_PATH = "CHANGELOG.md";
+const BEPINEX_DEPENDENCY = "xiaoye97-BepInEx-5.4.11";
 
 async function main() {
   if (!existsSync(DIST_NEBULA_FOLDER)) {
@@ -119,11 +120,11 @@ function generateManifest() {
       "With this mod you will be able to play with your friends in the same game!",
     version_number: pluginInfo.version,
     dependencies: [
-      "xiaoye97-BepInEx-5.4.11",
+      BEPINEX_DEPENDENCY,
       `nebula-${apiPluginInfo.name}-${apiPluginInfo.version}`,
       "PhantomGamers-IlLine-1.0.0",
     ],
-    website_url: "https://github.com/hubastard/nebula",
+    website_url: "https://github.com/hubastard/nebula"
   };
   writeFileSync(
     join(DIST_NEBULA_FOLDER, "manifest.json"),
@@ -136,7 +137,10 @@ function generateApiManifest() {
     name: apiPluginInfo.name,
     description: "API for other mods to work with the Nebula Multiplayer Mod",
     version_number: apiPluginInfo.version,
-    website_url: "https://github.com/hubastard/nebula",
+    dependencies: [
+      BEPINEX_DEPENDENCY
+    ],
+    website_url: "https://github.com/hubastard/nebula"
   };
   writeFileSync(
     join(DIST_NEBULA_API_FOLDER, "manifest.json"),
@@ -265,18 +269,18 @@ async function createGHArchive() {
 function uploadToTStore() {
   try {
     child_process.execSync(
-      `"${DIST_TSTORE_CLI_EXE_PATH}" publish --file "${TSTORE_ARCHIVE_PATH}" --token "${process.env.TSTORE_TOKEN}" --use-session-auth`
+      `"${DIST_TSTORE_CLI_EXE_PATH}" publish --file "${TSTORE_API_ARCHIVE_PATH}" --token "${process.env.TSTORE_TOKEN}" --use-session-auth`
     );
   } catch (error) {
-    console.error(`Thunderstore upload failed for ${TSTORE_ARCHIVE_PATH}`);
+    console.error(`Thunderstore upload failed for ${TSTORE_API_ARCHIVE_PATH}`);
   }
 
   try {
     child_process.execSync(
-      `"${DIST_TSTORE_CLI_EXE_PATH}" publish --file "${TSTORE_API_ARCHIVE_PATH}" --token "${process.env.TSTORE_TOKEN}" --use-session-auth`
+      `"${DIST_TSTORE_CLI_EXE_PATH}" publish --file "${TSTORE_ARCHIVE_PATH}" --token "${process.env.TSTORE_TOKEN}" --use-session-auth`
     );
   } catch (error) {
-    console.error(`Thunderstore upload failed for ${TSTORE_API_ARCHIVE_PATH}`);
+    console.error(`Thunderstore upload failed for ${TSTORE_ARCHIVE_PATH}`);
   }
 }
 

diff --git a/.github/workflows/publish-release.yml b/.github/workflows/publish-release.yml
@@ -59,7 +59,7 @@ jobs:
       - name: Setup dotnet.exe
         uses: actions/setup-dotnet@v1
         with:
-          dotnet-version: "3.1.x"
+          dotnet-version: "5.0.x"
       - run: |
              dotnet tool install --tool-path . nbgv