Skip to content

Commit e6d58ff

Browse files
OsirisTerjeOsirisTerje
authored
Merge pull request #1236 from nunit/vnext
Vnext => 5.0.0
2 parents 25a1573 + fbc8582 commit e6d58ff

21 files changed

+274
-78
lines changed

‎.github/workflows/NUnit3TestAdapter.Myget.Publish.yml‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ on:
66
- main
77
- master
88
- release
9-
- 'v3'
9+
- vnext
1010
- myget
1111
workflow_dispatch:
1212

@@ -27,9 +27,7 @@ jobs:
2727
with:
2828
dotnet-version: |
2929
3.1.x
30-
5.0.x
3130
6.0.x
32-
7.0.x
3331
8.0.x
3432
3533
- name: Build
@@ -46,6 +44,4 @@ jobs:
4644
foreach($file in (Get-ChildItem package -Recurse -Include *.nupkg)) {
4745
dotnet nuget push $file --api-key "${{ secrets.PUBLISHMYGET }}" --source https://www.myget.org/F/nunit/api/v3/index.json --skip-duplicate
4846
}
49-
foreach($file in (Get-ChildItem "package" -Recurse -Include *.snupkg)) {
50-
dotnet nuget push $file --api-key "${{ secrets.PUBLISHMYGET }}" --source https://www.myget.org/F/nunit/api/v3/index.json --skip-duplicate
51-
}
47+

‎Directory.Packages.props‎

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -4,30 +4,27 @@
44
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
55
</PropertyGroup>
66
<ItemGroup>
7-
8-
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
7+
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
98
<PackageVersion Include="NSubstitute" Version="5.3.0" />
10-
<PackageVersion Include="nunit" Version="4.2.2" />
9+
<PackageVersion Include="nunit" Version="4.3.2" />
1110
<PackageVersion Include="nunit.engine" Version="3.18.1" />
1211
<PackageVersion Include="NUnit3TestAdapter" Version="4.6.0" />
1312
<PackageVersion Include="SourceLink.Create.CommandLine" Version="2.8.3" />
14-
<PackageVersion Include="TestCentric.Metadata" Version="3.0.2" />
15-
<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.11.0" PrivateAssets="All"/>
16-
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.11.0" >
13+
<PackageVersion Include="TestCentric.Metadata" Version="3.0.3" />
14+
<!--<PackageVersion Include="Microsoft.TestPlatform.ObjectModel" Version="17.11.0" PrivateAssets="All"/>-->
15+
<PackageVersion Include="Microsoft.CodeAnalysis.CSharp" Version="4.12.0">
1716
<PrivateAssets>all</PrivateAssets>
1817
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1918
</PackageVersion>
2019
<PackageVersion Include="Castle.Core" Version="5.1.1" />
20+
<PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="1.5.3" />
2121
</ItemGroup>
22-
2322
<ItemGroup>
24-
<GlobalPackageReference Include="NUnit.Analyzers" Version="4.3.0" >
23+
<GlobalPackageReference Include="NUnit.Analyzers" Version="4.6.0">
2524
<PrivateAssets>all</PrivateAssets>
2625
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
2726
</GlobalPackageReference>
2827
<GlobalPackageReference Include="StyleCop.Analyzers" Version="1.2.0-beta.556" />
29-
3028
<GlobalPackageReference Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.3" />
3129
</ItemGroup>
32-
33-
</Project>
30+
</Project>

‎NUnit3TestAdapter.sln‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ EndProject
4040
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net462", "net462", "{D41249E3-C080-4B66-8CBD-99CE4D309A10}"
4141
ProjectSection(SolutionItems) = preProject
4242
nuget\net462\NUnit3TestAdapter.props = nuget\net462\NUnit3TestAdapter.props
43+
nuget\net462\NUnit3TestAdapter.targets = nuget\net462\NUnit3TestAdapter.targets
4344
EndProjectSection
4445
EndProject
4546
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit.TestAdapter.Tests.Acceptance", "src\NUnit.TestAdapter.Tests.Acceptance\NUnit.TestAdapter.Tests.Acceptance.csproj", "{3FAC7EE0-664F-4B11-918B-8E0FF865EE4C}"
@@ -60,6 +61,7 @@ EndProject
6061
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcoreapp3.1", "netcoreapp3.1", "{2F940513-5B8F-45A5-A188-7C5D03D1B50D}"
6162
ProjectSection(SolutionItems) = preProject
6263
nuget\netcoreapp3.1\NUnit3TestAdapter.props = nuget\netcoreapp3.1\NUnit3TestAdapter.props
64+
nuget\netcoreapp3.1\NUnit3TestAdapter.targets = nuget\netcoreapp3.1\NUnit3TestAdapter.targets
6365
EndProjectSection
6466
EndProject
6567
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "images", "images", "{3D1159FD-FC4D-4750-87EA-F477B3912B3C}"

