Merging from develop

CarbonCommunity · Jun 6, 2024 · e20a3ff · e20a3ff
2 parents aeaedb5 + 7db4b70
commit e20a3ff
Show file tree

Hide file tree

Showing 33 changed files with 191 additions and 147 deletions.
diff --git a/.github/workflows/client-build.yml b/.github/workflows/client-build.yml
@@ -34,7 +34,7 @@ jobs:
           echo "clock=$(date +'%H:%M:%S')" >> $GITHUB_OUTPUT
           echo "tag=$(date +'%Yd%j')" >> $GITHUB_OUTPUT
           echo "ref=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          echo "version=$(date +'1.%Y.%q%j.%M%S')" >> $GITHUB_OUTPUT
+          echo "version=2.8.$(curl -s -L 'https://carbonmod.gg/version?id=client&token=${{secrets.VERSIONS_TOKEN}}')" >> $GITHUB_OUTPUT
 
   # BUILD WINDOWS --------------------------------------------------------------
   build-windows:

diff --git a/.github/workflows/edge-build.yml b/.github/workflows/edge-build.yml
@@ -32,15 +32,16 @@ jobs:
 
       - name: 🔗 Checkout source code from github
         uses: actions/checkout@v3
-
+              
       - name: 📅 Prepare the environment
         id: step1
+        shell: bash
         run: |
           echo "date=$(date +'%Y-%m-%d')" >> $GITHUB_OUTPUT
           echo "clock=$(date +'%H:%M:%S')" >> $GITHUB_OUTPUT
           echo "tag=$(date +'%Yd%j')" >> $GITHUB_OUTPUT
           echo "ref=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          echo "version=$(date +'1.%Y.%q%j.%M%S')" >> $GITHUB_OUTPUT
+          echo "version=2.1.$(curl -s -L 'https://carbonmod.gg/version?id=edge&token=${{secrets.VERSIONS_TOKEN}}')" >> $GITHUB_OUTPUT
 
   # BUILD LINUX ----------------------------------------------------------------
   build-linux:
@@ -63,7 +64,7 @@ jobs:
       - name: 🛤️ Setup the dotnet build environment
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - uses: dtolnay/rust-toolchain@stable
       - uses: ClementTsang/cargo-action@v0.0.3
@@ -81,8 +82,8 @@ jobs:
         shell: bash
         run: |
           export VERSION=${{ needs.bootstrap.outputs.version }}
-          ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh DebugUnix "" "edge_build"
-          ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh MinimalUnix "" "edge_build"
+          ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh DebugUnix "EDGE" "edge_build"
+          ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh MinimalUnix "EDGE" "edge_build"
 
       - name: ⬆️ Upload the artifacts
         uses: actions/upload-artifact@v3
@@ -111,7 +112,7 @@ jobs:
       - name: 🛤️ Setup the dotnet build environment
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - uses: dtolnay/rust-toolchain@stable
       - uses: ClementTsang/cargo-action@v0.0.3
@@ -129,8 +130,8 @@ jobs:
         shell: cmd
         run: |
           set VERSION=${{ needs.bootstrap.outputs.version }}
-          call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Debug . edge_build
-          call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Minimal . edge_build
+          call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Debug EDGE edge_build
+          call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Minimal EDGE edge_build
 
       - name: ⬆️ Upload the artifacts
         uses: actions/upload-artifact@v3

diff --git a/.github/workflows/hook-build.yml b/.github/workflows/hook-build.yml
@@ -93,13 +93,11 @@ jobs:
     - name: 🛤️ Setup the dotnet build environment
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - name: 🔨 Built Carbon Hooks on Windows
       shell: cmd
