diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 81c61026..0901bd2c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -11,14 +11,13 @@ jobs: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x - 7.0.x + 8.0.x - name: Build run: ./build.sh @@ -27,14 +26,13 @@ jobs: runs-on: windows-latest steps: - - uses: actions/checkout@v2 + - uses: actions/checkout@v4 - name: Setup dotnet - uses: actions/setup-dotnet@v1 + uses: actions/setup-dotnet@v4 with: dotnet-version: | - 6.0.x - 7.0.x + 8.0.x - name: Build run: | diff --git a/.vscode/launch.json b/.vscode/launch.json index ff9df192..cec34592 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -10,9 +10,9 @@ "request": "launch", "preLaunchTask": "build", // If you have changed target frameworks, make sure to update the program path. - "program": "${workspaceRoot}/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll", + "program": "${workspaceRoot}/src/ElectronNET.CLI/bin/Debug/net8.0/dotnet-electronize.dll", "args": [], - "cwd": "${workspaceRoot}/ElectronNET.CLI", + "cwd": "${workspaceRoot}/src/ElectronNET.CLI", // For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window "console": "internalConsole", "stopAtEntry": false, diff --git a/.vscode/tasks.json b/.vscode/tasks.json index fb72f4ef..03554c8e 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -7,7 +7,7 @@ "label": "build", "type": "shell", "command": "dotnet", - "args": ["build", "${workspaceRoot}/ElectronNET.CLI/ElectronNET.CLI.csproj"], + "args": ["build", "${workspaceRoot}/src/ElectronNET.CLI/ElectronNET.CLI.csproj"], "problemMatcher": "$msCompile", "group": { "_id": "build", diff --git a/README.md b/README.md index 32b7634f..c145a0d4 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ [![donate](https://img.shields.io/badge/Donate-Donorbox-green.svg)](https://donorbox.org/electron-net) [![Gitter](https://badges.gitter.im/ElectronNET/community.svg)](https://gitter.im/ElectronNET/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge) [![Build status](https://github.com/ElectronNET/Electron.NET/actions/workflows/ci.yml/badge.svg)](https://github.com/ElectronNET/Electron.NET/actions/workflows/ci.yml) -Build cross platform desktop apps with .NET 6 and Blazor, ASP.NET Core (Razor Pages, MVC). +Build cross platform desktop apps with .NET 8 and Blazor, ASP.NET Core (Razor Pages, MVC). Electron.NET is a __wrapper__ around a native Electron application with an embedded ASP.NET Core application. Via our Electron.NET IPC bridge we can invoke Electron APIs from .NET. @@ -18,7 +18,7 @@ Well... there are lots of different approaches how to get a X-plat desktop app r ## 🛠 Requirements to Run -The current Electron.NET CLI builds Windows/macOS/Linux binaries. Our API uses .NET 6, so our minimum base OS is the same as [.NET 6](https://github.com/dotnet/core/blob/main/release-notes/6.0/supported-os.md). +The current Electron.NET CLI builds Windows/macOS/Linux binaries. Our API uses .NET 8, so our minimum base OS is the same as [.NET 8](https://github.com/dotnet/core/blob/main/release-notes/8.0/supported-os.md). Also you should have installed: diff --git a/nuke/Build.cs b/nuke/Build.cs index 87b753d0..0b390254 100644 --- a/nuke/Build.cs +++ b/nuke/Build.cs @@ -109,7 +109,7 @@ protected override void OnBuildInitialized() .Before(Restore) .Executes(() => { - SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory); + SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(dir => dir.DeleteDirectory()); }); Target Restore => _ => _ @@ -244,7 +244,7 @@ protected override void OnBuildInitialized() throw new BuildAbortedException("Could not resolve the NuGet API key."); } - foreach (var nupkg in GlobFiles(ResultDirectory, "*.nupkg")) + foreach (var nupkg in ResultDirectory.GlobFiles("*.nupkg")) { DotNetNuGetPush(s => s .SetTargetPath(nupkg) diff --git a/nuke/_build.csproj b/nuke/_build.csproj index 7521e1ba..a71fa1bd 100644 --- a/nuke/_build.csproj +++ b/nuke/_build.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net8.0 CS0649;CS0169 .. @@ -11,7 +11,7 @@ - + diff --git a/src/ElectronNET.API/ElectronNET.API.csproj b/src/ElectronNET.API/ElectronNET.API.csproj index e4d22216..1f44ff76 100644 --- a/src/ElectronNET.API/ElectronNET.API.csproj +++ b/src/ElectronNET.API/ElectronNET.API.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 ..\..\artifacts ElectronNET.API Gregor Biswanger, Florian Rappl diff --git a/src/ElectronNET.CLI/ElectronNET.CLI.csproj b/src/ElectronNET.CLI/ElectronNET.CLI.csproj index 2023d894..fd30a574 100644 --- a/src/ElectronNET.CLI/ElectronNET.CLI.csproj +++ b/src/ElectronNET.CLI/ElectronNET.CLI.csproj @@ -1,7 +1,7 @@  Exe - net6.0 + net8.0 dotnet-electronize electronize DotnetCliTool @@ -25,6 +25,7 @@ Changelog: https://github.com/ElectronNET/Electron.NET/blob/main/Changelog.md PackageIcon.png true + true @@ -71,11 +72,11 @@ - + all runtime; build; native; contentfiles; analyzers - + all diff --git a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj index e2691a1d..41ea283f 100644 --- a/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj +++ b/src/ElectronNET.WebApp/ElectronNET.WebApp.csproj @@ -1,6 +1,6 @@  - net6.0 + net8.0 OutOfProcess AspNetCoreModule win-x64