-
Notifications
You must be signed in to change notification settings - Fork 151
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.
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
Run .NET Core Tests from NUnit3 Console #937
Changes from 23 commits
8316c81
e5d1cf8
f6b92a3
741d463
08777aa
f94d360
6b108de
381f1ae
82ca51d
c8f6fc0
8759962
c3556d0
a6d3e9e
eda6812
dbcf2f2
924d0cf
71cca23
ebf731c
15ccfd4
714ada1
3e3b43d
7963ff2
154866e
116d081
d81b3ba
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||||
---|---|---|---|---|---|---|---|---|
|
@@ -46,6 +46,7 @@ | |||||||
</Component> | ||||||||
<ComponentGroupRef Id="NET20_AGENT" /> | ||||||||
<ComponentGroupRef Id="NET40_AGENT" /> | ||||||||
<ComponentGroupRef Id="NETCORE31_AGENT" /> | ||||||||
</ComponentGroup> | ||||||||
</Fragment> | ||||||||
<Fragment> | ||||||||
|
@@ -87,5 +88,34 @@ | |||||||
<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.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> | ||||||||
<Component Id="NUNIT_AGENT_ADDINS_NETCORE31" Location="local" Guid="21D2D9FB-A57D-4B02-92A0-6697674FB869"> | ||||||||
<File Id="nunit.agent.netcore31.addins" Source="$(var.InstallImage)nunit.agent.addins" /> | ||||||||
</Component> | ||||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
I think this addins file points to a dir of netfx extensions, none of which can be loaded by the netcoreapp31 agent. Shall we just leave this out for now? We might want to package netcoreapp-compatible extensions with the engine in future, but they'll probably need to be in a different subdir anyway. There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Good point. I'll take a look. In fact, this directory should only used for the .NET Core 3.1 agent, so I may be able to just change the content of either the |
||||||||
</ComponentGroup> | ||||||||
</Fragment> | ||||||||
</Include> |
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -34,37 +34,52 @@ | |||||
<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.runtimeconfig.json" target="tools/agents/netcoreapp3.1" /> | ||||||
ChrisMaddock marked this conversation as resolved.
Show resolved
Hide resolved
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
I think this one's been missed, Charlie. (I also don't know why we use contentFiles instead of tools here, but keeping it consistent seems safest! 😅) There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I initially tried to keep it consistent, but I got failures when I did that. However, I can now think of another reason for that, so I'll try again. If this were for 4.0, I'd say just drop the whole |
||||||
<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> | ||||||
|
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
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 causesnunit-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.There was a problem hiding this comment.
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