Merge pull request #1740 from nunit/issue-1735c

Use MSBuild to build NUnit.Engine package

Author: CharliePoole

NUnitConsole.sln

@@ -157,11 +157,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.agent.core.tests", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DirectTestAgent", "src\NUnitCommon\DirectTestAgent\DirectTestAgent.csproj", "{0E415863-1621-41DB-9DB0-36B5664DFF35}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nunit.agent.core", "nunit.agent.core", "{02EA681E-C7D8-13C7-8484-4AC65E1B71E8}"
-	ProjectSection(SolutionItems) = preProject
-		nuget\nunit.agent.core\nunit.agent.core.nuspec = nuget\nunit.agent.core\nunit.agent.core.nuspec
-	EndProjectSection
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeExtensionsV1", "src\TestData\FakeExtensions\1.0\FakeExtensionsV1.csproj", "{3AA135F1-CF80-C1D9-89FF-1DF30F567CA1}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FakeExtensionsV2", "src\TestData\FakeExtensions\2.0\FakeExtensionsV2.csproj", "{E3A8037B-83EF-CB79-3EED-492C89F47BF9}"
@@ -344,7 +339,6 @@ Global
 		{4FCFAF1C-1579-4A1C-BAF9-9627E39D7CDA} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
 		{89258A3E-5B62-487A-9AE7-D7672CBF61F1} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
 		{0E415863-1621-41DB-9DB0-36B5664DFF35} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
-		{02EA681E-C7D8-13C7-8484-4AC65E1B71E8} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}
 		{3AA135F1-CF80-C1D9-89FF-1DF30F567CA1} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
 		{E3A8037B-83EF-CB79-3EED-492C89F47BF9} = {37D508B2-91E0-4B32-869B-DFF9E68EA213}
 		{C3D1ADBF-7497-4725-8AE4-6B4693F68622} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}

build.cake

@@ -81,7 +81,7 @@ PackageDefinition NUnitAgentCorePackage = new PackageDefinition(
     source: BuildSettings.SourceDirectory + "NUnitCommon/nunit.agent.core/nunit.agent.core.csproj",
     checks: new PackageCheck[]
     {
-        HasFiles("LICENSE.txt"/*, "NOTICES.txt"*/),
+        HasFiles("LICENSE.txt"),
         HasDirectory("lib/net462").WithFile("nunit.agent.core.dll" ),
         HasDirectory("lib/net8.0").WithFiles("nunit.agent.core.dll")
     },
@@ -93,6 +93,26 @@ PackageDefinition NUnitAgentCorePackage = new PackageDefinition(
     testRunner: new DirectTestAgentRunner(),
     tests: AgentCoreTests);
 
+PackageDefinition NUnitEnginePackage = new PackageDefinition(
+    PackageType.NuGet,
+    id: "NUnit.Engine",
+    source: BuildSettings.SourceDirectory + "NUnitEngine/nunit.engine/nunit.engine.csproj",
+    checks: new PackageCheck[]
+    {
+        HasFiles("LICENSE.txt"),
+        HasDirectory("lib/net462").WithFile("nunit.engine.dll"),
+        HasDirectory("lib/net8.0").WithFile("nunit.engine.dll")
+    },
+    symbols: new PackageCheck[]
+    {
+        HasDirectory("lib/net462").WithFile("nunit.engine.pdb"),
+        HasDirectory("lib/net8.0").WithFile("nunit.engine.pdb")
+    });
+// TODO: Revise AgentSelector and reinstate tests
+//testRunner: new AgentSelector(
+//    BuildSettings.NuGetTestDirectory + $"NUnit.Engine.{BuildSettings.PackageVersion}/agents"),
+//tests: EngineTests),
+
 PackageDefinition NUnitConsoleRunnerNuGetPackage = new PackageDefinition(
     PackageType.NuGet,
     id: "NUnit.ConsoleRunner",
@@ -156,30 +176,6 @@ PackageDefinition NUnitConsoleRunnerChocolateyPackage = new PackageDefinition(
         + $"nunit-console-runner.{BuildSettings.ChocolateyPackageVersion}/tools/nunit-console.exe"),
     tests: StandardRunnerTests);
 
-PackageDefinition NUnitEnginePackage = new PackageDefinition(
-    PackageType.NuGet,
-    id: "NUnit.Engine",
-    source: BuildSettings.NuGetDirectory + "engine/nunit.engine.nuspec",
-    checks: new PackageCheck[] {
-        HasFiles("LICENSE.txt", "NOTICES.txt"),
-        HasDirectory("lib/net462").WithFiles(
-            "nunit.engine.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
-            "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
-        HasDirectory("lib/net8.0").WithFiles(
-            "nunit.engine.dll", "nunit.agent.core.dll", "nunit.extensibility.dll", "nunit.extensibility.api.dll",
-            "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll") },
-    symbols: new PackageCheck[] {
-        HasDirectory("lib/net462").WithFiles(
-            "nunit.engine.pdb", "nunit.extensibility.pdb",
-            "nunit.extensibility.api.pdb", "nunit.engine.api.pdb"),
-        HasDirectory("lib/net8.0").WithFiles(
-            "nunit.engine.pdb","nunit.extensibility.pdb", "nunit.extensibility.api.pdb",
-            "nunit.common.pdb", "nunit.engine.api.pdb") });
-// TODO: Revise AgentSelector and reinstate tests
-//testRunner: new AgentSelector(
-//    BuildSettings.NuGetTestDirectory + $"NUnit.Engine.{BuildSettings.PackageVersion}/agents"),
-//tests: EngineTests),
-
 // Add all packages to BuildSettings in order they should be build.
 // Dependencies must precede all the packages that depend on them.
 BuildSettings.Packages.AddRange(new PackageDefinition[] {

nuget/engine/build/net20/nunit.engine.props

@@ -6,6 +6,11 @@
     <NoWarn>$(NoWarn);SYSLIB0011</NoWarn>
   </PropertyGroup>
 
+  <PropertyGroup>
+    <PackageId>NUnit.Extensibility</PackageId>
+    <Description>Contains implementation of the NUnit extensibility model.</Description>
+  </PropertyGroup>
+
   <ItemGroup>
     <PackageReference Include="TestCentric.Metadata" Version="3.0.3" />
   </ItemGroup>