starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-09-21 14:35:16 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

Merge pull request #849 from gorsheninmv/get-back-net6-support

Browse Source 
Get back net6 support
This commit is contained in:
Florian Rappl
2024-05-01 17:08:29 +02:00
committed by GitHub
parent 7ca40bcaec 1864c21c10
commit e361367a95
4 changed files with 21 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.github/workflows/ci.yml vendored
View File

@@ -17,6 +17,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
8.0.x
- name: Build
@@ -32,6 +33,7 @@ jobs:
uses: actions/setup-dotnet@v4
with:
dotnet-version: |
6.0.x
8.0.x
- name: Build

22
nuke/Build.cs
View File

@@ -71,6 +71,8 @@ class Build : NukeBuild
}
}
string Framework => Solution.GetProject(DemoTargetLibName).GetProperty("TargetFramework");
protected override void OnBuildInitialized()
{
var parser = new ReleaseNotesParser();
@@ -184,7 +186,9 @@ class Build : NukeBuild
var cli = SourceDirectory / CliTargetLibName / $"{CliTargetLibName}.csproj";
var args = "build /target custom win7-x86;win /dotnet-configuration Debug /electron-arch ia32 /electron-params \"--publish never\"";
DotNet($"run --project {cli} -- {args}", sample);
var cmd = $"run --project {cli} --framework {Framework} -- {args}";
Log.Debug(cmd);
DotNet(cmd, sample);
});
Target ElectronizeWindowsTargetSample => _ => _
@@ -195,7 +199,9 @@ class Build : NukeBuild
var cli = SourceDirectory / CliTargetLibName / $"{CliTargetLibName}.csproj";
var args = "build /target win /electron-params \"--publish never\"";
DotNet($"run --project {cli} -- {args}", sample);
var cmd =$"run --project {cli} --framework {Framework} -- {args}";
Log.Debug(cmd);
DotNet(cmd, sample);
});
Target ElectronizeCustomWin7TargetSample => _ => _
@@ -206,7 +212,9 @@ class Build : NukeBuild
var cli = SourceDirectory / CliTargetLibName / $"{CliTargetLibName}.csproj";
var args = "build /target custom win7-x86;win /electron-params \"--publish never\"";
DotNet($"run --project {cli} -- {args}", sample);
var cmd =$"run --project {cli} --framework {Framework} -- {args}";
Log.Debug(cmd);
DotNet(cmd, sample);
});
Target ElectronizeMacOsTargetSample => _ => _
@@ -217,7 +225,9 @@ class Build : NukeBuild
var cli = SourceDirectory / CliTargetLibName / $"{CliTargetLibName}.csproj";
var args = "build /target osx /electron-params \"--publish never\"";
DotNet($"run --project {cli} -- {args}", sample);
var cmd =$"run --project {cli} --framework {Framework} -- {args}";
Log.Debug(cmd);
DotNet(cmd, sample);
});
Target ElectronizeLinuxTargetSample => _ => _
@@ -228,7 +238,9 @@ class Build : NukeBuild
var cli = SourceDirectory / CliTargetLibName / $"{CliTargetLibName}.csproj";
var args = "build /target linux /electron-params \"--publish never\"";
DotNet($"run --project {cli} -- {args}", sample);
var cmd =$"run --project {cli} --framework {Framework} -- {args}";
Log.Debug(cmd);
DotNet(cmd, sample);
});
Target PublishPackages => _ => _

2
src/ElectronNET.API/ElectronNET.API.csproj
View File

@@ -1,6 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<PackageOutputPath>..\..\artifacts</PackageOutputPath>
<PackageId>ElectronNET.API</PackageId>
<Authors>Gregor Biswanger, Florian Rappl</Authors>

3
src/ElectronNET.CLI/ElectronNET.CLI.csproj
View File

@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net8.0</TargetFramework>
<TargetFrameworks>net6.0;net8.0</TargetFrameworks>
<AssemblyName>dotnet-electronize</AssemblyName>
<ToolCommandName>electronize</ToolCommandName>
<PackageType>DotnetCliTool</PackageType>
@@ -25,7 +25,6 @@
<PackageReleaseNotes>Changelog: https://github.com/ElectronNET/Electron.NET/blob/main/Changelog.md</PackageReleaseNotes>
<PackageIcon>PackageIcon.png</PackageIcon>
<PackAsTool>true</PackAsTool>
<PublishSelfContained>true</PublishSelfContained>
<StartupObject>
</StartupObject>
</PropertyGroup>