Skip to content

Commit 3bc62e9

Browse files
OsirisTerjeOsirisTerje
authored
Merge pull request #1368 from nunit/Issue1367
Fix for issue #1376
2 parents 3778747 + c04cf65 commit 3bc62e9

File tree

6 files changed

+53
-41
lines changed

6 files changed

+53
-41
lines changed

‎Directory.Packages.props‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.14.1" />
88
<PackageVersion Include="NSubstitute" Version="5.3.0" />
99
<PackageVersion Include="nunit" Version="4.4.0" />
10-
<PackageVersion Include="nunit.engine" Version="3.21.0" />
10+
<PackageVersion Include="nunit.engine" Version="3.21.1-alpha.2" />
1111
<PackageVersion Include="NUnit3TestAdapter" Version="6.0.0" />
1212
<PackageVersion Include="SourceLink.Create.CommandLine" Version="2.8.3" />
1313
<PackageVersion Include="TestCentric.Metadata" Version="3.0.4" />
@@ -18,7 +18,6 @@
1818
<PackageVersion Include="Castle.Core" Version="5.2.1" />
1919
<PackageVersion Include="Microsoft.Testing.Extensions.VSTestBridge" Version="2.0.2" />
2020
<PackageVersion Include="Microsoft.Testing.Extensions.TrxReport" Version="2.0.2" />
21-
<PackageVersion Include="Microsoft.Extensions.DependencyModel" Version="10.0.0" />
2221
</ItemGroup>
2322
<ItemGroup>
2423
<GlobalPackageReference Include="NUnit.Analyzers" Version="4.11.2">

‎build.cake‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,9 @@ var configuration = Argument("configuration", "Release");
1313
//////////////////////////////////////////////////////////////////////
1414

1515

16-
var version = "6.0.0";
16+
var version = "6.0.1";
1717

18-
var modifier = "";
18+
var modifier = "-alpha.5";
1919

2020
var dbgSuffix = configuration.ToLower() == "debug" ? "-dbg" : "";
2121
var packageVersion = version + modifier + dbgSuffix;

‎nuget.config‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,6 @@
33
<packageSources>
44
<clear />
55
<add key="nuget" value="https://api.nuget.org/v3/index.json" />
6+
<add key="myget" value="https://www.myget.org/F/nunit/api/v3/index.json" />
67
</packageSources>
78
</configuration>

‎nuget/NUnit3TestAdapter.nuspec‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,15 @@
2626
<developmentDependency>false</developmentDependency>
2727

2828
<dependencies>
29+
<group targetFramework="net462">
2930
<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="2.0.2" />
3031
<dependency id="Microsoft.Testing.Platform.MSBuild" version="2.0.2" />
31-
<dependency id="Microsoft.Extensions.DependencyModel" version="10.0.0" />
32+
</group>
33+
<group targetFramework="net8.0">
34+
<dependency id="Microsoft.Testing.Extensions.VSTestBridge" version="2.0.2" />
35+
<dependency id="Microsoft.Testing.Platform.MSBuild" version="2.0.2" />
36+
</group>
37+
3238
</dependencies>
3339

3440
</metadata>
@@ -51,6 +57,8 @@
5157
<file src="build\net8.0\nunit.engine.api.dll" target="build\net8.0\nunit.engine.api.dll" />
5258
<file src="build\net8.0\nunit.engine.core.dll" target="build\net8.0\nunit.engine.core.dll" />
5359
<file src="build\net8.0\testcentric.engine.metadata.dll" target="build\net8.0\testcentric.engine.metadata.dll"/>
60+
<file src="build\net8.0\Microsoft.Extensions.DependencyModel.dll" target="build\net8.0\Microsoft.Extensions.DependencyModel.dll"/>
61+
5462
<file src="build\net8.0\NUnit3TestAdapter.props" target="build\net8.0\NUnit3TestAdapter.props" />
5563
<file src="build\net8.0\NUnit3TestAdapter.targets" target="build\net8.0\NUnit3TestAdapter.targets" />
5664

‎nuget/net8.0/NUnit3TestAdapter.props‎

Lines changed: 40 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,48 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<Project ToolsVersion="12.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
33

