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

Add .NET Core 3.1 build of engine to access APIs for loading .NET Core assemblies correctly #778

Merged
merged 8 commits into from Jun 13, 2020
Merged

Add .NET Core 3.1 build of engine to access APIs for loading .NET Core assemblies correctly #778

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
d746b14
Create .NET Core 3.1 build of nunit.engine.core
ChrisMaddock Jun 7, 2020
1067df9
Add .NET Core build of nunit.engine
ChrisMaddock Jun 7, 2020
909e3a1
Add .NET Core 3.1 build of nunit.engine.tests
ChrisMaddock Jun 7, 2020
fa8664a
Upgrade Console and Console tests to .NET Core 3.1 (pre-release)
ChrisMaddock Jun 7, 2020
6c70ef9
Add .NET Core 3.1 builds of test artifact projects
ChrisMaddock Jun 7, 2020
205470f
Update packaging, build script and CI for .NET Core 3.1 build
ChrisMaddock Jun 7, 2020
55f3863
Fix rebase
ChrisMaddock Jun 7, 2020
ba1ca7d
Merge branch 'master' into issue-710a
ChrisMaddock Jun 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion .travis.yml
View file
Open in desktop
@@ -1,7 +1,7 @@
language: csharp
sudo: required

dotnet: 2.1.401
dotnet: 3.1.300
mono: 6.6.0

matrix:
Expand Down
2 changes: 1 addition & 1 deletion appveyor.yml
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ branches:
except:
- /travis-.*/

image: Visual Studio 2017
image: Visual Studio 2019

build_script:
- ps: .\build.ps1 -Target "Appveyor" -Configuration "Release"
Expand Down
2 changes: 1 addition & 1 deletion azure-pipelines.yml
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ jobs:

- job: Windows
pool:
vmImage: vs2017-win2016
vmImage: windows-latest
steps:

- powershell: .\build.ps1 -Target Test -Configuration Release
Expand Down
64 changes: 45 additions & 19 deletions build.cake
View file
Open in desktop
Expand Up @@ -36,6 +36,7 @@ var BIN_DIR = PROJECT_DIR + "bin/" + configuration + "/";
var NET35_BIN_DIR = BIN_DIR + "net35/";
var NETCOREAPP11_BIN_DIR = BIN_DIR + "netcoreapp1.1/";
var NETCOREAPP21_BIN_DIR = BIN_DIR + "netcoreapp2.1/";
var NETCOREAPP31_BIN_DIR = BIN_DIR + "netcoreapp3.1/";
var CHOCO_DIR = PROJECT_DIR + "choco/";
var TOOLS_DIR = PROJECT_DIR + "tools/";
var IMAGE_DIR = PROJECT_DIR + "images/";
Expand All @@ -54,12 +55,10 @@ var CONSOLE_TESTS_CSPROJ = PROJECT_DIR + "src/NUnitConsole/nunit3-console.tests/
var MOCK_ASSEMBLY_CSPROJ = PROJECT_DIR + "src/NUnitEngine/mock-assembly/mock-assembly.csproj";

var NETFX_FRAMEWORKS = new [] { "net20", "net35" }; //Production code targets net20, tests target nets35
var NETSTANDARD_FRAMEWORKS = new [] { "netstandard1.6", "netstandard2.0" };
var NETCORE_FRAMEWORKS = new [] { "netcoreapp1.1", "netcoreapp2.1" };

// Test Runners
var NET20_CONSOLE = BIN_DIR + "net20/" + "nunit3-console.exe";
var NETCORE21_CONSOLE = BIN_DIR + "netcoreapp2.1/" + "nunit3-console.dll";
var NETCORE31_CONSOLE = BIN_DIR + "netcoreapp3.1/" + "nunit3-console.dll";

// Test Assemblies
var ENGINE_TESTS = "nunit.engine.tests.dll";
Expand Down Expand Up @@ -202,28 +201,28 @@ Task("Build")

Information("Publishing .NET Core & Standard projects so that dependencies are present...");

foreach(var framework in NETSTANDARD_FRAMEWORKS)
foreach(var framework in new [] { "netstandard1.6", "netstandard2.0", "netcoreapp3.1" })
MSBuild(ENGINE_CSPROJ, CreateMSBuildSettings("Publish")
.WithProperty("TargetFramework", framework)
.WithProperty("PublishDir", BIN_DIR + framework));

foreach(var framework in NETSTANDARD_FRAMEWORKS)
foreach(var framework in new [] { "netstandard1.6", "netstandard2.0" })
MSBuild(ENGINE_API_CSPROJ, CreateMSBuildSettings("Publish")
.WithProperty("TargetFramework", framework)
.WithProperty("PublishDir", BIN_DIR + framework));
Copy link
Member Author

Choose a reason for hiding this comment

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

The NUnit Engine API remains targeting netstandard2.0 only - the NuGet packaging ensures the correct Engine version is used.

I think having a .NET Standard assembly make use of a .NET Core assembly is a bit of a code smell, but I also think we have a larger issue to consider re: the API assemblys use of reflection to load the engine.


foreach(var framework in NETCORE_FRAMEWORKS)
foreach(var framework in new [] { "netcoreapp1.1", "netcoreapp2.1", "netcoreapp3.1" })
jnm2 marked this conversation as resolved.
Show resolved Hide resolved
MSBuild(ENGINE_TESTS_CSPROJ, CreateMSBuildSettings("Publish")
.WithProperty("TargetFramework", framework)
.WithProperty("PublishDir", BIN_DIR + framework));