-      run: |
-        call %GITHUB_WORKSPACE%\setup.bat
-
+      run: |            
         set OXIDE_HOOKS=https://carbonmod.gg/redist/oxide/%RUST_BRANCH%.opj
 
         if NOT "%OXIDE_HOOKS_OVERRIDE%" EQU "" (
@@ -108,6 +106,8 @@ jobs:
         
         set ROOT=%GITHUB_WORKSPACE%\Carbon.Core\Carbon.Hooks\Carbon.Hooks.Internal\Buildroot\Scripts
 
+        call %GITHUB_WORKSPACE%\Tools\Build\win\bootstrap.bat
+        
         if %DEBUG_BUILD% EQU true (
             cd %ROOT%
             echo Debug build is enabled.
@@ -124,6 +124,7 @@ jobs:
             echo Release build is disabled.
         )
 
+        cd %ROOT%
         call discord.bat %RUST_BRANCH% %PROTOCOL%
         
     - name: ⬆️ Artifacts - Upload
@@ -133,7 +134,7 @@ jobs:
         path: |
           Carbon.Core/Carbon.Hooks/Carbon.Hooks.Internal/FTP/*
           
-    - name: ⬆️ FTP - Upload Debug - Carbon.Hooks.Community
+    - name: ⬆️ FTP - Upload Debug (Carbon.Hooks.Community)
       uses: tomasbkk/action-ftp-upload@v1.0
       if: ${{ inputs.debug }}
       with:
@@ -143,7 +144,7 @@ jobs:
         src: "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Internal/FTP/server/debug/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Community.dll"
         dest: "server/debug/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Community.dll"
 
-    - name: ⬆️ FTP - Upload DebugUnix - Carbon.Hooks.Community
+    - name: ⬆️ FTP - Upload DebugUnix (Carbon.Hooks.Community)
       uses: tomasbkk/action-ftp-upload@v1.0
       if: ${{ inputs.debug }}
       with:
@@ -153,7 +154,7 @@ jobs:
         src: "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Internal/FTP/server/debugunix/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Community.dll"
         dest: "server/debugunix/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Community.dll"
 
-    - name: ⬆️ FTP - Upload Debug - Carbon.Hooks.Oxide
+    - name: ⬆️ FTP - Upload Debug (Carbon.Hooks.Oxide)
       uses: tomasbkk/action-ftp-upload@v1.0
       if: ${{ inputs.debug }}
       with:
@@ -163,7 +164,7 @@ jobs:
         src: "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Internal/FTP/server/debug/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Oxide.dll"
         dest: "server/debug/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Oxide.dll"
 
-    - name: ⬆️ FTP - Upload DebugUnix - Carbon.Hooks.Oxide
+    - name: ⬆️ FTP - Upload DebugUnix (Carbon.Hooks.Oxide)
       uses: tomasbkk/action-ftp-upload@v1.0
       if: ${{ inputs.debug }}
       with:
@@ -173,7 +174,7 @@ jobs:
         src: "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Internal/FTP/server/debugunix/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Oxide.dll"
         dest: "server/debugunix/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Oxide.dll"
 
-    - name: ⬆️ FTP - Upload Release - Carbon.Hooks.Community
+    - name: ⬆️ FTP - Upload Release (Carbon.Hooks.Community)
       uses: tomasbkk/action-ftp-upload@v1.0
       if: ${{ inputs.release }}
       with:
@@ -183,7 +184,7 @@ jobs:
         src: "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Internal/FTP/server/release/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Community.dll"
         dest: "server/release/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Community.dll"
 
-    - name: ⬆️ FTP - Upload ReleaseUnix - Carbon.Hooks.Community
+    - name: ⬆️ FTP - Upload ReleaseUnix (Carbon.Hooks.Community)
       uses: tomasbkk/action-ftp-upload@v1.0
       if: ${{ inputs.release }}
       with:
@@ -193,7 +194,7 @@ jobs:
         src: "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Internal/FTP/server/releaseunix/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Community.dll"
         dest: "server/releaseunix/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Community.dll"
 
-    - name: ⬆️ FTP - Upload Release - Carbon.Hooks.Oxide
+    - name: ⬆️ FTP - Upload Release (Carbon.Hooks.Oxide)
       uses: tomasbkk/action-ftp-upload@v1.0
       if: ${{ inputs.release }}
       with:
@@ -203,7 +204,7 @@ jobs:
         src: "Carbon.Core/Carbon.Hooks/Carbon.Hooks.Internal/FTP/server/release/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Oxide.dll"
         dest: "server/release/${{ inputs.protocol }}/carbon/managed/hooks/Carbon.Hooks.Oxide.dll"
 
-    - name: ⬆️ FTP - Upload ReleaseUnix - Carbon.Hooks.Oxide
+    - name: ⬆️ FTP - Upload ReleaseUnix (Carbon.Hooks.Oxide)
       uses: tomasbkk/action-ftp-upload@v1.0
       if: ${{ inputs.release }}
       with:

diff --git a/.github/workflows/preview-build.yml b/.github/workflows/preview-build.yml
@@ -44,7 +44,7 @@ jobs:
           echo "clock=$(date +'%H:%M:%S')" >> $GITHUB_OUTPUT
           echo "tag=$(date +'%Yd%j')" >> $GITHUB_OUTPUT
           echo "ref=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
-          echo "version=$(date +'1.%Y.%q%j.%M%S')" >> $GITHUB_OUTPUT
+          echo "version=2.2.$(curl -s -L 'https://carbonmod.gg/version?id=preview&token=${{secrets.VERSIONS_TOKEN}}')" >> $GITHUB_OUTPUT
 
   # BUILD LINUX ----------------------------------------------------------------
   build-linux:
@@ -68,7 +68,7 @@ jobs:
     - name: 🛤️ Setup the dotnet build environment
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - uses: dtolnay/rust-toolchain@stable
     - uses: ClementTsang/cargo-action@v0.0.3
@@ -92,8 +92,8 @@ jobs:
       shell: bash
       run: |
         export VERSION=${{ needs.bootstrap.outputs.version }}
-        ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh DebugUnix "" "preview_build"
-        ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh MinimalUnix "" "preview_build"
+        ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh DebugUnix "PREVIEW" "preview_build"
+        ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh MinimalUnix "PREVIEW" "preview_build"
 
     - name: ⬆️ Upload the artifacts
       uses: actions/upload-artifact@v3
@@ -123,7 +123,7 @@ jobs:
     - name: 🛤️ Setup the dotnet build environment
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - uses: dtolnay/rust-toolchain@stable
     - uses: ClementTsang/cargo-action@v0.0.3
@@ -147,8 +147,8 @@ jobs:
       shell: cmd
       run: |
         set VERSION=${{ needs.bootstrap.outputs.version }}
-        call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Debug . preview_build
-        call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Minimal . preview_build
+        call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Debug PREVIEW preview_build
+        call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Minimal PREVIEW preview_build
 
     - name: ⬆️ Upload the artifacts
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/production-build.yml b/.github/workflows/production-build.yml
@@ -42,7 +42,7 @@ jobs:
           echo "tag=$(date +'%Yd%j')" >> $GITHUB_OUTPUT
           echo "ref=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
           echo "wipe=$( [ $(date +%u) -eq 4 ] && [ $(date +%d) -le 7 ] && echo true || echo false )" >> $GITHUB_OUTPUT
-          echo "version=$(date +'1.%Y.%q%j.%M%S')" >> $GITHUB_OUTPUT
+          echo "version=2.0.$(curl -s -L 'https://carbonmod.gg/version?id=production&token=${{secrets.VERSIONS_TOKEN}}')" >> $GITHUB_OUTPUT
 
   # BUILD LINUX ----------------------------------------------------------------
   build-linux:
@@ -67,7 +67,7 @@ jobs:
     - name: 🛤️ Setup the dotnet build environment
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - uses: dtolnay/rust-toolchain@stable
     - uses: ClementTsang/cargo-action@v0.0.3
@@ -85,8 +85,8 @@ jobs:
       shell: bash
       run: |
         export VERSION=${{ needs.bootstrap.outputs.version }}
-        ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh ReleaseUnix "" "production_build"
-        ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh MinimalUnix "" "production_build"
+        ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh ReleaseUnix "PROD" "production_build"
+        ${GITHUB_WORKSPACE}/Tools/Build/linux/build.sh MinimalUnix "PROD" "production_build"
         
     - name: ⬆️ Upload the artifacts
       uses: actions/upload-artifact@v3
@@ -116,7 +116,7 @@ jobs:
     - name: 🛤️ Setup the dotnet build environment
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - uses: dtolnay/rust-toolchain@stable
     - uses: ClementTsang/cargo-action@v0.0.3
@@ -134,8 +134,8 @@ jobs:
       shell: cmd
       run: |
         set VERSION=${{ needs.bootstrap.outputs.version }}
-        call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Release . production_build
-        call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Minimal . production_build
+        call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Release PROD production_build
+        call %GITHUB_WORKSPACE%\Tools\Build\win\build.bat Minimal PROD production_build
 
     - name: ⬆️ Upload the artifacts
       uses: actions/upload-artifact@v3

diff --git a/.github/workflows/rust-aux01-build.yml b/.github/workflows/rust-aux01-build.yml
@@ -41,7 +41,7 @@ jobs:
           echo "tag=$(date +'%Yd%j')" >> $GITHUB_OUTPUT
           echo "ref=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
           echo "wipe=$( [ $(date +%u) -eq 4 ] && [ $(date +%d) -le 7 ] && echo true || echo false )" >> $GITHUB_OUTPUT
-          echo "version=$(date +'1.%Y.%q%j.%M%S')" >> $GITHUB_OUTPUT
+          echo "version=2.5.$(curl -s -L 'https://carbonmod.gg/version?id=aux01&token=${{secrets.VERSIONS_TOKEN}}')" >> $GITHUB_OUTPUT
 
   # BUILD LINUX ----------------------------------------------------------------
   build-linux:
@@ -66,7 +66,7 @@ jobs:
     - name: 🛤️ Setup the dotnet build environment
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - uses: dtolnay/rust-toolchain@stable
     - uses: ClementTsang/cargo-action@v0.0.3
@@ -120,7 +120,7 @@ jobs:
     - name: 🛤️ Setup the dotnet build environment
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - uses: dtolnay/rust-toolchain@stable
     - uses: ClementTsang/cargo-action@v0.0.3

diff --git a/.github/workflows/rust-aux02-build.yml b/.github/workflows/rust-aux02-build.yml
@@ -41,7 +41,7 @@ jobs:
           echo "tag=$(date +'%Yd%j')" >> $GITHUB_OUTPUT
           echo "ref=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
           echo "wipe=$( [ $(date +%u) -eq 4 ] && [ $(date +%d) -le 7 ] && echo true || echo false )" >> $GITHUB_OUTPUT
-          echo "version=$(date +'1.%Y.%q%j.%M%S')" >> $GITHUB_OUTPUT
+          echo "version=2.6.$(curl -s -L 'https://carbonmod.gg/version?id=aux02&token=${{secrets.VERSIONS_TOKEN}}')" >> $GITHUB_OUTPUT
 
   # BUILD LINUX ----------------------------------------------------------------
   build-linux:
@@ -66,7 +66,7 @@ jobs:
     - name: 🛤️ Setup the dotnet build environment
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - uses: dtolnay/rust-toolchain@stable
     - uses: ClementTsang/cargo-action@v0.0.3
@@ -120,7 +120,7 @@ jobs:
     - name: 🛤️ Setup the dotnet build environment
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - uses: dtolnay/rust-toolchain@stable
     - uses: ClementTsang/cargo-action@v0.0.3

diff --git a/.github/workflows/rust-release-build.yml b/.github/workflows/rust-release-build.yml
@@ -39,7 +39,7 @@ jobs:
           echo "tag=$(date +'%Yd%j')" >> $GITHUB_OUTPUT
           echo "ref=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
           echo "wipe=$( [ $(date +%u) -eq 4 ] && [ $(date +%d) -le 7 ] && echo true || echo false )" >> $GITHUB_OUTPUT
-          echo "version=$(date +'1.%Y.%q%j.%M%S')" >> $GITHUB_OUTPUT
+          echo "version=2.4.$(curl -s -L 'https://carbonmod.gg/version?id=release&token=${{secrets.VERSIONS_TOKEN}}')" >> $GITHUB_OUTPUT
 
   # BUILD LINUX ----------------------------------------------------------------
   build-linux:
@@ -63,7 +63,7 @@ jobs:
     - name: 🛤️ Setup the dotnet build environment
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - uses: dtolnay/rust-toolchain@stable
     - uses: ClementTsang/cargo-action@v0.0.3
@@ -116,7 +116,7 @@ jobs:
     - name: 🛤️ Setup the dotnet build environment
       uses: actions/setup-dotnet@v2
       with:
-        dotnet-version: 7.0.x
+        dotnet-version: 8.0.x
 
     - uses: dtolnay/rust-toolchain@stable
     - uses: ClementTsang/cargo-action@v0.0.3

diff --git a/.github/workflows/rust-staging-build.yml b/.github/workflows/rust-staging-build.yml
@@ -41,7 +41,7 @@ jobs:
           echo "tag=$(date +'%Yd%j')" >> $GITHUB_OUTPUT
           echo "ref=$(git rev-parse --short HEAD)" >> $GITHUB_OUTPUT
           echo "wipe=$( [ $(date +%u) -eq 4 ] && [ $(date +%d) -le 7 ] && echo true || echo false )" >> $GITHUB_OUTPUT
-          echo "version=$(date +'1.%Y.%q%j.%M%S')" >> $GITHUB_OUTPUT
+          echo "version=2.3.$(curl -s -L 'https://carbonmod.gg/version?id=staging&token=${{secrets.VERSIONS_TOKEN}}')" >> $GITHUB_OUTPUT
 
   # BUILD LINUX ----------------------------------------------------------------
   build-linux:
@@ -66,7 +66,7 @@ jobs:
       - name: 🛤️ Setup the dotnet build environment
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - uses: dtolnay/rust-toolchain@stable
       - uses: ClementTsang/cargo-action@v0.0.3
@@ -120,7 +120,7 @@ jobs:
       - name: 🛤️ Setup the dotnet build environment
         uses: actions/setup-dotnet@v2
         with:
-          dotnet-version: 7.0.x
+          dotnet-version: 8.0.x
 
       - uses: dtolnay/rust-toolchain@stable
       - uses: ClementTsang/cargo-action@v0.0.3

diff --git a/Carbon.Core/.msbuild/Common.props b/Carbon.Core/.msbuild/Common.props
@@ -28,7 +28,7 @@
 		<Authors>Carbon Community</Authors>
 		<Copyright>Copyright © 2022-$([System.DateTime]::Now.Year) $(Authors)</Copyright>
 		<PackageProjectUrl>https://discord.gg/carbonmod</PackageProjectUrl>
-		<RepositoryUrl>https://github.com/CarbonCommunity/Carbon.Core</RepositoryUrl>
+		<RepositoryUrl>https://github.com/CarbonCommunity/Carbon</RepositoryUrl>
 		<Description>A very lightweight and modular Harmony-based modding framework</Description>
 	</PropertyGroup>