Visitar URL original
Add a .NET 8.0 target (#4884) · nunit/nunit@0c1ef7f · GitHub
Skip to content

Commit 0c1ef7f

Browse files
manfred-brandsmanfred-brands
authored
Add a .NET 8.0 target (#4884)
* Add a .NET 8.0 target * Added test to ensure we no longer forget to update libraries in .nuspec files. * Stupid backslashes in directory separators
1 parent 6e14a0f commit 0c1ef7f

23 files changed

Lines changed: 212 additions & 14 deletions

‎CakeScripts.Tests/CakeScripts.Tests.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77

‎CakeScripts/CakeScripts.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net6.0</TargetFramework>
4+
<TargetFramework>net8.0</TargetFramework>
55
<ImplicitUsings>enable</ImplicitUsings>
66
<Nullable>enable</Nullable>
77
</PropertyGroup>

‎nuget/framework/nunit.nuspec‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@
2525

2626
Supported platforms:
2727
- .NET Framework 4.6.2+
28-
- .NET 6.0+
28+
- .NET 6.0
29+
- .NET 8.0+
2930
</description>
3031
<releaseNotes>See release notes at https://docs.nunit.org/articles/nunit/release-notes/framework.html#nunit-400---november-26-2023</releaseNotes>
3132
<language>en-US</language>
@@ -38,6 +39,7 @@
3839
<dependency id="System.Memory" version="4.5.5" exclude="Build,Analyzers" />
3940
</group>
4041
<group targetFramework="net6.0" />
42+
<group targetFramework="net8.0" />
4143
</dependencies>
4244
</metadata>
4345
<files>
@@ -58,6 +60,12 @@
5860
<file src="bin/net6.0/nunit.framework.legacy.dll" target="lib\net6.0" />
5961
<file src="bin/net6.0/nunit.framework.legacy.xml" target="lib\net6.0" />
6062
<file src="bin/net6.0/nunit.framework.legacy.pdb" target="lib\net6.0" />
63+
<file src="bin/net8.0/nunit.framework.dll" target="lib\net8.0" />
64+
<file src="bin/net8.0/nunit.framework.xml" target="lib\net8.0" />
65+
<file src="bin/net8.0/nunit.framework.pdb" target="lib\net8.0" />
66+
<file src="bin/net8.0/nunit.framework.legacy.dll" target="lib\net8.0" />
67+
<file src="bin/net8.0/nunit.framework.legacy.pdb" target="lib\net8.0" />
68+
<file src="bin/net8.0/nunit.framework.legacy.xml" target="lib\net8.0" />
6169
<file src="..\..\nuget\framework\NUnit.props" target="build" />
6270
</files>
6371
</package>

‎nuget/nunitlite/nunitlite.nuspec‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
Supported platforms:
1818
- .NET Framework 4.6.2+
19-
- .NET 6.0+
19+
- .NET 6.0
20+
- .NET 8.0+
2021

2122
How to use this package:
2223

@@ -34,9 +35,6 @@ How to use this package:
3435
<dependency id="NUnit" version="[$version$]" />
3536
</group>
3637
<group targetFramework="net8.0">
37-
<dependency id="NUnit" version="[$version$]" />
38-
</group>
39-
<group targetFramework="net9.0">
4038
<dependency id="NUnit" version="[$version$]" />
4139
</group>
4240
</dependencies>
@@ -52,7 +50,7 @@ How to use this package:
5250
<file src="bin/net462/nunitlite-runner.pdb" target="tools\net462" />
5351
<file src="bin/net6.0/nunitlite.dll" target="lib\net6.0" />
5452
<file src="bin/net6.0/nunitlite.pdb" target="lib\net6.0" />
55-
<file src="bin/net8.0/nunitlite.dll" target="lib\net8.0" />
53+
<file src="bin/net8.0/nunitlite.dll" target="lib\net8.0" />
5654
<file src="bin/net8.0/nunitlite.pdb" target="lib\net8.0" />
5755
</files>
5856
</package>

‎src/NUnitFramework/Directory.Build.props‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
<AssemblyOriginatorKeyFile>..\..\nunit.snk</AssemblyOriginatorKeyFile>
88
<DisableImplicitNuGetFallbackFolder>true</DisableImplicitNuGetFallbackFolder>
99
<EnforceCodeStyleInBuild>true</EnforceCodeStyleInBuild>
10-
<NUnitLibraryFrameworks>net462;net6.0</NUnitLibraryFrameworks>
10+
<NUnitLibraryFrameworks>net462;net6.0;net8.0</NUnitLibraryFrameworks>
1111
<NUnitRuntimeFrameworks>net462;net6.0;net8.0;net9.0</NUnitRuntimeFrameworks>
1212
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
1313
<!--<OutputPath>..\..\..\bin\$(Configuration)\</OutputPath>-->
1414
<CheckEolTargetFramework>false</CheckEolTargetFramework>
1515
<Nullable>enable</Nullable>
16-
<AnnotatedReferenceAssemblyVersion>7.0.0</AnnotatedReferenceAssemblyVersion>
16+
<AnnotatedReferenceAssemblyVersion>8.0.0</AnnotatedReferenceAssemblyVersion>
1717
<GenerateNullableAttributes>false</GenerateNullableAttributes>
1818
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
1919
<CsWinRTAotOptimizerEnabled>false</CsWinRTAotOptimizerEnabled>

‎src/NUnitFramework/framework/Exceptions/AssertionException.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@ public AssertionException(string message, Exception? inner) : base(message, inne
2626
{
2727
}
2828

29+
#if !NET8_0_OR_GREATER
2930
/// <summary>
3031
/// Serialization Constructor
3132
/// </summary>
3233
protected AssertionException(System.Runtime.Serialization.SerializationInfo info,
3334
System.Runtime.Serialization.StreamingContext context) : base(info, context)
3435
{
3536
}
37+
#endif
3638

3739
/// <summary>
3840
/// Gets the ResultState provided by this exception

‎src/NUnitFramework/framework/Exceptions/IgnoreException.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,13 +25,15 @@ public IgnoreException(string message, Exception? inner) : base(message, inner)
2525
{
2626
}
2727

28+
#if !NET8_0_OR_GREATER
2829
/// <summary>
2930
/// Serialization Constructor
3031
/// </summary>
3132
protected IgnoreException(System.Runtime.Serialization.SerializationInfo info,
3233
System.Runtime.Serialization.StreamingContext context) : base(info, context)
3334
{
3435
}
36+
#endif
3537

3638
/// <summary>
3739
/// Gets the ResultState provided by this exception

‎src/NUnitFramework/framework/Exceptions/InconclusiveException.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public InconclusiveException(string message, Exception? inner)
2828
{
2929
}
3030

31+
#if !NET8_0_OR_GREATER
3132
/// <summary>
3233
/// Serialization Constructor
3334
/// </summary>
@@ -36,6 +37,7 @@ protected InconclusiveException(System.Runtime.Serialization.SerializationInfo i
3637
: base(info, context)
3738
{
3839
}
40+
#endif
3941

4042
/// <summary>
4143
/// Gets the ResultState provided by this exception

‎src/NUnitFramework/framework/Exceptions/MultipleAssertException.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ public MultipleAssertException(ITestResult testResult)
2828
TestResult = testResult;
2929
}
3030

31+
#if !NET8_0_OR_GREATER
3132
#pragma warning disable CS8618 // Non-nullable field is uninitialized. Consider declaring as nullable.
3233
/// <summary>
3334
/// Serialization Constructor
@@ -37,6 +38,7 @@ protected MultipleAssertException(System.Runtime.Serialization.SerializationInfo
3738
{
3839
}
3940
#pragma warning restore CS8618 // Non-nullable field is uninitialized. Consider declaring as nullable.
41+
#endif
4042

4143
/// <summary>
4244
/// Gets the <see cref="ResultState"/> provided by this exception.

‎src/NUnitFramework/framework/Exceptions/ResultStateException.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,15 @@ public ResultStateException(string message, Exception? inner) : base(message, in
2626
{
2727
}
2828

29+
#if !NET8_0_OR_GREATER
2930
/// <summary>
3031
/// Serialization Constructor
3132
/// </summary>
3233
protected ResultStateException(System.Runtime.Serialization.SerializationInfo info,
3334
System.Runtime.Serialization.StreamingContext context) : base(info, context)
3435
{
3536
}
37+
#endif
3638

3739
/// <summary>
3840
/// Gets the ResultState provided by this exception

0 commit comments

Comments
 (0)