‎build.cake‎

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
#tool vswhere&version=3.1.7
2-
#tool Microsoft.TestPlatform&version=17.9.0
2+
#tool Microsoft.TestPlatform&version=17.12.0
33

44
//////////////////////////////////////////////////////////////////////
55
// ARGUMENTS
@@ -13,9 +13,9 @@ var configuration = Argument("configuration", "Release");
1313
//////////////////////////////////////////////////////////////////////
1414

1515

16-
var version = "4.6.0";
16+
var version = "5.0.0";
1717

18-
var modifier = "";
18+
var modifier = "-beta.7";
1919

2020
var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
2121
var packageVersion = version + modifier + dbgSuffix;
@@ -225,6 +225,7 @@ Task("CreateWorkingImage")
225225
CreateDirectory(net462Dir);
226226
CopyFiles(net462Files, net462Dir);
227227
CopyFileToDirectory("nuget/net462/NUnit3TestAdapter.props", net462Dir);
228+
CopyFileToDirectory("nuget/net462/NUnit3TestAdapter.targets", net462Dir);
228229

229230
var netcoreDir = PACKAGE_IMAGE_DIR + "build/" + NETCOREAPP_TFM;
230231
DotNetCorePublish(ADAPTER_PROJECT, new DotNetCorePublishSettings
@@ -234,6 +235,7 @@ Task("CreateWorkingImage")
234235
Framework = NETCOREAPP_TFM
235236
});
236237
CopyFileToDirectory($"nuget/{NETCOREAPP_TFM}/NUnit3TestAdapter.props", netcoreDir);
238+
CopyFileToDirectory($"nuget/{NETCOREAPP_TFM}/NUnit3TestAdapter.targets", netcoreDir);
237239
});
238240

239241
Task("PackageZip")

‎nuget.config‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,5 @@
33
<packageSources>
44
<clear />
55
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
6-
<!--<add key="Local" value="c:\nuget" />-->
76
</packageSources>
87
</configuration>

‎nuget/NUnit3TestAdapter.nuspec‎

Lines changed: 14 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,22 @@
1919
For VS 2017 and forward, you should add this package to every test project in your solution. (Earlier versions only require a single adapter package per solution.)
2020
</description>
2121
<releaseNotes>See https://docs.nunit.org/articles/vs-test-adapter/Adapter-Release-Notes.html </releaseNotes>
22-
<copyright>Copyright (c) 2011-2021 Charlie Poole, 2014-2024 Terje Sandstrom</copyright>
22+
<copyright>Copyright (c) 2011-2021 Charlie Poole, 2014-2025 Terje Sandstrom</copyright>
2323
<language>en-US</language>
2424
<tags>test visualstudio testadapter nunit nunit3 dotnet</tags>
2525

2626
<developmentDependency>false</developmentDependency>
27+
28+
<dependencies>
29+
<group targetFramework="net462">
30+
<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="1.5.3" />
31+
<dependency id="Microsoft.Testing.Platform.MSBuild" version="1.5.3" />
32+
</group>
33+
<group targetFramework="netcoreapp3.1">
34+
<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="1.5.3" />
35+
<dependency id="Microsoft.Testing.Platform.MSBuild" version="1.5.3" />
36+
</group>
37+
</dependencies>
2738
</metadata>
2839
<files>
2940
<file src="..\..\images\nunit_256.png" target="" />
@@ -36,6 +47,7 @@
3647
<file src="build\net462\nunit.engine.core.dll" target="build\net462\nunit.engine.core.dll" />
3748
<file src="build\net462\testcentric.engine.metadata.dll" target="build\net462\testcentric.engine.metadata.dll"/>
3849
<file src="build\net462\NUnit3TestAdapter.props" target="build\net462\NUnit3TestAdapter.props" />
50+
<file src="build\net462\NUnit3TestAdapter.targets" target="build\net462\NUnit3TestAdapter.targets" />
3951

