Skip to content

Commit 992a1fd

Browse files
Youssef1313Youssef1313
committed
Drop netcoreapp3.1
1 parent af98941 commit 992a1fd

File tree

7 files changed

+22
-67
lines changed

7 files changed

+22
-67
lines changed

‎nuget/NUnit3TestAdapter.nuspec‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="2.0.0-preview.25452.10" />
3131
<dependency id="Microsoft.Testing.Platform.MSBuild" version="2.0.0-preview.25452.10" />
3232
</group>
33-
<group targetFramework="netcoreapp3.1">
33+
<group targetFramework="net8.0">
3434
<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="2.0.0-preview.25452.10" />
3535
<dependency id="Microsoft.Testing.Platform.MSBuild" version="2.0.0-preview.25452.10" />
3636
</group>
@@ -49,14 +49,14 @@
4949
<file src="build\net462\NUnit3TestAdapter.props" target="build\net462\NUnit3TestAdapter.props" />
5050
<file src="build\net462\NUnit3TestAdapter.targets" target="build\net462\NUnit3TestAdapter.targets" />
5151

52-
<file src="build\netcoreapp3.1\NUnit3.TestAdapter.dll" target="build\netcoreapp3.1\NUnit3.TestAdapter.dll" />
53-
<file src="build\netcoreapp3.1\NUnit3.TestAdapter.pdb" target="build\netcoreapp3.1\NUnit3.TestAdapter.pdb" />
54-
<file src="build\netcoreapp3.1\nunit.engine.dll" target="build\netcoreapp3.1\nunit.engine.dll" />
55-
<file src="build\netcoreapp3.1\nunit.engine.api.dll" target="build\netcoreapp3.1\nunit.engine.api.dll" />
56-
<file src="build\netcoreapp3.1\nunit.engine.core.dll" target="build\netcoreapp3.1\nunit.engine.core.dll" />
57-
<file src="build\netcoreapp3.1\testcentric.engine.metadata.dll" target="build\netcoreapp3.1\testcentric.engine.metadata.dll"/>
58-
<file src="build\netcoreapp3.1\NUnit3TestAdapter.props" target="build\netcoreapp3.1\NUnit3TestAdapter.props" />
59-
<file src="build\netcoreapp3.1\NUnit3TestAdapter.targets" target="build\netcoreapp3.1\NUnit3TestAdapter.targets" />
52+
<file src="build\net8.0\NUnit3.TestAdapter.dll" target="build\net8.0\NUnit3.TestAdapter.dll" />
53+
<file src="build\net8.0\NUnit3.TestAdapter.pdb" target="build\net8.0\NUnit3.TestAdapter.pdb" />
54+
<file src="build\net8.0\nunit.engine.dll" target="build\net8.0\nunit.engine.dll" />
55+
<file src="build\net8.0\nunit.engine.api.dll" target="build\net8.0\nunit.engine.api.dll" />
56+
<file src="build\net8.0\nunit.engine.core.dll" target="build\net8.0\nunit.engine.core.dll" />
57+
<file src="build\net8.0\testcentric.engine.metadata.dll" target="build\net8.0\testcentric.engine.metadata.dll"/>
58+
<file src="build\net8.0\NUnit3TestAdapter.props" target="build\net8.0\NUnit3TestAdapter.props" />
59+
<file src="build\net8.0\NUnit3TestAdapter.targets" target="build\net8.0\NUnit3TestAdapter.targets" />
6060

6161

6262
</files>

‎src/NUnit.TestAdapter.Tests.Acceptance/AcceptanceTests.cs‎

Lines changed: 4 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,6 @@ namespace NUnit.VisualStudio.TestAdapter.Tests.Acceptance;
1212

1313
public class Frameworks
1414
{
15-
public const string NetCoreApp31 = "netcoreapp3.1";
16-
public const string Net50 = "net5.0";
17-
public const string Net60 = "net6.0";
18-
public const string Net70 = "net7.0";
1915
public const string Net80 = "net8.0";
2016
}
2117

@@ -32,18 +28,11 @@ public abstract class AcceptanceTests
3228
protected static IEnumerable<string> TargetFrameworks =>
3329
[
3430
LowestNetfxTarget,
35-
Frameworks.NetCoreApp31
36-
];
37-
38-
protected static IEnumerable<string> DotNetCliTargetFrameworks =>
39-
[
40-
Frameworks.NetCoreApp31,
41-
Frameworks.Net60,
31+
Frameworks.Net80
4232
];
4333

4434
protected static IEnumerable<string> ModernDotNetCliTargetFrameworks =>
4535
[
46-
Frameworks.Net60,
4736
Frameworks.Net80
4837
];
4938

@@ -52,7 +41,7 @@ public abstract class AcceptanceTests
5241

