Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion MixedTests.nunit
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<NUnitProject>
<Settings processModel="Default" domainUsage="Default" />
<Settings activeconfig="Release" processModel="Default" domainUsage="Default" />

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this change relevant to this issue?

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Remnant of earlier work. :-)

<Config name="Debug" appbase="bin/Debug">
<assembly path="testdata/net462/mock-assembly.dll" />
<assembly path="testdata/net6.0/mock-assembly.dll" />
Expand Down
9 changes: 1 addition & 8 deletions NUnitConsole.sln
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 18
VisualStudioVersion = 18.7.11919.86 stable
VisualStudioVersion = 18.7.11919.86
MinimumVisualStudioVersion = 10.0.40219.1
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}"
ProjectSection(SolutionItems) = preProject
Expand Down Expand Up @@ -42,8 +42,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitEngine", "NUnitEngine"
src\NUnitEngine\Directory.Build.props = src\NUnitEngine\Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.api", "src\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj", "{775FAD50-3623-4922-97C4-DFB29A8BE4C7}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine", "src\NUnitEngine\nunit.engine\nunit.engine.csproj", "{372A3447-D657-40FF-A089-77C19FEC30C8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.tests", "src\NUnitEngine\nunit.engine.tests\nunit.engine.tests.csproj", "{D694CB69-6CFB-4762-86C2-EB27B808B282}"
Expand Down Expand Up @@ -161,10 +159,6 @@ Global
Release|Any CPU = Release|Any CPU
EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution
{775FAD50-3623-4922-97C4-DFB29A8BE4C7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{775FAD50-3623-4922-97C4-DFB29A8BE4C7}.Debug|Any CPU.Build.0 = Debug|Any CPU
{775FAD50-3623-4922-97C4-DFB29A8BE4C7}.Release|Any CPU.ActiveCfg = Release|Any CPU
{775FAD50-3623-4922-97C4-DFB29A8BE4C7}.Release|Any CPU.Build.0 = Release|Any CPU
{372A3447-D657-40FF-A089-77C19FEC30C8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{372A3447-D657-40FF-A089-77C19FEC30C8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{372A3447-D657-40FF-A089-77C19FEC30C8}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -279,7 +273,6 @@ Global
EndGlobalSection
GlobalSection(NestedProjects) = preSolution
{A972031D-2F61-4183-AF75-99EE1A9F6B32} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
{775FAD50-3623-4922-97C4-DFB29A8BE4C7} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{372A3447-D657-40FF-A089-77C19FEC30C8} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{D694CB69-6CFB-4762-86C2-EB27B808B282} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{F3E87D0F-6F06-4C0B-AE06-42C0834C3C6E} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}
Expand Down
25 changes: 5 additions & 20 deletions build.cake
Original file line number Diff line number Diff line change
Expand Up @@ -38,20 +38,6 @@ PackageDefinition NUnitExtensibilityApiPackage = new NuGetPackage(
HasDirectory("lib/netstandard2.0").WithFile("nunit.extensibility.api.pdb")
});

PackageDefinition NUnitEngineApiPackage = new NuGetPackage(
id: "NUnit.Engine.Api",
source: BuildSettings.SourceDirectory + "NUnitEngine/nunit.engine.api/nunit.engine.api.csproj",
checks: new PackageCheck[] {
HasFile("LICENSE.txt"),
HasDirectory("lib/net462").WithFile("nunit.engine.api.dll"),
HasDirectory("lib/netstandard2.0").WithFile("nunit.engine.api.dll"),
HasDependency("NUnit.Extensibility.Api", THIS_VERSION)
},
symbols: new PackageCheck[] {
HasDirectory("lib/net462").WithFile("nunit.engine.api.pdb"),
HasDirectory("lib/netstandard2.0").WithFile("nunit.engine.api.pdb")
});

PackageDefinition NUnitCommonPackage = new NuGetPackage(
id: "NUnit.Common",
source: BuildSettings.SourceDirectory + "NUnitCommon/nunit.common/nunit.common.csproj",
Expand All @@ -60,7 +46,7 @@ PackageDefinition NUnitCommonPackage = new NuGetPackage(
HasFile("LICENSE.txt"),
HasDirectory("lib/net462").WithFile("nunit.common.dll"),
HasDirectory("lib/netstandard2.0").WithFile("nunit.common.dll"),
HasDependency("NUnit.Engine.Api", THIS_VERSION)
HasDependency("NUnit.Engine.Api")
},
symbols: new PackageCheck[]
{
Expand All @@ -77,7 +63,7 @@ PackageDefinition NUnitExtensibilityPackage = new NuGetPackage(
HasDirectory("lib/net462").WithFile("nunit.extensibility.dll"),
HasDirectory("lib/netstandard2.0").WithFile("nunit.extensibility.dll"),
HasDependency("NUnit.Extensibility.Api", THIS_VERSION),
HasDependency("NUnit.Engine.Api", THIS_VERSION),
HasDependency("NUnit.Engine.Api"),
HasDependency("NUnit.Common", THIS_VERSION),
HasDependency("TestCentric.Metadata", "3.0.4")
},
Expand All @@ -95,7 +81,7 @@ PackageDefinition NUnitAgentCorePackage = new NuGetPackage(
HasFiles("LICENSE.txt"),
HasDirectory("lib/net462").WithFile("nunit.agent.core.dll" ),
HasDirectory("lib/net8.0").WithFiles("nunit.agent.core.dll"),
HasDependency("NUnit.Engine.Api", THIS_VERSION),
HasDependency("NUnit.Engine.Api"),
HasDependency("NUnit.Common", THIS_VERSION),
HasDependency("TestCentric.Metadata", "3.0.4")
},
Expand All @@ -115,7 +101,7 @@ PackageDefinition NUnitEnginePackage = new NuGetPackage(
HasFiles("LICENSE.txt"),
HasDirectory("lib/net462").WithFile("nunit.engine.dll"),
HasDirectory("lib/net8.0").WithFile("nunit.engine.dll"),
HasDependency("NUnit.Engine.Api", THIS_VERSION),
HasDependency("NUnit.Engine.Api"),
HasDependency("NUnit.Common", THIS_VERSION),
HasDependency("NUnit.Extensibility", THIS_VERSION)
},
Expand Down Expand Up @@ -156,7 +142,7 @@ PackageDefinition NUnitConsoleRunnerNuGetPackage = new NuGetPackage(
new DirectoryContent("tools").WithFiles(
"net462/nunit-console.exe", "net462/nunit-console.exe.config", "net462/nunit.engine.dll",
"net462/nunit.extensibility.dll", "net462/nunit.extensibility.api.dll", "net462/nunit.common.dll",
"net462/nunit-console.pdb", "net462/nunit.engine.pdb", "net462/nunit.engine.api.pdb",
"net462/nunit-console.pdb", "net462/nunit.engine.pdb",
"net462/nunit.extensibility.pdb", "net462/nunit.extensibility.api.pdb", "net462/nunit.common.pdb",
"net462/nunit.engine.api.dll", "net462/testcentric.metadata.dll"))
.WithDependencies(KnownExtensions.BundledNuGetAgents),
Expand All @@ -179,7 +165,6 @@ PackageDefinition NUnitConsoleNuGetPackage = new NuGetPackage(
// Dependencies must precede all the packages that depend on them.
BuildSettings.Packages.AddRange(new PackageDefinition[] {
NUnitExtensibilityApiPackage,
NUnitEngineApiPackage,
NUnitCommonPackage,
NUnitExtensibilityPackage,
NUnitAgentCorePackage,
Expand Down
1 change: 0 additions & 1 deletion nuget/runners/nunit.console-runner.nuspec
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
<file src="net462/nunit-console.pdb" target="tools" />
<file src="net462/nunit-console.exe.config" target="tools" />
<file src="net462/nunit.engine.api.dll" target="tools" />
<file src="net462/nunit.engine.api.pdb" target="tools" />
<file src="net462/nunit.engine.api.xml" target="tools" />
<file src="net462/nunit.extensibility.dll" target="tools" />
<file src="net462/nunit.extensibility.pdb" target="tools" />
Expand Down
1 change: 1 addition & 0 deletions src/Directory.Build.props
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
<DebugSymbols>true</DebugSymbols>
<!-- Commonly Used Package Versions -->
<AnnotatedReferenceAssemblyVersion>8.0.0</AnnotatedReferenceAssemblyVersion>
<EngineApiVersion>4.0.0-beta.3</EngineApiVersion>
<!-- Informational Settings -->
<Company>NUnit Software</Company>
<Product>NUnit 4 Runner and Engine</Product>
Expand Down
9 changes: 6 additions & 3 deletions src/NUnitCommon/DirectTestAgent/DirectTestAgent.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,16 @@
<CheckEolTargetFramework>false</CheckEolTargetFramework>
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
<ItemGroup>
<ProjectReference Include="..\nunit.agent.core\nunit.agent.core.csproj" />
<ProjectReference Include="..\nunit.extensibility\nunit.extensibility.csproj" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">
<ItemGroup>
<PackageReference Include="NUnit.Engine.Api" Version="$(EngineApiVersion)" />
</ItemGroup>

<ItemGroup Condition="'$(TargetFramework)'=='net8.0'">

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tabs/spaces issue.

<PackageReference Include="Microsoft.Extensions.DependencyModel" Version="8.0.2" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/NUnitCommon/nunit.agent.core/nunit.agent.core.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
<ProjectReference Include="..\nunit.extensibility\nunit.extensibility.csproj" />
<ProjectReference Include="..\nunit.common\nunit.common.csproj" />
</ItemGroup>
Expand All @@ -35,6 +34,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="NUnit.Engine.Api" Version="$(EngineApiVersion)" />
<PackageReference Include="TestCentric.Metadata" Version="3.0.4" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
<ItemGroup>
<ProjectReference Include="..\..\TestData\mock-assembly\mock-assembly.csproj" />
<ProjectReference Include="..\nunit.common\nunit.common.csproj" />
<ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/NUnitCommon/nunit.common/nunit.common.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
<PackageReference Include="NUnit.Engine.Api" Version="$(EngineApiVersion)" />
</ItemGroup>

</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
<ProjectReference Include="..\nunit.extensibility\nunit.extensibility.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,11 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="NUnit.Engine.Api" Version="$(EngineApiVersion)" />
<PackageReference Include="TestCentric.Metadata" Version="3.0.4" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
<ProjectReference Include="..\nunit.extensibility.api\nunit.extensibility.api.csproj" />
<ProjectReference Include="..\..\NUnitCommon\nunit.common\nunit.common.csproj" />
</ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,6 @@
<ProjectReference Include="..\..\NUnitEngine\nunit.engine\nunit.engine.csproj" />
<ProjectReference Condition="'$(TargetFramework)'=='net462'" Include="..\nunit4-console\nunit4-console.csproj" />
<ProjectReference Condition="'$(TargetFramework)'=='net8.0'" Include="..\nunit4-netcore-console\nunit4-netcore-console.csproj" />
<ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
<ProjectReference Include="..\..\NUnitCommon\nunit.common\nunit.common.csproj" />
</ItemGroup>

Expand Down
1 change: 0 additions & 1 deletion src/NUnitConsole/nunit4-console/nunit4-console.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,6 @@

<ItemGroup>
<ProjectReference Include="..\..\NUnitEngine\nunit.engine\nunit.engine.csproj" />
<ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
<ProjectReference Include="..\..\NUnitCommon\nunit.common\nunit.common.csproj" />
</ItemGroup>

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,6 @@

<ItemGroup>
<ProjectReference Include="..\..\NUnitEngine\nunit.engine\nunit.engine.csproj" />
<ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
<ProjectReference Include="..\..\NUnitCommon\nunit.common\nunit.common.csproj" />
</ItemGroup>

Expand Down
84 changes: 0 additions & 84 deletions src/NUnitEngine/nunit.engine.api/AsyncTestEngineResult.cs

This file was deleted.

This file was deleted.

This file was deleted.

Loading
Loading