4052
<file src="build\netcoreapp3.1\NUnit3.TestAdapter.dll" target="build\netcoreapp3.1\NUnit3.TestAdapter.dll" />
4153
<file src="build\netcoreapp3.1\NUnit3.TestAdapter.pdb" target="build\netcoreapp3.1\NUnit3.TestAdapter.pdb" />
@@ -44,6 +56,7 @@
4456
<file src="build\netcoreapp3.1\nunit.engine.core.dll" target="build\netcoreapp3.1\nunit.engine.core.dll" />
4557
<file src="build\netcoreapp3.1\testcentric.engine.metadata.dll" target="build\netcoreapp3.1\testcentric.engine.metadata.dll"/>
4658
<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" />
4760

4861

4962
</files>

‎nuget/net462/NUnit3TestAdapter.props‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<EnableNUnitRunner Condition=" '$(EnableNUnitRunner)' == '' ">false</EnableNUnitRunner>
6+
<IsTestingPlatformApplication>$(EnableNUnitRunner)</IsTestingPlatformApplication>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<!--
11+
!!! IMPORTANT !!!
12+
DO NOT CHANGE THE GUID, IT'S A WELL KNOWN EXTENSION POINT AND THIS EXTENSION NEEDS TO BE REGISTERED AT THE END
13+
WE HAVE CODE INSIDE THE TASK 'TestingPlatformEntryPoint' TO ENSURE THE ORDER OF THE REGISTRATION BASED ON THIS GUID
14+
-->
15+
<TestingPlatformBuilderHook Include="2E8E7F63-61DB-4EDB-A21E-5BF48279A7B8" Condition=" $(GenerateTestingPlatformEntryPoint) == 'true' " >
16+
<DisplayName>NUnit</DisplayName>
17+
<TypeFullName>NUnit.VisualStudio.TestAdapter.TestingPlatformAdapter.TestingPlatformBuilderHook</TypeFullName>
18+
</TestingPlatformBuilderHook>
19+
</ItemGroup>
20+
321
<ItemGroup>
4-
<None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll">
5-
<Link>NUnit3.TestAdapter.dll</Link>
6-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7-
<Visible>False</Visible>
8-
</None>
922
<None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb" Condition="Exists('$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb')">
1023
<Link>NUnit3.TestAdapter.pdb</Link>
1124
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎nuget/net462/NUnit3TestAdapter.targets‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<!-- Handle the coexistance between Microsoft.Testing.Platform and Microsoft.NET.Test.Sdk -->
5+
<PropertyGroup>
6+
<GenerateTestingPlatformEntryPoint Condition=" '$(GenerateTestingPlatformEntryPoint)' == '' ">$(EnableNUnitRunner)</GenerateTestingPlatformEntryPoint>
7+
<GenerateSelfRegisteredExtensions Condition=" '$(GenerateSelfRegisteredExtensions)' == '' ">$(EnableNUnitRunner)</GenerateSelfRegisteredExtensions>
8+
<DisableTestingPlatformServerCapability Condition=" '$(EnableNUnitRunner)' == 'false' or '$(EnableNUnitRunner)' == '' " >true</DisableTestingPlatformServerCapability>
9+
<GenerateProgramFile Condition=" '$(EnableNUnitRunner)' == 'true' ">false</GenerateProgramFile>
10+
</PropertyGroup>
11+
12+
<Choose>
13+
<!-- Avoid false warning about missing reference (msbuild bug) -->
14+
<!-- https://github.com/dotnet/msbuild/issues/9698#issuecomment-1945763467 -->
15+
<When Condition=" '$(EnableNUnitRunner)' == 'true' ">
16+
<ItemGroup>
17+
<Reference Include="NUnit3.TestAdapter">
18+
<HintPath>$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll</HintPath>
19+
</Reference>
20+
</ItemGroup>
21+
</When>
22+
<Otherwise>
23+
<ItemGroup>
24+
<None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll">
25+
<Link>NUnit3.TestAdapter.dll</Link>
26+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27+
<Visible>False</Visible>
28+
</None>
29+
</ItemGroup>
30+
</Otherwise>
31+
</Choose>
32+
33+
</Project>

