Merge pull request #937 from nunit/issue-923b

Run .NET Core Tests from NUnit3 Console
nunit · May 9, 2021 · 7822971 · 7822971
2 parents 33c8f59 + d81b3ba
commit 7822971
Show file tree

Hide file tree

Showing 47 changed files with 1,755 additions and 112 deletions.
diff --git a/NUnitConsole.sln b/NUnitConsole.sln
@@ -14,8 +14,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
  build.cake = build.cake
  BUILDING.md = BUILDING.md
  CHANGES.txt = CHANGES.txt
+ ci.cake = ci.cake
  CONTRIBUTING.md = CONTRIBUTING.md
  src\Directory.Build.props = src\Directory.Build.props
+ header-check.cake = header-check.cake
  LICENSE.txt = LICENSE.txt
  NetFXTests.nunit = NetFXTests.nunit
  NOTICES.txt = NOTICES.txt
@@ -24,6 +26,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
  package-checks.cake = package-checks.cake
  package-tests.cake = package-tests.cake
  README.md = README.md
+ test-results.cake = test-results.cake
  EndProjectSection
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "nuget", "nuget", "{A972031D-2F61-4183-AF75-99EE1A9F6B32}"
@@ -38,7 +41,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.tests", "src\N
  ProjectSection(ProjectDependencies) = postProject
  {B1D90742-39BD-429C-8E87-C5CD2991DF27} = {B1D90742-39BD-429C-8E87-C5CD2991DF27}
  {C2A8FC7A-FA64-46EA-AF6D-73D6B371DBF8} = {C2A8FC7A-FA64-46EA-AF6D-73D6B371DBF8}
- {28B605B2-E2E9-417E-8369-49E263F1F31B} = {28B605B2-E2E9-417E-8369-49E263F1F31B}
  {0DE218CA-AFB8-423A-9CD2-E22DEAC55C46} = {0DE218CA-AFB8-423A-9CD2-E22DEAC55C46}
  EndProjectSection
 EndProject
@@ -53,11 +55,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit3-console.tests", "src
  {B1D90742-39BD-429C-8E87-C5CD2991DF27} = {B1D90742-39BD-429C-8E87-C5CD2991DF27}
  {D694CB69-6CFB-4762-86C2-EB27B808B282} = {D694CB69-6CFB-4762-86C2-EB27B808B282}
  {C2A8FC7A-FA64-46EA-AF6D-73D6B371DBF8} = {C2A8FC7A-FA64-46EA-AF6D-73D6B371DBF8}
- {28B605B2-E2E9-417E-8369-49E263F1F31B} = {28B605B2-E2E9-417E-8369-49E263F1F31B}
  EndProjectSection
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-x86", "src\NUnitEngine\nunit-agent\nunit-agent-x86.csproj", "{28B605B2-E2E9-417E-8369-49E263F1F31B}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "engine", "engine", "{43A219A8-2995-4884-806F-FDB9CD25D403}"
  ProjectSection(SolutionItems) = preProject
  nuget\engine\nunit.agent.addins = nuget\engine\nunit.agent.addins
