diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml index 71350684..abbeadc2 100644 --- a/.github/workflows/github_actions.yml +++ b/.github/workflows/github_actions.yml @@ -51,10 +51,10 @@ jobs: steps: - uses: actions/checkout@v3 - - name: Setup .NET 8 + - name: Setup .NET 9 uses: actions/setup-dotnet@v3 with: - dotnet-version: "8.0.x" + dotnet-version: "9.0.x" - name: Set version run: | echo "${{ needs.set_version.outputs.version }}" > Version diff --git a/Dotnet/VRCX-Cef.csproj b/Dotnet/VRCX-Cef.csproj index 7d6bb743..584e1b30 100644 --- a/Dotnet/VRCX-Cef.csproj +++ b/Dotnet/VRCX-Cef.csproj @@ -84,12 +84,12 @@ - - + + - + diff --git a/Dotnet/VRCX-Electron.csproj b/Dotnet/VRCX-Electron.csproj index ee6b52c1..b3e64411 100644 --- a/Dotnet/VRCX-Electron.csproj +++ b/Dotnet/VRCX-Electron.csproj @@ -5,7 +5,7 @@ - net8.0 + net9.0 x64 0 1.0.0.%2a @@ -92,12 +92,12 @@ - - + + - + diff --git a/package-lock.json b/package-lock.json index bbfe5a4f..816e8e6e 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8,7 +8,7 @@ "license": "MIT", "dependencies": { "hazardous": "^0.3.0", - "node-api-dotnet": "^0.8.19" + "node-api-dotnet": "^0.9.1" }, "devDependencies": { "@babel/eslint-parser": "^7.25.9", @@ -7876,9 +7876,9 @@ "optional": true }, "node_modules/node-api-dotnet": { - "version": "0.8.19", - "resolved": "https://registry.npmjs.org/node-api-dotnet/-/node-api-dotnet-0.8.19.tgz", - "integrity": "sha512-78rLSmzevFYvQo0E3UC57Q7oalgnN7YmsZpmhUuCwU2JAt8ro3F3JV1tabAsnmBC1votk2xwTQ3tLzdPTPzcvg==", + "version": "0.9.1", + "resolved": "https://registry.npmjs.org/node-api-dotnet/-/node-api-dotnet-0.9.1.tgz", + "integrity": "sha512-Y5rzYs7Ek3pZ2HXYGRpr0cciU7Zb/7TF75JKpmZ7ZofsDWGaqK3xM46510Vk0UXQwSekIKbUcAZlpaPpZravsA==", "license": "MIT" }, "node_modules/node-api-version": { diff --git a/package.json b/package.json index d2754e6e..f4c2396d 100644 --- a/package.json +++ b/package.json @@ -1,5 +1,6 @@ { "name": "VRCX", + "description": "Friendship management tool for VRChat", "private": true, "main": "src-electron/main.js", "scripts": { @@ -19,7 +20,7 @@ "keywords": [ "vrchat" ], - "author": "pypy ", + "author": "VRCX Team", "license": "MIT", "bugs": { "url": "https://github.com/vrcx-team/VRCX/issues" @@ -82,7 +83,7 @@ ], "asarUnpack": [ "node_modules/node-api-dotnet/**/*", - "node_modules/node-api-dotnet/net8.0/**/*", + "node_modules/node-api-dotnet/net9.0/**/*", "build/Electron/*", "build/Electron/**" ], @@ -96,12 +97,12 @@ "to": "app.asar.unpacked/build/Electron/" }, { - "from": "node_modules/node-api-dotnet/net8.0/Microsoft.JavaScript.NodeApi.dll", - "to": "app.asar.unpacked/node_modules/node-api-dotnet/net8.0/Microsoft.JavaScript.NodeApi.dll" + "from": "node_modules/node-api-dotnet/net9.0/Microsoft.JavaScript.NodeApi.dll", + "to": "app.asar.unpacked/node_modules/node-api-dotnet/net9.0/Microsoft.JavaScript.NodeApi.dll" }, { - "from": "node_modules/node-api-dotnet/net8.0/Microsoft.JavaScript.NodeApi.DotNetHost.dll", - "to": "app.asar.unpacked/node_modules/node-api-dotnet/net8.0/Microsoft.JavaScript.NodeApi.DotNetHost.dll" + "from": "node_modules/node-api-dotnet/net9.0/Microsoft.JavaScript.NodeApi.DotNetHost.dll", + "to": "app.asar.unpacked/node_modules/node-api-dotnet/net9.0/Microsoft.JavaScript.NodeApi.DotNetHost.dll" } ], "directories": { @@ -129,6 +130,6 @@ }, "dependencies": { "hazardous": "^0.3.0", - "node-api-dotnet": "^0.8.19" + "node-api-dotnet": "^0.9.1" } } diff --git a/src-electron/InteropApi.js b/src-electron/InteropApi.js index 888628f5..e5a118cd 100644 --- a/src-electron/InteropApi.js +++ b/src-electron/InteropApi.js @@ -1,4 +1,4 @@ -const dotnet = require('node-api-dotnet/net8.0'); +const dotnet = require('node-api-dotnet/net9.0'); class InteropApi { constructor() { diff --git a/src-electron/main.js b/src-electron/main.js index 8d77547d..f9af0e76 100644 --- a/src-electron/main.js +++ b/src-electron/main.js @@ -14,7 +14,10 @@ const fs = require('fs'); const https = require('https'); if (!isDotNetInstalled()) { - dialog.showErrorBox('VRCX', 'Please install .NET 8.0 Runtime to run VRCX.'); + dialog.showErrorBox( + 'VRCX', + 'Please install .NET 9.0 Runtime "dotnet-runtime-9.0" to run VRCX.' + ); app.quit(); return; } @@ -508,7 +511,7 @@ function isDotNetInstalled() { encoding: 'utf-8' } ); - return result.stdout?.includes('.NETCore.App 8.0'); + return result.stdout?.includes('.NETCore.App 9.0'); } function tryCopyFromWinePrefix() {