From 5bd6efbbb4fa87edaac7bb24679432be1e0a6ebe Mon Sep 17 00:00:00 2001
From: Natsumi <cmcooper123@hotmail.com>
Date: Sat, 11 Jan 2025 13:40:04 +1300
Subject: [PATCH] Update build script

---
 .github/workflows/github_actions.yml | 35 +++++++---------------------
 Dotnet/VRCX-Cef.csproj               |  6 ++++-
 build-scripts/make-junction.cmd      |  3 +--
 3 files changed, 14 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml
index 5d05bad9..85dc56fd 100644
--- a/.github/workflows/github_actions.yml
+++ b/.github/workflows/github_actions.yml
@@ -145,32 +145,13 @@ jobs:
           7z a -tzip ${file_name} * -mx=7 -xr0!*.log
           mv ${file_name} ../../${file_name}
           echo "Zip FileName: ${file_name}"
-
-      - name: Download Electron AppImage artifacts
-        uses: actions/download-artifact@v3
+      - name: Upload Setup artifact
+        uses: actions/upload-artifact@v3
         with:
-          name: Electron-AppImage
-
-      - name: Generate hashes
-        run: |
-          sha256sum "VRCX_${{ needs.set_version.outputs.version }}_Setup.exe" "VRCX_${{ needs.set_version.outputs.version }}.AppImage" > "SHA256SUMS.txt"
-      - name: Create Release
-        id: create_release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          name: VRCX-Setup
+          path: "VRCX_${{ needs.set_version.outputs.version }}_Setup.exe"
+      - name: Upload Zip artifact
+        uses: actions/upload-artifact@v3
         with:
-          tag_name: "${{ needs.set_version.outputs.version }}"
-          release_name: "VRCX Nightly ${{ needs.set_version.outputs.version }}"
-          draft: false
-          prerelease: false
-      - name: Upload multiple assets to release
-        uses: csexton/release-asset-action@v2
-        with:
-          files: |
-            VRCX_${{ needs.set_version.outputs.version }}_Setup.exe
-            VRCX_${{ needs.set_version.outputs.version }}.zip
-            VRCX_${{ needs.set_version.outputs.version }}.AppImage
-            SHA256SUMS.txt
-          github-token: ${{ secrets.GITHUB_TOKEN }}
-          release-url: ${{ steps.create_release.outputs.upload_url }}
+          name: VRCX-Zip
+          path: "VRCX_${{ needs.set_version.outputs.version }}.zip"
diff --git a/Dotnet/VRCX-Cef.csproj b/Dotnet/VRCX-Cef.csproj
index d1249b03..51b5a5f6 100644
--- a/Dotnet/VRCX-Cef.csproj
+++ b/Dotnet/VRCX-Cef.csproj
@@ -108,11 +108,15 @@
   </Target>
   
   <Target Name="PostBuild" AfterTargets="PostBuildEvent">
-    <Exec Command="$(ProjectDir)..\build-tools\Topten.nvpatch.exe --enable VRCX.exe" WorkingDirectory="$(OutDir)" />
+    <Exec Command="$(ProjectDir)..\build-tools\Topten.nvpatch.exe --enable $(ProjectDir)..\build\Cef\VRCX.exe" />
   </Target>
 
   <ItemGroup>
     <Content Remove="obj1\**" />
     <Compile Remove="obj1\**" />
   </ItemGroup>
+
+  <Target Name="PreBuild" BeforeTargets="PreBuildEvent">
+    <Exec Command="$(ProjectDir)..\build-scripts\make-junction.cmd" />
+  </Target>
 </Project>
\ No newline at end of file
diff --git a/build-scripts/make-junction.cmd b/build-scripts/make-junction.cmd
index 96cf248d..8d456d6d 100644
--- a/build-scripts/make-junction.cmd
+++ b/build-scripts/make-junction.cmd
@@ -1,2 +1 @@
-mklink /J "%~dp0\..\build\Cef\html" "%~dp0\..\build\html"
-pause
+mklink /J "%~dp0\..\build\Cef\html" "%~dp0\..\build\html"
\ No newline at end of file