Skip to content
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

Upgrade to NUKE 9 and replace obsolete NET 6 targets with NET 8 #1482

Merged
merged 1 commit into from
Jan 26, 2025
Merged

Upgrade to NUKE 9 and replace obsolete NET 6 targets with NET 8 #1482

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
46 changes: 26 additions & 20 deletions .nuke/build.schema.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,5 @@
{
"$schema": "http://json-schema.org/draft-04/schema#",
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"GitHubToken": {
"type": "string",
"description": "GitHub API token",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
}
},
"definitions": {
"Host": {
"type": "string",
Expand Down Expand Up @@ -119,5 +100,30 @@
}
}
},
"$ref": "#/definitions/NukeBuild"
"allOf": [
{
"properties": {
"Configuration": {
"type": "string",
"description": "Configuration to build - Default is 'Debug' (local) or 'Release' (server)",
"enum": [
"Debug",
"Release"
]
},
"GitHubToken": {
"type": "string",
"description": "GitHub API token",
"default": "Secrets must be entered via 'nuke :secrets [profile]'"
},
"Solution": {
"type": "string",
"description": "Path to a solution file that is automatically loaded"
}
}
},
{
"$ref": "#/definitions/NukeBuild"
}
]
}
2 changes: 1 addition & 1 deletion OpenXmlFormats/NPOI.OpenXmlFormats.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<AssemblyName>NPOI.OpenXmlFormats</AssemblyName>
<RootNamespace>NPOI.OpenXmlFormats</RootNamespace>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion benchmarks/NPOI.Benchmarks/NPOI.Benchmarks.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings>
</PropertyGroup>

Expand Down
4 changes: 2 additions & 2 deletions build/Build.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,8 +125,8 @@ static void DeleteCompilationArtifacts()
.EnableNoRestore()
.SetConfiguration(Configuration)
.SetProjectFile(Solution)
.When(Host is GitHubActions, settings => settings.SetLoggers("GitHubActions"))
.When(!RuntimeInformation.IsOSPlatform(OSPlatform.Windows), settings => settings.SetFramework("net6.0"))
.When(_ => Host is GitHubActions, settings => settings.SetLoggers("GitHubActions"))
.When(_ => !RuntimeInformation.IsOSPlatform(OSPlatform.Windows), settings => settings.SetFramework("net8.0"))
);
});

Expand Down
2 changes: 1 addition & 1 deletion build/_build.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Nuke.Common" Version="8.1.0" />
<PackageReference Include="Nuke.Common" Version="9.0.4" />
</ItemGroup>

</Project>
2 changes: 1 addition & 1 deletion main/NPOI.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<RootNamespace>NPOI</RootNamespace>
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>..\npoi.snk</AssemblyOriginatorKeyFile>
Expand Down
2 changes: 1 addition & 1 deletion ooxml/NPOI.OOXML.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<AssemblyName>NPOI.OOXML</AssemblyName>
<RootNamespace>NPOI</RootNamespace>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion openxml4Net/NPOI.OpenXml4Net.Core.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project Sdk="Microsoft.NET.Sdk">

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<AssemblyName>NPOI.OpenXml4Net</AssemblyName>
<RootNamespace>NPOI.OpenXml4Net</RootNamespace>
<SignAssembly>true</SignAssembly>
Expand Down
2 changes: 1 addition & 1 deletion solution/NPOI.Pack.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- This is an umbrella project that gathers dependencies for dotnet pack -->

<PropertyGroup>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net6.0</TargetFrameworks>
<TargetFrameworks>net472;netstandard2.0;netstandard2.1;net8.0</TargetFrameworks>
<IncludeBuildOutput>false</IncludeBuildOutput>
<PackageId>NPOI</PackageId>
<OutputPath>..\solution\$(Configuration)\</OutputPath>
Expand Down
Loading