MSBuild(CONSOLE_CSPROJ, CreateMSBuildSettings("Publish")
.WithProperty("TargetFramework", "netcoreapp2.1")
.WithProperty("PublishDir", BIN_DIR + "netcoreapp2.1"));
.WithProperty("TargetFramework", "netcoreapp3.1")
.WithProperty("PublishDir", BIN_DIR + "netcoreapp3.1"));

MSBuild(CONSOLE_TESTS_CSPROJ, CreateMSBuildSettings("Publish")
.WithProperty("TargetFramework", "netcoreapp2.1")
.WithProperty("PublishDir", BIN_DIR + "netcoreapp2.1"));
.WithProperty("TargetFramework", "netcoreapp3.1")
.WithProperty("PublishDir", BIN_DIR + "netcoreapp3.1"));

});

Expand Down Expand Up @@ -280,20 +279,20 @@ Task("TestNet20Console")
});

//////////////////////////////////////////////////////////////////////
// TEST .NET CORE 2.1 CONSOLE
// TEST .NET CORE 3.1 CONSOLE
//////////////////////////////////////////////////////////////////////

Task("TestNetCore21Console")
.Description("Tests the .NET Core 2.1 console runner")
Task("TestNetCore31Console")
.Description("Tests the .NET Core 3.1 console runner")
.IsDependentOn("Build")
.OnError(exception => { ErrorDetail.Add(exception.Message); })
.Does(() =>
{
if (IsDotNetCoreInstalled)
{
RunDotnetCoreTests(
NETCORE21_CONSOLE,
NETCOREAPP21_BIN_DIR,
NETCORE31_CONSOLE,
NETCOREAPP31_BIN_DIR,
CONSOLE_TESTS,
"netcoreapp2.1",
ref ErrorDetail);
Expand Down Expand Up @@ -354,6 +353,32 @@ Task("TestNetStandard20Engine")
});


//////////////////////////////////////////////////////////////////////
// TEST NETCORE 3.1 ENGINE
//////////////////////////////////////////////////////////////////////

Task("TestNetCore31Engine")
.Description("Tests the .NET Core 3.1 Engine")
.IsDependentOn("Build")
.OnError(exception => { ErrorDetail.Add(exception.Message); })
.Does(() =>
{
if (IsDotNetCoreInstalled)
{
RunDotnetCoreTests(
NETCORE31_CONSOLE,
NETCOREAPP31_BIN_DIR,
ENGINE_TESTS,
"netcoreapp3.1",
ref ErrorDetail);
}
else
{
Warning("Skipping .NET Core 3.1 engine tests because .NET Core is not installed");
}
});


//////////////////////////////////////////////////////////////////////
// PACKAGE
//////////////////////////////////////////////////////////////////////
Expand Down Expand Up @@ -667,7 +692,7 @@ FilePath GetResultXmlPath(string testAssembly, string framework)
{
var assemblyName = System.IO.Path.GetFileNameWithoutExtension(testAssembly);

// Workaround for https://github.com/nunit/nunit-console/issues/501
// Required for Test suites running under NUnitLite
ChrisMaddock marked this conversation as resolved.
Show resolved Hide resolved
CreateDirectory($@"test-results\{framework}");

return MakeAbsolute(new FilePath($@"test-results\{framework}\{assemblyName}.xml"));
Expand Down Expand Up @@ -744,13 +769,14 @@ Task("Rebuild")
Task("TestConsole")
.Description("Builds and tests the console runner")
.IsDependentOn("TestNet20Console")
.IsDependentOn("TestNetCore21Console");
.IsDependentOn("TestNetCore31Console");

Task("TestEngine")
.Description("Builds and tests the engine")
.IsDependentOn("TestNet20Engine")
.IsDependentOn("TestNetStandard16Engine")
.IsDependentOn("TestNetStandard20Engine");
.IsDependentOn("TestNetStandard20Engine")
.IsDependentOn("TestNetCore31Engine");

Task("Test")
.Description("Builds and tests the engine")
Expand Down Expand Up @@ -779,7 +805,7 @@ Task("Travis")

Task("Default")
.Description("Builds the engine and console runner")
.IsDependentOn("Build"); // Rebuild?
.IsDependentOn("Build");

//////////////////////////////////////////////////////////////////////
// EXECUTION
Expand Down
13 changes: 13 additions & 0 deletions nuget/engine/nunit.engine.nuspec
View file
Open in desktop
Expand Up @@ -36,6 +36,14 @@
<dependency id="System.Diagnostics.Process" version="4.3.0" exclude="compile" />
<dependency id="System.Xml.XPath.XmlDocument" version="4.3.0" exclude="compile" />
</group>
<group targetFramework="netcoreapp3.1">
<dependency id="NETStandard.Library" version="2.0.0" />
<dependency id="Microsoft.DotNet.InternalAbstractions" version="1.0.0" exclude="compile" />
<dependency id="System.ComponentModel.TypeConverter" version="4.3.0" exclude="compile" />
<dependency id="System.Reflection" version="4.3.0" exclude="compile" />
<dependency id="System.Diagnostics.Process" version="4.3.0" exclude="compile" />
<dependency id="System.Xml.XPath.XmlDocument" version="4.3.0" exclude="compile" />
</group>
</dependencies>
<contentFiles>
<files include="**" buildAction="None" copyToOutput="true" />
Expand Down Expand Up @@ -76,6 +84,11 @@
<file src="bin/netstandard2.0/nunit.engine.api.dll" target="lib/netstandard2.0" />
<file src="bin/netstandard2.0/Mono.Cecil.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/Mono.Cecil.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