Skip to content

Commit 21c17dc

Browse files
authored
Merge pull request #846 from Lemon73-Computing/net8.0
Upgrade to .NET 8.0
2 parents d225324 + dbcd4ac commit 21c17dc

File tree

9 files changed

+21
-22
lines changed

9 files changed

+21
-22
lines changed

Diff for: .github/workflows/ci.yml

+6-8
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,13 @@ jobs:
1111
runs-on: ubuntu-latest
1212

1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v4
1515

1616
- name: Setup dotnet
17-
uses: actions/setup-dotnet@v1
17+
uses: actions/setup-dotnet@v4
1818
with:
1919
dotnet-version: |
20-
6.0.x
21-
7.0.x
20+
8.0.x
2221
2322
- name: Build
2423
run: ./build.sh
@@ -27,14 +26,13 @@ jobs:
2726
runs-on: windows-latest
2827

2928
steps:
30-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v4
3130

3231
- name: Setup dotnet
33-
uses: actions/setup-dotnet@v1
32+
uses: actions/setup-dotnet@v4
3433
with:
3534
dotnet-version: |
36-
6.0.x
37-
7.0.x
35+
8.0.x
3836
3937
- name: Build
4038
run: |

Diff for: .vscode/launch.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@
1010
"request": "launch",
1111
"preLaunchTask": "build",
1212
// If you have changed target frameworks, make sure to update the program path.
13-
"program": "${workspaceRoot}/ElectronNET.CLI/bin/Debug/netcoreapp2.0/dotnet-electronize.dll",
13+
"program": "${workspaceRoot}/src/ElectronNET.CLI/bin/Debug/net8.0/dotnet-electronize.dll",
1414
"args": [],
15-
"cwd": "${workspaceRoot}/ElectronNET.CLI",
15+
"cwd": "${workspaceRoot}/src/ElectronNET.CLI",
1616
// For more information about the 'console' field, see https://github.com/OmniSharp/omnisharp-vscode/blob/master/debugger-launchjson.md#console-terminal-window
1717
"console": "internalConsole",
1818
"stopAtEntry": false,

Diff for: .vscode/tasks.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
"label": "build",
88
"type": "shell",
99
"command": "dotnet",
10-
"args": ["build", "${workspaceRoot}/ElectronNET.CLI/ElectronNET.CLI.csproj"],
10+
"args": ["build", "${workspaceRoot}/src/ElectronNET.CLI/ElectronNET.CLI.csproj"],
1111
"problemMatcher": "$msCompile",
1212
"group": {
1313
"_id": "build",

Diff for: README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
[![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)
44

5-
Build cross platform desktop apps with .NET 6 and Blazor, ASP.NET Core (Razor Pages, MVC).
5+
Build cross platform desktop apps with .NET 8 and Blazor, ASP.NET Core (Razor Pages, MVC).
66

77
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.
88

@@ -18,7 +18,7 @@ Well... there are lots of different approaches how to get a X-plat desktop app r
1818

1919
## 🛠 Requirements to Run
2020

21-
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).
21+
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).
2222

2323
Also you should have installed:
2424

Diff for: nuke/Build.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ protected override void OnBuildInitialized()
109109
.Before(Restore)
110110
.Executes(() =>
111111
{
112-
SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
112+
SourceDirectory.GlobDirectories("**/bin", "**/obj").ForEach(dir => dir.DeleteDirectory());
113113
});
114114

115115
Target Restore => _ => _
@@ -244,7 +244,7 @@ protected override void OnBuildInitialized()
244244
throw new BuildAbortedException("Could not resolve the NuGet API key.");
245245
}
246246

247-
foreach (var nupkg in GlobFiles(ResultDirectory, "*.nupkg"))
247+
foreach (var nupkg in ResultDirectory.GlobFiles("*.nupkg"))
248248
{
249249
DotNetNuGetPush(s => s
250250
.SetTargetPath(nupkg)

Diff for: nuke/_build.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net6.0</TargetFramework>
5+
<TargetFramework>net8.0</TargetFramework>
66
<RootNamespace></RootNamespace>
77
<NoWarn>CS0649;CS0169</NoWarn>
88
<NukeRootDirectory>..</NukeRootDirectory>
@@ -11,7 +11,7 @@
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Nuke.Common" Version="6.2.1" />
14+
<PackageReference Include="Nuke.Common" Version="8.0.0" />
1515
</ItemGroup>
1616

1717
<ItemGroup>

Diff for: src/ElectronNET.API/ElectronNET.API.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<PackageOutputPath>..\..\artifacts</PackageOutputPath>
55
<PackageId>ElectronNET.API</PackageId>
66
<Authors>Gregor Biswanger, Florian Rappl</Authors>

Diff for: src/ElectronNET.CLI/ElectronNET.CLI.csproj

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<OutputType>Exe</OutputType>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<AssemblyName>dotnet-electronize</AssemblyName>
66
<ToolCommandName>electronize</ToolCommandName>
77
<PackageType>DotnetCliTool</PackageType>
@@ -25,6 +25,7 @@
2525
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/main/Changelog.md</PackageReleaseNotes>
2626
<PackageIcon>PackageIcon.png</PackageIcon>
2727
<PackAsTool>true</PackAsTool>
28+
<PublishSelfContained>true</PublishSelfContained>
2829
<StartupObject>
2930
</StartupObject>
3031
</PropertyGroup>
@@ -71,11 +72,11 @@
7172
<EmbeddedResource Include="..\ElectronNET.Host\.vscode\tasks.json" Link="ElectronHost\.vscode\tasks.json" />
7273
</ItemGroup>
7374
<ItemGroup>
74-
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0">
75+
<PackageReference Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
7576
<PrivateAssets>all</PrivateAssets>
7677
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
7778
</PackageReference>
78-
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.410601">
79+
<PackageReference Include="Microsoft.DotNet.UpgradeAssistant.Extensions.Default.Analyzers" Version="0.4.421302">
7980
<PrivateAssets>all</PrivateAssets>
8081
</PackageReference>
8182
</ItemGroup>

Diff for: src/ElectronNET.WebApp/ElectronNET.WebApp.csproj

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net6.0</TargetFramework>
3+
<TargetFramework>net8.0</TargetFramework>
44
<AspNetCoreHostingModel>OutOfProcess</AspNetCoreHostingModel>
55
<AspNetCoreModuleName>AspNetCoreModule</AspNetCoreModuleName>
66
<RuntimeIdentifiers>win-x64</RuntimeIdentifiers>

0 commit comments

Comments
 (0)