@@ -98,6 +97,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "deprecated", "deprecated",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.engine.core", "src\NUnitEngine\nunit.engine.core\nunit.engine.core.csproj", "{A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-x86", "src\NUnitEngine\nunit-agent-x86\nunit-agent-x86.csproj", "{333D2FBC-CCA7-46AF-9453-C310671A67B0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "mock-assembly-x86", "src\NUnitEngine\mock-assembly-x86\mock-assembly-x86.csproj", "{9D3015EE-5B84-41B3-A1D3-1A439370C392}"
+EndProject
 Global
  GlobalSection(SolutionConfigurationPlatforms) = preSolution
  Debug|Any CPU = Debug|Any CPU
@@ -128,10 +131,6 @@ Global
  {B310A760-8AE1-41CA-81F8-03B12E2FCE30}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {B310A760-8AE1-41CA-81F8-03B12E2FCE30}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {B310A760-8AE1-41CA-81F8-03B12E2FCE30}.Release|Any CPU.Build.0 = Release|Any CPU
- {28B605B2-E2E9-417E-8369-49E263F1F31B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {28B605B2-E2E9-417E-8369-49E263F1F31B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {28B605B2-E2E9-417E-8369-49E263F1F31B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {28B605B2-E2E9-417E-8369-49E263F1F31B}.Release|Any CPU.Build.0 = Release|Any CPU
  {D2C80E4B-1117-4F02-AB02-E453BDA0C58E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
  {D2C80E4B-1117-4F02-AB02-E453BDA0C58E}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {D2C80E4B-1117-4F02-AB02-E453BDA0C58E}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -144,6 +143,14 @@ Global
  {A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Debug|Any CPU.Build.0 = Debug|Any CPU
  {A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Release|Any CPU.ActiveCfg = Release|Any CPU
  {A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {333D2FBC-CCA7-46AF-9453-C310671A67B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {333D2FBC-CCA7-46AF-9453-C310671A67B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {333D2FBC-CCA7-46AF-9453-C310671A67B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {333D2FBC-CCA7-46AF-9453-C310671A67B0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9D3015EE-5B84-41B3-A1D3-1A439370C392}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9D3015EE-5B84-41B3-A1D3-1A439370C392}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9D3015EE-5B84-41B3-A1D3-1A439370C392}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9D3015EE-5B84-41B3-A1D3-1A439370C392}.Release|Any CPU.Build.0 = Release|Any CPU
  EndGlobalSection
  GlobalSection(SolutionProperties) = preSolution
  HideSolutionNode = FALSE
@@ -156,14 +163,15 @@ Global
  {C2A8FC7A-FA64-46EA-AF6D-73D6B371DBF8} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
  {0DE218CA-AFB8-423A-9CD2-E22DEAC55C46} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
  {B310A760-8AE1-41CA-81F8-03B12E2FCE30} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
- {28B605B2-E2E9-417E-8369-49E263F1F31B} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
  {43A219A8-2995-4884-806F-FDB9CD25D403} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}
  {F3E87D0F-6F06-4C0B-AE06-42C0834C3C6E} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}
  {D2C80E4B-1117-4F02-AB02-E453BDA0C58E} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
  {B1D90742-39BD-429C-8E87-C5CD2991DF27} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
  {4FDF7BFA-A337-41D3-898D-C6A98278E6AD} = {49D441DF-39FD-4F4D-AECA-86CF8EFE23AF}
  {9A7C8370-ED1F-486F-A8F5-C5BF4221464E} = {A972031D-2F61-4183-AF75-99EE1A9F6B32}
  {A19C026B-1C0F-4AA3-AC49-7D8B4C7231CF} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
+ {333D2FBC-CCA7-46AF-9453-C310671A67B0} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
+ {9D3015EE-5B84-41B3-A1D3-1A439370C392} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
  EndGlobalSection
  GlobalSection(ExtensibilityGlobals) = postSolution
  SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}

diff --git a/build.cake b/build.cake
@@ -51,6 +51,7 @@ var ZIP_IMG = PROJECT_DIR + "zip-image/";
 
 var SOLUTION_FILE = PROJECT_DIR + "NUnitConsole.sln";
 var ENGINE_CSPROJ = PROJECT_DIR + "src/NUnitEngine/nunit.engine/nunit.engine.csproj";
+var AGENT_CSPROJ = PROJECT_DIR + "src/NUnitEngine/nunit-agent/nunit-agent.csproj";
 var ENGINE_API_CSPROJ = PROJECT_DIR + "src/NUnitEngine/nunit.engine.api/nunit.engine.api.csproj";
 var ENGINE_TESTS_CSPROJ = PROJECT_DIR + "src/NUnitEngine/nunit.engine.tests/nunit.engine.tests.csproj";
 var CONSOLE_CSPROJ = PROJECT_DIR + "src/NUnitConsole/nunit3-console/nunit3-console.csproj";
@@ -209,12 +210,17 @@ Task("Build")
  .WithProperty("TargetFramework", framework)
  .WithProperty("PublishDir", BIN_DIR + framework));
 
- foreach (var framework in new [] { "netstandard2.0" })
- MSBuild(ENGINE_API_CSPROJ, CreateMSBuildSettings("Publish")
- .WithProperty("TargetFramework", framework)
- .WithProperty("PublishDir", BIN_DIR + framework));
+ foreach (var framework in new[] { "netcoreapp3.1" })
+ MSBuild(AGENT_CSPROJ, CreateMSBuildSettings("Publish")
+ .WithProperty("TargetFramework", framework)
+ .WithProperty("PublishDir", BIN_DIR + "agents/" + framework));
+
+ foreach (var framework in new[] { "netstandard2.0" })
+ MSBuild(ENGINE_API_CSPROJ, CreateMSBuildSettings("Publish")
+ .WithProperty("TargetFramework", framework)
+ .WithProperty("PublishDir", BIN_DIR + framework));
 
- foreach(var framework in new [] { "netcoreapp2.1", "netcoreapp3.1" })
+ foreach (var framework in new [] { "netcoreapp2.1", "netcoreapp3.1" })
  MSBuild(ENGINE_TESTS_CSPROJ, CreateMSBuildSettings("Publish")
  .WithProperty("TargetFramework", framework)
  .WithProperty("PublishDir", BIN_DIR + framework));
@@ -457,6 +463,7 @@ Task("BuildChocolateyPackages")
  new ChocolateyNuSpecContent { Source = CHOCO_DIR + "nunit.choco.addins", Target = "tools" },
  new ChocolateyNuSpecContent { Source = CHOCO_DIR + "nunit.agent.addins", Target = "tools/agents/net20" },
  new ChocolateyNuSpecContent { Source = CHOCO_DIR + "nunit.agent.addins", Target = "tools/agents/net40" },
+ new ChocolateyNuSpecContent { Source = CHOCO_DIR + "nunit.agent.addins", Target = "tools/agents/netcoreapp3.1" },
  new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/net20/nunit-agent.exe", Target="tools/agents/net20" },
  new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/net20/nunit-agent.exe.config", Target="tools/agents/net20" },
  new ChocolateyNuSpecContent { Source = CHOCO_DIR + "nunit-agent.exe.ignore", Target="tools/agents/net20" },
@@ -477,6 +484,15 @@ Task("BuildChocolateyPackages")
  new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/net40/nunit.engine.api.xml", Target="tools/agents/net40" },
  new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/net40/nunit.engine.core.dll", Target="tools/agents/net40" },
  new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/net40/testcentric.engine.metadata.dll", Target="tools/agents/net40" },
+ new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/netcoreapp3.1/nunit-agent.dll", Target="tools/agents/netcoreapp3.1" },
+ new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/netcoreapp3.1/nunit-agent.dll.config", Target="tools/agents/netcoreapp3.1" },
+ new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/netcoreapp3.1/nunit-agent.deps.json", Target="tools/agents/netcoreapp3.1" },
+ new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/netcoreapp3.1/nunit-agent.runtimeconfig.json", Target="tools/agents/netcoreapp3.1" },
+ new ChocolateyNuSpecContent { Source = CHOCO_DIR + "nunit-agent.exe.ignore", Target="tools/agents/netcoreapp3.1" },
+ new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/netcoreapp3.1/nunit.engine.api.dll", Target="tools/agents/netcoreapp3.1" },
+ new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/netcoreapp3.1/nunit.engine.api.xml", Target="tools/agents/netcoreapp3.1" },
+ new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/netcoreapp3.1/nunit.engine.core.dll", Target="tools/agents/netcoreapp3.1" },
+ new ChocolateyNuSpecContent { Source = CURRENT_IMG_DIR + "bin/agents/netcoreapp3.1/testcentric.engine.metadata.dll", Target="tools/agents/netcoreapp3.1" },
  new ChocolateyNuSpecContent { Source = CURRENT_IMG_NET20_BIN_DIR + "nunit3-console.exe", Target="tools" },
  new ChocolateyNuSpecContent { Source = CURRENT_IMG_NET20_BIN_DIR + "nunit3-console.exe.config", Target="tools" },
  new ChocolateyNuSpecContent { Source = CURRENT_IMG_NET20_BIN_DIR + "nunit.engine.api.dll", Target="tools" },

diff --git a/msi/nunit/engine-files.wxi b/msi/nunit/engine-files.wxi
@@ -46,6 +46,7 @@
  </Component>
  <ComponentGroupRef Id="NET20_AGENT" />
  <ComponentGroupRef Id="NET40_AGENT" />
+ <ComponentGroupRef Id="NETCORE31_AGENT" />
  </ComponentGroup>
  </Fragment>
  <Fragment>
@@ -87,5 +88,33 @@
  <File Id="nunit.agent.net40.addins" Source="$(var.InstallImage)nunit.agent.addins" />
  </Component>
  </ComponentGroup>
+ <ComponentGroup Id="NETCORE31_AGENT" Directory="NETCORE31_AGENT_DIR">
+ <Component Id="NUNIT_AGENT_NETCORE31" Location="local" Guid="21E39B4C-07E4-4C38-8F91-7030516127E2">
+ <File Id="nunit_agent_netcore31.exe"
+ ProcessorArchitecture="msil"
+ Source="$(var.InstallImage)bin/agents/netcoreapp3.1/nunit-agent.dll" />
+ <File Id="nunit_agent.deps.json"
+ Source="$(var.InstallImage)bin/agents/netcoreapp3.1/nunit-agent.deps.json" />
+ <File Id="nunit_agent.runtimeconfig.json"
+ Source="$(var.InstallImage)bin/agents/netcoreapp3.1/nunit-agent.runtimeconfig.json" />
+ </Component>
+ <Component Id="NUNIT_AGENT_NETCORE31_ENGINE_API" Location="local" Guid="E176F594-2DDE-409A-9661-4DF0B81D7A36">
+ <File Id="nunit.agent.netcore31.engine.api.dll"
+ ProcessorArchitecture="msil"
+ Source="$(var.InstallImage)bin/netcoreapp3.1/nunit.engine.api.dll" />
+ <File Id="nunit.agent.netcore31.engine.api.xml"
+ Source="$(var.InstallImage)bin/netcoreapp3.1/nunit.engine.api.xml" />
+ </Component>
+ <Component Id="NUNIT_AGENT_NETCORE31_ENGINE_CORE" Location="local" Guid="1C30670A-301C-42EB-BC9B-969DD6475CB2">
+ <File Id="nunit.agent.netcore31.engine.core.dll"
+ ProcessorArchitecture="msil"
+ Source="$(var.InstallImage)bin/netcoreapp3.1/nunit.engine.core.dll" />
+ </Component>
+ <Component Id="NUNIT_AGENT_NETCORE31_ENGINE_METADATA" Location="local" Guid="43798734-A674-4D13-A1F5-B1EBB22B165A">
+ <File Id="nunit.agent.netcore31.engine.metadata.dll"
+ ProcessorArchitecture="msil"
+ Source="$(var.InstallImage)bin/netcoreapp3.1/testcentric.engine.metadata.dll" />
+ </Component>
+ </ComponentGroup>
  </Fragment>
 </Include>
diff --git a/msi/nunit/runner-directories.wxi b/msi/nunit/runner-directories.wxi
@@ -13,6 +13,7 @@
  <Directory Id="AGENTS" Name="agents">
  <Directory Id="NET20_AGENT_DIR" Name="net20" />
  <Directory Id="NET40_AGENT_DIR" Name="net40" />
+ <Directory Id="NETCORE31_AGENT_DIR" Name="netcoreapp3.1" />
  </Directory>
  </Directory>
  </DirectoryRef>

diff --git a/nuget/engine/nunit.engine.nuspec b/nuget/engine/nunit.engine.nuspec
@@ -34,37 +34,53 @@
  <files>
  <file src="LICENSE.txt" />
  <file src="NOTICES.txt" />
+
  <file src="bin/net20/nunit.engine.dll" target="lib/net20" />
  <file src="bin/net20/nunit.engine.core.dll" target="lib/net20" />
  <file src="bin/net20/nunit.engine.api.dll" target="lib/net20" />
  <file src="bin/net20/testcentric.engine.metadata.dll" target="lib/net20" />
+
  <file src="bin/agents/net20/nunit-agent.exe" target="contentFiles/any/agents/net20" />
  <file src="bin/agents/net20/nunit-agent.exe.config" target="contentFiles/any/agents/net20" />
  <file src="bin/agents/net20/nunit-agent-x86.exe" target="contentFiles/any/agents/net20" />
  <file src="bin/agents/net20/nunit-agent-x86.exe.config" target="contentFiles/any/agents/net20" />
  <file src="bin/agents/net20/nunit.engine.core.dll" target="contentFiles/any/agents/net20" />
  <file src="bin/agents/net20/nunit.engine.api.dll" target="contentFiles/any/agents/net20" />
  <file src="bin/agents/net20/testcentric.engine.metadata.dll" target="contentFiles/any/agents/net20" />
+
  <file src="bin/agents/net40/nunit-agent.exe" target="contentFiles/any/agents/net40" />
  <file src="bin/agents/net40/nunit-agent.exe.config" target="contentFiles/any/agents/net40" />
  <file src="bin/agents/net40/nunit-agent-x86.exe" target="contentFiles/any/agents/net40" />
  <file src="bin/agents/net40/nunit-agent-x86.exe.config" target="contentFiles/any/agents/net40" />
  <file src="bin/agents/net40/nunit.engine.core.dll" target="contentFiles/any/agents/net40" />
  <file src="bin/agents/net40/nunit.engine.api.dll" target="contentFiles/any/agents/net40" />
  <file src="bin/agents/net40/testcentric.engine.metadata.dll" target="contentFiles/any/agents/net40" />
+
+ <file src="bin/agents/netcoreapp3.1/nunit-agent.dll" target="contentFiles/any/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/nunit-agent.dll.config" target="contentFiles/any/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/nunit-agent.deps.json" target="contentFiles/any/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/nunit-agent.runtimeconfig.json" target="contentFiles/any/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/nunit.engine.core.dll" target="contentFiles/any/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/nunit.engine.api.dll" target="contentFiles/any/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/testcentric.engine.metadata.dll" target="contentFiles/any/agents/netcoreapp3.1" />
+
  <file src="../../nuget/engine/nunit.engine.nuget.addins" target="contentFiles/any/lib/net20"/>
  <file src="../../nuget/engine/nunit.agent.addins" target="contentFiles/any/agents/net20"/>
  <file src="../../nuget/engine/nunit.agent.addins" target="contentFiles/any/agents/net40"/>
+ <file src="../../nuget/engine/nunit.agent.addins" target="contentFiles/any/agents/netcoreapp3.1"/>
+
  <file src="bin/netstandard2.0/nunit.engine.dll" target="lib/netstandard2.0" />
  <file src="bin/netstandard2.0/nunit.engine.core.dll" target="lib/netstandard2.0" />
  <file src="bin/netstandard2.0/nunit.engine.api.dll" target="lib/netstandard2.0" />
  <file src="bin/netstandard2.0/testcentric.engine.metadata.dll" target="lib/netstandard2.0" />
  <file src="../../nuget/engine/nunit.engine.nuget.addins" target="contentFiles/any/lib/netstandard2.0"/>
+
  <file src="bin/netcoreapp3.1/nunit.engine.dll" target="lib/netcoreapp3.1" />
  <file src="bin/netcoreapp3.1/nunit.engine.core.dll" target="lib/netcoreapp3.1" />
  <file src="bin/netcoreapp3.1/testcentric.engine.metadata.dll" target="lib/netcoreapp3.1" />
  <file src="bin/netstandard2.0/nunit.engine.api.dll" target="lib/netcoreapp3.1" />
  <file src="../../nuget/engine/nunit.engine.nuget.addins" target="contentFiles/any/lib/netcoreapp3.1"/>
+
  <file src="../../nuget/engine/build/**/*" target="build" />
  <file src="../../nunit_256.png" target="images" />
  </files>

diff --git a/nuget/runners/nunit.console-runner.nuspec b/nuget/runners/nunit.console-runner.nuspec
@@ -35,6 +35,7 @@
  <file src="bin/agents/net20/nunit.engine.core.dll" target="tools/agents/net20" />
  <file src="bin/agents/net20/testcentric.engine.metadata.dll" target="tools/agents/net20" />
  <file src="../../nuget/runners/nunit.agent.addins" target="tools/agents/net20"/>
+
  <file src="bin/agents/net40/nunit-agent.exe" target="tools/agents/net40" />
  <file src="bin/agents/net40/nunit-agent.exe.config" target="tools/agents/net40" />
  <file src="bin/agents/net40/nunit-agent-x86.exe" target="tools/agents/net40" />
@@ -44,6 +45,17 @@
  <file src="bin/agents/net40/nunit.engine.core.dll" target="tools/agents/net40" />
  <file src="bin/agents/net40/testcentric.engine.metadata.dll" target="tools/agents/net40" />
  <file src="../../nuget/runners/nunit.agent.addins" target="tools/agents/net40"/>
+
+ <file src="bin/agents/netcoreapp3.1/nunit-agent.dll" target="tools/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/nunit-agent.dll.config" target="tools/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/nunit-agent.deps.json" target="tools/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/nunit-agent.runtimeconfig.json" target="tools/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/nunit.engine.api.dll" target="tools/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/nunit.engine.api.xml" target="tools/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/nunit.engine.core.dll" target="tools/agents/netcoreapp3.1" />
+ <file src="bin/agents/netcoreapp3.1/testcentric.engine.metadata.dll" target="tools/agents/netcoreapp3.1" />
+ <file src="../../nuget/engine/nunit.agent.addins" target="tools/agents/netcoreapp3.1"/>
+
  <file src="bin/net20/nunit3-console.exe" target="tools" />
  <file src="bin/net20/nunit3-console.exe.config" target="tools" />
  <file src="bin/net20/nunit.engine.api.dll" target="tools" />