‎nuget/netcoreapp3.1/NUnit3TestAdapter.props‎

Lines changed: 18 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,24 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<PropertyGroup>
5+
<EnableNUnitRunner Condition=" '$(EnableNUnitRunner)' == '' ">false</EnableNUnitRunner>
6+
<IsTestingPlatformApplication>$(EnableNUnitRunner)</IsTestingPlatformApplication>
7+
</PropertyGroup>
8+
9+
<ItemGroup>
10+
<!--
11+
!!! IMPORTANT !!!
12+
DO NOT CHANGE THE GUID, IT'S A WELL KNOWN EXTENSION POINT AND THIS EXTENSION NEEDS TO BE REGISTERED AT THE END
13+
WE HAVE CODE INSIDE THE TASK 'TestingPlatformEntryPoint' TO ENSURE THE ORDER OF THE REGISTRATION BASED ON THIS GUID
14+
-->
15+
<TestingPlatformBuilderHook Include="2E8E7F63-61DB-4EDB-A21E-5BF48279A7B8" Condition=" $(GenerateTestingPlatformEntryPoint) == 'true' " >
16+
<DisplayName>NUnit</DisplayName>
17+
<TypeFullName>NUnit.VisualStudio.TestAdapter.TestingPlatformAdapter.TestingPlatformBuilderHook</TypeFullName>
18+
</TestingPlatformBuilderHook>
19+
</ItemGroup>
20+
321
<ItemGroup>
4-
<None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll">
5-
<Link>NUnit3.TestAdapter.dll</Link>
6-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
7-
<Visible>False</Visible>
8-
</None>
922
<None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb" Condition="Exists('$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb')">
1023
<Link>NUnit3.TestAdapter.pdb</Link>
1124
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>

‎nuget/netcoreapp3.1/NUnit3TestAdapter.targets‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
3+
4+
<!-- Handle the coexistance between Microsoft.Testing.Platform and Microsoft.NET.Test.Sdk -->
5+
<PropertyGroup>
6+
<GenerateTestingPlatformEntryPoint Condition=" '$(GenerateTestingPlatformEntryPoint)' == '' ">$(EnableNUnitRunner)</GenerateTestingPlatformEntryPoint>
7+
<GenerateSelfRegisteredExtensions Condition=" '$(GenerateSelfRegisteredExtensions)' == '' ">$(EnableNUnitRunner)</GenerateSelfRegisteredExtensions>
8+
<DisableTestingPlatformServerCapability Condition=" '$(EnableNUnitRunner)' == 'false' or '$(EnableNUnitRunner)' == '' " >true</DisableTestingPlatformServerCapability>
9+
<GenerateProgramFile Condition=" '$(EnableNUnitRunner)' == 'true' ">false</GenerateProgramFile>
10+
</PropertyGroup>
11+
12+
<Choose>
13+
<!-- Avoid false warning about missing reference (msbuild bug) -->
14+
<!-- https://github.com/dotnet/msbuild/issues/9698#issuecomment-1945763467 -->
15+
<When Condition=" '$(EnableNUnitRunner)' == 'true' ">
16+
<ItemGroup>
17+
<Reference Include="NUnit3.TestAdapter">
18+
<HintPath>$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll</HintPath>
19+
</Reference>
20+
</ItemGroup>
21+
</When>
22+
<Otherwise>
23+
<ItemGroup>
24+
<None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.dll">
25+
<Link>NUnit3.TestAdapter.dll</Link>
26+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
27+
<Visible>False</Visible>
28+
</None>
29+
</ItemGroup>
30+
</Otherwise>
31+
</Choose>
32+
33+
</Project>

0 commit comments

Comments
 (0)