diff --git a/.github/workflows/github_actions.yml b/.github/workflows/github_actions.yml index f1d5c84a..e6352801 100644 --- a/.github/workflows/github_actions.yml +++ b/.github/workflows/github_actions.yml @@ -34,10 +34,10 @@ jobs: needs: [set_version, build_node] steps: - uses: actions/checkout@v4 - - name: Setup .NET 9 + - name: Setup .NET 10 uses: actions/setup-dotnet@v4 with: - dotnet-version: '9.0.x' + dotnet-version: '10.0.x' - name: Set version run: | echo "${{ needs.set_version.outputs.version }}" > Version diff --git a/Dotnet/AppApi/Electron/Folders.cs b/Dotnet/AppApi/Electron/Folders.cs index 9cf9241d..0739091c 100644 --- a/Dotnet/AppApi/Electron/Folders.cs +++ b/Dotnet/AppApi/Electron/Folders.cs @@ -8,7 +8,6 @@ using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Microsoft.Win32; using System.Threading; -using System.Windows.Forms; using System.Threading.Tasks; namespace VRCX diff --git a/Dotnet/AppApi/Electron/Screenshot.cs b/Dotnet/AppApi/Electron/Screenshot.cs index 44c064c0..81ea8227 100644 --- a/Dotnet/AppApi/Electron/Screenshot.cs +++ b/Dotnet/AppApi/Electron/Screenshot.cs @@ -3,7 +3,6 @@ using System.Diagnostics; using System.IO; using System.Linq; using System.Threading; -using System.Windows.Forms; using Newtonsoft.Json; using Newtonsoft.Json.Linq; using Newtonsoft.Json.Serialization; diff --git a/Dotnet/Program.cs b/Dotnet/Program.cs index 780fca2d..f25c803a 100644 --- a/Dotnet/Program.cs +++ b/Dotnet/Program.cs @@ -13,7 +13,9 @@ using System.IO; using System.Runtime.InteropServices; using System.Text.Json; using System.Threading; +#if !LINUX using System.Windows.Forms; +#endif namespace VRCX { diff --git a/Dotnet/VRCX-Cef.csproj b/Dotnet/VRCX-Cef.csproj index 0b3d28d6..5b5d7c6f 100644 --- a/Dotnet/VRCX-Cef.csproj +++ b/Dotnet/VRCX-Cef.csproj @@ -4,7 +4,7 @@ WinExe - net9-windows10.0.19041.0 + net10.0-windows10.0.19041.0 Debug;Release x64 x64 diff --git a/Dotnet/VRCX-Electron-arm64.csproj b/Dotnet/VRCX-Electron-arm64.csproj index 024eae22..97e60d80 100644 --- a/Dotnet/VRCX-Electron-arm64.csproj +++ b/Dotnet/VRCX-Electron-arm64.csproj @@ -76,14 +76,14 @@ - + - + - - - + + + diff --git a/Dotnet/VRCX-Electron.csproj b/Dotnet/VRCX-Electron.csproj index f51ab72f..8b951849 100644 --- a/Dotnet/VRCX-Electron.csproj +++ b/Dotnet/VRCX-Electron.csproj @@ -81,14 +81,14 @@ - + - - - - - + + + + +