4-
<ItemGroup>
5-
<!--
4+
<ItemGroup>
5+
<!--
66
!!! IMPORTANT !!!
77
DO NOT CHANGE THE GUID, IT'S A WELL KNOWN EXTENSION POINT AND THIS EXTENSION NEEDS TO BE REGISTERED AT THE END
88
WE HAVE CODE INSIDE THE TASK 'TestingPlatformEntryPoint' TO ENSURE THE ORDER OF THE REGISTRATION BASED ON THIS GUID
99
-->
10-
<TestingPlatformBuilderHook Include="2E8E7F63-61DB-4EDB-A21E-5BF48279A7B8" >
11-
<DisplayName>NUnit</DisplayName>
12-
<TypeFullName>NUnit.VisualStudio.TestAdapter.TestingPlatformAdapter.TestingPlatformBuilderHook</TypeFullName>
13-
</TestingPlatformBuilderHook>
14-
</ItemGroup>
15-
16-
<ItemGroup>
17-
<None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb" Condition="Exists('$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb')">
18-
<Link>NUnit3.TestAdapter.pdb</Link>
19-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
20-
<Visible>False</Visible>
21-
</None>
22-
<None Include="$(MSBuildThisFileDirectory)nunit.engine.dll">
23-
<Link>nunit.engine.dll</Link>
24-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
25-
<Visible>False</Visible>
26-
</None>
27-
<None Include="$(MSBuildThisFileDirectory)nunit.engine.api.dll">
28-
<Link>nunit.engine.api.dll</Link>
29-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
30-
<Visible>False</Visible>
31-
</None>
32-
<None Include="$(MSBuildThisFileDirectory)nunit.engine.core.dll">
33-
<Link>nunit.engine.core.dll</Link>
34-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
35-
<Visible>False</Visible>
36-
</None>
37-
<None Include="$(MSBuildThisFileDirectory)testcentric.engine.metadata.dll">
38-
<Link>testcentric.engine.metadata.dll</Link>
39-
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
40-
<Visible>False</Visible>
41-
</None>
42-
</ItemGroup>
10+
<TestingPlatformBuilderHook Include="2E8E7F63-61DB-4EDB-A21E-5BF48279A7B8" >
11+
<DisplayName>NUnit</DisplayName>
12+
<TypeFullName>NUnit.VisualStudio.TestAdapter.TestingPlatformAdapter.TestingPlatformBuilderHook</TypeFullName>
13+
</TestingPlatformBuilderHook>
14+
</ItemGroup>
15+
16+
<ItemGroup>
17+
<None Include="$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb" Condition="Exists('$(MSBuildThisFileDirectory)NUnit3.TestAdapter.pdb')">
18+
<Link>NUnit3.TestAdapter.pdb</Link>
19+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
20+
<Visible>False</Visible>
21+
</None>
22+
<None Include="$(MSBuildThisFileDirectory)nunit.engine.dll">
23+
<Link>nunit.engine.dll</Link>
24+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
25+
<Visible>False</Visible>
26+
</None>
27+
<None Include="$(MSBuildThisFileDirectory)nunit.engine.api.dll">
28+
<Link>nunit.engine.api.dll</Link>
29+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
30+
<Visible>False</Visible>
31+
</None>
32+
<None Include="$(MSBuildThisFileDirectory)nunit.engine.core.dll">
33+
<Link>nunit.engine.core.dll</Link>
34+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
35+
<Visible>False</Visible>
36+
</None>
37+
<None Include="$(MSBuildThisFileDirectory)testcentric.engine.metadata.dll">
38+
<Link>testcentric.engine.metadata.dll</Link>
39+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
40+
<Visible>False</Visible>
41+
</None>
42+
<None Include="$(MSBuildThisFileDirectory)Microsoft.Extensions.DependencyModel.dll">
43+
<Link>Microsoft.Extensions.DependencyModel.dll</Link>
44+
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
45+
<Visible>False</Visible>
46+
</None>
47+
</ItemGroup>
4348
</Project>

‎src/NUnitTestAdapter/NUnit.TestAdapter.csproj‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,6 @@
3636
<PackageReference Include="SourceLink.Create.CommandLine" PrivateAssets="All" />
3737
<PackageReference Include="nunit.engine" />
3838
<PackageReference Include="TestCentric.Metadata" Aliases="TestCentric" />
39-
<PackageReference Include="Microsoft.Extensions.DependencyModel" />
4039
</ItemGroup>
4140

4241
<Target Name="PreventTestPlatformObjectModelCopyLocal" AfterTargets="ResolveReferences">

0 commit comments

Comments
 (0)