Skip to content

Get back net6 support #849

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 1, 2024
+21 −8
Merged

Get back net6 support #849

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0775b91
fix: get back net6 support
gorsheninmv May 1, 2024
1864c21
fix: specify target framework
gorsheninmv May 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .github/workflows/ci.yml
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 17 additions & 5 deletions nuke/Build.cs
View file
Original file line number Diff line number Diff line change
@@ -71,6 +71,8 @@ AbsolutePath[] Projects
}
}

string Framework => Solution.GetProject(DemoTargetLibName).GetProperty("TargetFramework");

protected override void OnBuildInitialized()
{
var parser = new ReleaseNotesParser();
@@ -184,7 +186,9 @@ protected override void OnBuildInitialized()
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 @@ protected override void OnBuildInitialized()
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 @@ protected override void OnBuildInitialized()
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 @@ protected override void OnBuildInitialized()
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 @@ protected override void OnBuildInitialized()
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 changes: 1 addition & 1 deletion src/ElectronNET.API/ElectronNET.API.csproj
View file
Original file line number Diff line number Diff line change
@@ -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 changes: 1 addition & 2 deletions src/ElectronNET.CLI/ElectronNET.CLI.csproj
View file
Original file line number Diff line number Diff line change
@@ -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>