5342
public class MultiFrameworkSource
5443
{
55-
public IEnumerable<string> Frameworks { get; set; } = DotNetCliTargetFrameworks;
44+
public IEnumerable<string> Frameworks { get; set; } = ModernDotNetCliTargetFrameworks;
5645
public string NUnitVersion { get; set; } = NUnit3;
5746

5847
public static IEnumerable<MultiFrameworkSource> LegacyDotNetFrameworks => [new()];
@@ -85,37 +74,22 @@ public class SingleFrameworkSource
8574

8675
public static IEnumerable<SingleFrameworkSource> NetFxFramework => [new()];
8776

88-
public static IEnumerable<SingleFrameworkSource> LegacyDotNetFramework =>
89-
[
90-
new ()
91-
{
92-
Framework = Frameworks.NetCoreApp31,
93-
NUnitVersion = NUnit3
94-
},
95-
];
96-
9777
public static IEnumerable<SingleFrameworkSource> ModernDotNetFramework =>
9878
[
99-
new ()
100-
{
101-
Framework = Frameworks.Net60,
102-
NUnitVersion = NUnit4
103-
},
10479
new ()
10580
{
10681
Framework = Frameworks.Net80,
10782
NUnitVersion = NUnit4
10883
}
10984
];
11085

111-
public static IEnumerable<SingleFrameworkSource> AllFrameworks => NetFxFramework.Concat(LegacyDotNetFramework).Concat(ModernDotNetFramework);
112-
public static IEnumerable<SingleFrameworkSource> AllFrameworksExceptNetFx => LegacyDotNetFramework.Concat(ModernDotNetFramework);
86+
public static IEnumerable<SingleFrameworkSource> AllFrameworks => NetFxFramework.Concat(ModernDotNetFramework);
87+
public static IEnumerable<SingleFrameworkSource> AllFrameworksExceptNetFx => ModernDotNetFramework;
11388
}
11489

11590
protected string NUnitVersion(string targetFramework) =>
11691
targetFramework switch
11792
{
118-
Frameworks.NetCoreApp31 => NUnit3,
11993
_ => NUnit4,
12094
};
12195

‎src/NUnit3AdapterExternalTests/NUnit3AdapterExternalTests.csproj‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,10 @@
33
<PropertyGroup>
44
<AssemblyName>NUnit.VisualStudio.TestAdapter.ExternalTests</AssemblyName>
55
<RootNamespace>NUnit.VisualStudio.TestAdapter.Tests</RootNamespace>
6-
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
6+
<TargetFrameworks>net462;net8.0</TargetFrameworks>
77
</PropertyGroup>
88

9-
10-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
11-
<PackageReference Include="NUnit" VersionOverride="3.14.0" />
12-
</ItemGroup>
13-
14-
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
9+
<ItemGroup>
1510
<PackageReference Include="NUnit" />
1611
</ItemGroup>
1712

‎src/NUnitTestAdapter/NUnit.TestAdapter.csproj‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,8 @@
44
<AssemblyName>NUnit3.TestAdapter</AssemblyName>
55
<!--<AssemblyName>NUnit3.TestAdapterDebug</AssemblyName>-->
66
<RootNamespace>NUnit.VisualStudio.TestAdapter</RootNamespace>
7-
<!--<TargetFramework>netcoreapp3.1</TargetFramework>-->
87
<!-- For testing and debugging-->
9-
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
8+
<TargetFrameworks>net462;net8.0</TargetFrameworks>
109
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
1110
<SourceLinkOriginUrl>https://github.com/nunit/nunit3-vs-adapter</SourceLinkOriginUrl>
1211
<SourceLinkCreate>true</SourceLinkCreate>

‎src/NUnitTestAdapterTests/NUnit.TestAdapter.Tests.csproj‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,7 @@
44
<IsTestProject>true</IsTestProject>
55
<RootNamespace>NUnit.VisualStudio.TestAdapter.Tests</RootNamespace>
66
<AssemblyName>NUnit.VisualStudio.TestAdapter.Tests</AssemblyName>
7-
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
8-
<!--<TargetFrameworks>netcoreapp3.1</TargetFrameworks>-->
7+
<TargetFrameworks>net462;net8.0</TargetFrameworks>
98
<!-- For testing and debugging-->
109
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
1110
<GenerateBindingRedirectsOutputType>true</GenerateBindingRedirectsOutputType>
@@ -23,11 +22,7 @@
2322
<PackageReference Include="TestCentric.Metadata" />
2423
</ItemGroup>
2524

26-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
27-
<PackageReference Include="NUnit" VersionOverride="3.14.0" />
28-
</ItemGroup>
29-
30-
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
25+
<ItemGroup>
3126
<PackageReference Include="NUnit" />
3227
</ItemGroup>
3328

‎src/empty-assembly/empty-assembly.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@
44
<IsTestProject>false</IsTestProject>
55
<AssemblyName>empty-assembly</AssemblyName>
66
<RootNamespace>NUnit.Tests</RootNamespace>
7-
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
7+
<TargetFrameworks>net462;net8.0</TargetFrameworks>
88
</PropertyGroup>
99

10-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
11-
<PackageReference Include="NUnit" VersionOverride="3.14.0" />
12-
</ItemGroup>
13-
14-
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
10+
<ItemGroup>
1511
<PackageReference Include="NUnit" />
1612
</ItemGroup>
1713

‎src/mock-assembly/mock-assembly.csproj‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,10 @@
44
<IsTestProject>false</IsTestProject>
55
<AssemblyName>mock-assembly</AssemblyName>
66
<RootNamespace>NUnit.Tests</RootNamespace>
7-
<TargetFrameworks>net462;netcoreapp3.1</TargetFrameworks>
7+
<TargetFrameworks>net462;net8.0</TargetFrameworks>
88
</PropertyGroup>
99

10-
<ItemGroup Condition=" '$(TargetFramework)' == 'netcoreapp3.1' ">
11-
<PackageReference Include="NUnit" VersionOverride="3.14.0" />
12-
</ItemGroup>
13-
14-
<ItemGroup Condition=" '$(TargetFramework)' == 'net462' ">
10+
<ItemGroup>
1511
<PackageReference Include="NUnit" />
1612
</ItemGroup>
1713

0 commit comments

Comments
 (0)