Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Run .NET Core Tests from NUnit3 Console #937

Merged
merged 25 commits into from
May 9, 2021
Merged

Run .NET Core Tests from NUnit3 Console #937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
8316c81
Rename folder to match namespace
CharliePoole Apr 2, 2021
e5d1cf8
Descriptions of each EngineStatus value
CharliePoole Apr 2, 2021
f6b92a3
Add TCP to engine core
CharliePoole Apr 2, 2021
741d463
Add TCP Transport to nunit.engine
CharliePoole Apr 2, 2021
08777aa
Connect TestAgency to both transports
CharliePoole Apr 2, 2021
f94d360
Build agent for .NET Core 3.1
CharliePoole Apr 3, 2021
6b108de
Modify process runner to use .NET Core 3.1 agent
CharliePoole Apr 5, 2021
381f1ae
Update package content
CharliePoole Apr 11, 2021
82ca51d
Add nunit3-console package test under .NET Core 3.1
CharliePoole Apr 13, 2021
c8f6fc0
Fix error in MSI package tests
CharliePoole Apr 13, 2021
8759962
Merge with latest master
CharliePoole Apr 13, 2021
c3556d0
Remove 32-bit build of .net core agents
CharliePoole Apr 14, 2021
a6d3e9e
Move nunit-agent-x86 to a separate folder
CharliePoole Apr 15, 2021
eda6812
Recognize that mono can run .Net FX assemblies
CharliePoole Apr 16, 2021
dbcf2f2
Fix tests to run under Mono
CharliePoole Apr 16, 2021
924d0cf
Delete extra copies of agent files
CharliePoole Apr 16, 2021
71cca23
Fixes from code review
CharliePoole Apr 25, 2021
ebf731c
Fix TcpAgentTcpProxy.Dispose() method
CharliePoole Apr 29, 2021
15ccfd4
Add mock-assembly-x86 assembly and package tests to verify running it…
CharliePoole Apr 29, 2021
714ada1
Make mock-assembly-x86.dll run under .NET Core
CharliePoole Apr 30, 2021
3e3b43d
Give error if x86 version of dotnet is needed but not available
CharliePoole Apr 30, 2021
7963ff2
Skip running X86 .NET Core tests where not installed
CharliePoole Apr 30, 2021
154866e
Add .NET Core 3.1 agent to msi
CharliePoole May 1, 2021
116d081
Changes arising from last review
CharliePoole May 4, 2021
d81b3ba
Final fixes
CharliePoole May 6, 2021
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
26 changes: 17 additions & 9 deletions NUnitConsole.sln
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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}"
Expand All @@ -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
Expand All @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand All @@ -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
Expand All @@ -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}
Expand Down
26 changes: 21 additions & 5 deletions build.cake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down Expand Up @@ -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));
Expand Down Expand Up @@ -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" },
Expand All @@ -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" },
Expand Down
29 changes: 29 additions & 0 deletions msi/nunit/engine-files.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
</Component>
<ComponentGroupRef Id="NET20_AGENT" />
<ComponentGroupRef Id="NET40_AGENT" />
<ComponentGroupRef Id="NETCORE31_AGENT" />
</ComponentGroup>
</Fragment>
<Fragment>
Expand Down Expand Up @@ -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" />
Copy link
Member

Choose a reason for hiding this comment

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

I'm not totally clear on what is and isn't required for .NET Core, but I think this should also include nunit-agent.deps.json.

I was also wondering about nunit-agent.dll.config, but I think is actually netfx specific, so it should probably be removed entirely from the netcoreapp agent? I'm not sure how to do that off the top of my head, will give it a go.

Copy link
Collaborator Author

Choose a reason for hiding this comment

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

I believe that nunit-agent.deps.json is only for use in building the project. It causes nunit-agent.runtimeconfig.json to be generated. If that's wrong, I can add it. Do you have different info? At this point all the tests pass using all the packages.

Copy link
Member

Choose a reason for hiding this comment

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

Hmm, ok. I always thought it should be as it details where to load dependencies from at runtime. I'm struggling to find any formal documentation however, or any clear answer elsewhere.

This page seems to be the closest there is. From my reading of that, for a framework-dependent deployment as ours is, the file should be included. What do you think?

https://github.com/dotnet/cli/blob/master/Documentation/specs/runtime-configuration-file.md

</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>
1 change: 1 addition & 0 deletions msi/nunit/runner-directories.wxi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
16 changes: 16 additions & 0 deletions nuget/engine/nunit.engine.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />

CharliePoole marked this conversation as resolved.
Show resolved Hide resolved
<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>
Expand Down
12 changes: 12 additions & 0 deletions nuget/runners/nunit.console-runner.nuspec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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" />
Expand All @@ -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" />
Expand Down
Loading