MrUnknownDE/VRCX
1
0
Fork 0
mirror of https://github.com/MrUnknownDE/VRCX.git synced 2026-05-06 22:46:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update Linux build to .NET 9.0

Browse Source
This commit is contained in:
Natsumi
2025-02-03 20:21:50 +13:00
parent 6cc10ad8af
commit 6c411db832
7 changed files with 27 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/github_actions.yml
+2 -2
View File
@@ -51,10 +51,10 @@ jobs:
steps: steps:
- uses: actions/checkout@v3 - uses: actions/checkout@v3
- name: Setup .NET 8 - name: Setup .NET 9
uses: actions/setup-dotnet@v3 uses: actions/setup-dotnet@v3
with: with:
dotnet-version: "8.0.x" dotnet-version: "9.0.x"
- name: Set version - name: Set version
run: | run: |
echo "${{ needs.set_version.outputs.version }}" > Version echo "${{ needs.set_version.outputs.version }}" > Version
Dotnet/VRCX-Cef.csproj
+3 -3
View File
@@ -84,12 +84,12 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="CefSharp.OffScreen.NETCore" Version="131.3.50" /> <PackageReference Include="CefSharp.OffScreen.NETCore" Version="132.3.11" />
<PackageReference Include="CefSharp.WinForms.NETCore" Version="131.3.50" /> <PackageReference Include="CefSharp.WinForms.NETCore" Version="132.3.11" />
<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" /> <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" /> <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.3.4" /> <PackageReference Include="NLog" Version="5.4.0" />
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" /> <PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" /> <PackageReference Include="SharpDX.Mathematics" Version="4.2.0" />
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" /> <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
Dotnet/VRCX-Electron.csproj
+4 -4
View File
@@ -5,7 +5,7 @@
</PropertyGroup> </PropertyGroup>
<Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" /> <Import Sdk="Microsoft.NET.Sdk" Project="Sdk.props" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net9.0</TargetFramework>
<Platforms>x64</Platforms> <Platforms>x64</Platforms>
<ApplicationRevision>0</ApplicationRevision> <ApplicationRevision>0</ApplicationRevision>
<ApplicationVersion>1.0.0.%2a</ApplicationVersion> <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
@@ -92,12 +92,12 @@
</Content> </Content>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.JavaScript.NodeApi" Version="0.8.20" /> <PackageReference Include="Microsoft.JavaScript.NodeApi" Version="0.9.1" />
<PackageReference Include="Microsoft.JavaScript.NodeApi.Generator" Version="0.8.20" /> <PackageReference Include="Microsoft.JavaScript.NodeApi.Generator" Version="0.9.1" />
<PackageReference Include="DiscordRichPresence" Version="1.2.1.24" /> <PackageReference Include="DiscordRichPresence" Version="1.2.1.24" />
<PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" /> <PackageReference Include="Microsoft.Toolkit.Uwp.Notifications" Version="7.1.3" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.3" /> <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
<PackageReference Include="NLog" Version="5.3.4" /> <PackageReference Include="NLog" Version="5.4.0" />
<PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" /> <PackageReference Include="SharpDX.Direct3D11" Version="4.2.0" />
<PackageReference Include="SharpDX.Mathematics" Version="4.2.0" /> <PackageReference Include="SharpDX.Mathematics" Version="4.2.0" />
<PackageReference Include="sqlite-net-pcl" Version="1.9.172" /> <PackageReference Include="sqlite-net-pcl" Version="1.9.172" />
package-lock.json
Generated
+4 -4
View File
@@ -8,7 +8,7 @@
"license": "MIT", "license": "MIT",
"dependencies": { "dependencies": {
"hazardous": "^0.3.0", "hazardous": "^0.3.0",
"node-api-dotnet": "^0.8.19" "node-api-dotnet": "^0.9.1"
}, },
"devDependencies": { "devDependencies": {
"@babel/eslint-parser": "^7.25.9", "@babel/eslint-parser": "^7.25.9",
@@ -7876,9 +7876,9 @@
"optional": true "optional": true
}, },
"node_modules/node-api-dotnet": { "node_modules/node-api-dotnet": {
"version": "0.8.19", "version": "0.9.1",
"resolved": "https://registry.npmjs.org/node-api-dotnet/-/node-api-dotnet-0.8.19.tgz", "resolved": "https://registry.npmjs.org/node-api-dotnet/-/node-api-dotnet-0.9.1.tgz",
"integrity": "sha512-78rLSmzevFYvQo0E3UC57Q7oalgnN7YmsZpmhUuCwU2JAt8ro3F3JV1tabAsnmBC1votk2xwTQ3tLzdPTPzcvg==", "integrity": "sha512-Y5rzYs7Ek3pZ2HXYGRpr0cciU7Zb/7TF75JKpmZ7ZofsDWGaqK3xM46510Vk0UXQwSekIKbUcAZlpaPpZravsA==",
"license": "MIT" "license": "MIT"
}, },
"node_modules/node-api-version": { "node_modules/node-api-version": {
package.json
+8 -7
View File
@@ -1,5 +1,6 @@
{ {
"name": "VRCX", "name": "VRCX",
"description": "Friendship management tool for VRChat",
"private": true, "private": true,
"main": "src-electron/main.js", "main": "src-electron/main.js",
"scripts": { "scripts": {
@@ -19,7 +20,7 @@
"keywords": [ "keywords": [
"vrchat" "vrchat"
], ],
"author": "pypy <git@pypy.moe>", "author": "VRCX Team",
"license": "MIT", "license": "MIT",
"bugs": { "bugs": {
"url": "https://github.com/vrcx-team/VRCX/issues" "url": "https://github.com/vrcx-team/VRCX/issues"
@@ -82,7 +83,7 @@
], ],
"asarUnpack": [ "asarUnpack": [
"node_modules/node-api-dotnet/**/*", "node_modules/node-api-dotnet/**/*",
"node_modules/node-api-dotnet/net8.0/**/*", "node_modules/node-api-dotnet/net9.0/**/*",
"build/Electron/*", "build/Electron/*",
"build/Electron/**" "build/Electron/**"
], ],
@@ -96,12 +97,12 @@
"to": "app.asar.unpacked/build/Electron/" "to": "app.asar.unpacked/build/Electron/"
}, },
{ {
"from": "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/net8.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", "from": "node_modules/node-api-dotnet/net9.0/Microsoft.JavaScript.NodeApi.DotNetHost.dll",
"to": "app.asar.unpacked/node_modules/node-api-dotnet/net8.0/Microsoft.JavaScript.NodeApi.DotNetHost.dll" "to": "app.asar.unpacked/node_modules/node-api-dotnet/net9.0/Microsoft.JavaScript.NodeApi.DotNetHost.dll"
} }
], ],
"directories": { "directories": {
@@ -129,6 +130,6 @@
}, },
"dependencies": { "dependencies": {
"hazardous": "^0.3.0", "hazardous": "^0.3.0",
"node-api-dotnet": "^0.8.19" "node-api-dotnet": "^0.9.1"
} }
} }
src-electron/InteropApi.js
+1 -1
View File
@@ -1,4 +1,4 @@
const dotnet = require('node-api-dotnet/net8.0'); const dotnet = require('node-api-dotnet/net9.0');
class InteropApi { class InteropApi {
constructor() { constructor() {
src-electron/main.js
+5 -2
View File
@@ -14,7 +14,10 @@ const fs = require('fs');
const https = require('https'); const https = require('https');
if (!isDotNetInstalled()) { 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(); app.quit();
return; return;
} }
@@ -508,7 +511,7 @@ function isDotNetInstalled() {
encoding: 'utf-8' encoding: 'utf-8'
} }
); );
return result.stdout?.includes('.NETCore.App 8.0'); return result.stdout?.includes('.NETCore.App 9.0');
} }
function tryCopyFromWinePrefix() { function tryCopyFromWinePrefix() {