Skip to content

Commit 2768679

Browse files
CharliePooleCharliePoole
authored
Merge pull request #1609 from nunit/issue-1608
Create new nunit.common assembly
2 parents 6f0deee + 9296dd4 commit 2768679

File tree

79 files changed

+137
-358
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+137
-358
lines changed

‎NUnitConsole.sln

+14-7
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestData", "TestData", "{37
9797
EndProject
9898
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "agents", "agents", "{1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}"
9999
EndProject
100-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-net60", "src\NUnitEngine\agents\nunit-agent-net60\nunit-agent-net60.csproj", "{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}"
101-
EndProject
102100
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-net462", "src\NUnitEngine\agents\nunit-agent-net462\nunit-agent-net462.csproj", "{E4041712-A1F1-479D-A7F7-89F491066163}"
103101
EndProject
104102
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-net462-x86", "src\NUnitEngine\agents\nunit-agent-net462-x86\nunit-agent-net462-x86.csproj", "{D4AE483A-D4E1-4892-AF87-3607FBA8755F}"
@@ -145,6 +143,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.2", "src\TestData\NU
145143
EndProject
146144
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.10", "src\TestData\NUnit3.10\NUnit3.10.csproj", "{0555B97D-E918-455B-951C-74EFCDA8790A}"
147145
EndProject
146+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common", "src\NUnitEngine\nunit.common\nunit.common.csproj", "{542685E5-8C2E-4425-ADD1-C45B55AFB964}"
147+
EndProject
148+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common.tests", "src\NUnitEngine\nunit.common.tests\nunit.common.tests.csproj", "{F546CFE1-74B0-45D3-A06A-8972D73F4419}"
149+
EndProject
148150
Global
149151
GlobalSection(SolutionConfigurationPlatforms) = preSolution
150152
Debug|Any CPU = Debug|Any CPU
@@ -183,10 +185,6 @@ Global
183185
{CACC0520-B452-4310-A33C-DC944129ACDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
184186
{CACC0520-B452-4310-A33C-DC944129ACDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
185187
{CACC0520-B452-4310-A33C-DC944129ACDD}.Release|Any CPU.Build.0 = Release|Any CPU
186-
{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
187-
{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
188-
{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
189-
{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Release|Any CPU.Build.0 = Release|Any CPU
190188
{E4041712-A1F1-479D-A7F7-89F491066163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
191189
{E4041712-A1F1-479D-A7F7-89F491066163}.Debug|Any CPU.Build.0 = Debug|Any CPU
192190
{E4041712-A1F1-479D-A7F7-89F491066163}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -255,6 +253,14 @@ Global
255253
{0555B97D-E918-455B-951C-74EFCDA8790A}.Debug|Any CPU.Build.0 = Debug|Any CPU
256254
{0555B97D-E918-455B-951C-74EFCDA8790A}.Release|Any CPU.ActiveCfg = Release|Any CPU
257255
{0555B97D-E918-455B-951C-74EFCDA8790A}.Release|Any CPU.Build.0 = Release|Any CPU
256+
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
257+
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Debug|Any CPU.Build.0 = Debug|Any CPU
258+
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Release|Any CPU.ActiveCfg = Release|Any CPU
259+
{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Release|Any CPU.Build.0 = Release|Any CPU
260+
{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
261+
{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Debug|Any CPU.Build.0 = Debug|Any CPU
262+
{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Release|Any CPU.ActiveCfg = Release|Any CPU
263+
{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Release|Any CPU.Build.0 = Release|Any CPU
258264
EndGlobalSection
259265
GlobalSection(SolutionProperties) = preSolution
260266
HideSolutionNode = FALSE
@@ -275,7 +281,6 @@ Global
275281
{068F6CA9-6108-4F45-8540-351AA5227259} = {4FDF7BFA-A337-41D3-898D-C6A98278E6AD}
276282
{CACC0520-B452-4310-A33C-DC944129ACDD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
277283
{1704B7B2-5AD3-44EA-AB26-445C4E4E2C54} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
278-
{D5CC541C-95B7-4CB4-AADD-660FDCC281B8} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
279284
{E4041712-A1F1-479D-A7F7-89F491066163} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
280285
{D4AE483A-D4E1-4892-AF87-3607FBA8755F} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
281286
{E1F5F8D3-4AC4-4BB0-9438-2BF41768B473} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
@@ -297,6 +302,8 @@ Global
297302
{56416AD9-8E7B-4F72-B0E1-E75A024431F8} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
298303
{8AFBB856-700A-4CCC-AE0E-9B622178E1E0} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
299304
{0555B97D-E918-455B-951C-74EFCDA8790A} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
305+
{542685E5-8C2E-4425-ADD1-C45B55AFB964} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
306+
{F546CFE1-74B0-45D3-A06A-8972D73F4419} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
300307
EndGlobalSection
301308
GlobalSection(ExtensibilityGlobals) = postSolution
302309
SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}

‎build.cake

+16-16
Original file line numberDiff line numberDiff line change
@@ -35,22 +35,22 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
3535
checks: new PackageCheck[] {
3636
HasFiles("LICENSE.txt", "NOTICES.txt"),
3737
HasDirectory("tools").WithFiles(
38-
"nunit-console.exe", "nunit-console.exe.config",
39-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
38+
"nunit-console.exe", "nunit-console.exe.config", "nunit.engine.dll", "nunit.engine.core.dll",
39+
"nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
4040
HasDirectory("tools/agents/net462").WithFiles(
4141
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
42-
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
42+
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
4343
HasDirectory("tools/agents/net8.0").WithFiles(
4444
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
45-
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
45+
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
4646
},
4747
symbols: new PackageCheck[] {
4848
HasDirectory("tools").WithFiles(
49-
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"),
49+
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb", "nunit-console.pdb"),
5050
HasDirectory("tools/agents/net462").WithFiles(
51-
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
51+
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
5252
HasDirectory("tools/agents/net8.0").WithFiles(
53-
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb")
53+
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb")
5454
},
5555
testRunner: new ConsoleRunnerSelfTester(BuildSettings.NuGetTestDirectory
5656
+ $"NUnit.ConsoleRunner.{BuildSettings.PackageVersion}/tools/nunit-console.exe"),
@@ -83,13 +83,13 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
8383
checks: new PackageCheck[] {
8484
HasDirectory("tools").WithFiles(
8585
"LICENSE.txt", "NOTICES.txt", "VERIFICATION.txt", "nunit-console.exe", "nunit-console.exe.config",
86-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
86+
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
8787
HasDirectory("tools/agents/net462").WithFiles(
8888
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config", "nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
89-
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
89+
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
9090
HasDirectory("tools/agents/net8.0").WithFiles(
9191
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
92-
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
92+
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll")
9393
},
9494
testRunner: new ConsoleRunnerSelfTester(BuildSettings.ChocolateyTestDirectory
9595
+ $"nunit-console-runner-v4.{BuildSettings.PackageVersion}/tools/nunit-console.exe"),
@@ -101,25 +101,25 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
101101
checks: new PackageCheck[] {
102102
HasFiles("LICENSE.txt", "NOTICES.txt"),
103103
HasDirectory("lib/net462").WithFiles(
104-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
104+
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
105105
HasDirectory("lib/net8.0").WithFiles(
106-
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll"),
106+
"nunit.engine.dll", "nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll", "Microsoft.Extensions.DependencyModel.dll"),
107107
HasDirectory("agents/net462").WithFiles(
108108
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config",
109109
"nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
110-
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
110+
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
111111
HasDirectory("agents/net8.0").WithFiles(
112112
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
113113
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") },
114114
symbols: new PackageCheck[] {
115115
HasDirectory("lib/net462").WithFiles(
116116
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
117117
HasDirectory("lib/net8.0").WithFiles(
118-
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
118+
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
119119
HasDirectory("contentFiles/any/agents/net462").WithFiles(
120-
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb"),
120+
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
121121
HasDirectory("contentFiles/any/agents/net8.0").WithFiles(
122-
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.engine.api.pdb")
122+
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb")
123123
}),
124124

125125
NUnitEngineApiPackage = new NuGetPackage(

‎choco/nunit-console-runner.nuspec

+3
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
<file src = "$BIN_DIR$net462/nunit.engine.api.dll" target="tools" />
3737
<file src = "$BIN_DIR$net462/nunit.engine.api.xml" target="tools" />
3838
<file src = "$BIN_DIR$net462/nunit.engine.core.dll" target="tools" />
39+
<file src = "$BIN_DIR$net462/nunit.common.dll" target="tools" />
3940
<file src = "$BIN_DIR$net462/nunit.engine.dll" target="tools" />
4041
<file src = "$BIN_DIR$net462/testcentric.metadata.dll" target="tools" />
4142

@@ -46,6 +47,7 @@
4647
<file src = "$BIN_DIR$agents/net462/nunit.engine.api.dll" target="tools/agents/net462" />
4748
<file src = "$BIN_DIR$agents/net462/nunit.engine.api.xml" target="tools/agents/net462" />
4849
<file src = "$BIN_DIR$agents/net462/nunit.engine.core.dll" target="tools/agents/net462" />
50+
<file src = "$BIN_DIR$agents/net462/nunit.common.dll" target="tools/agents/net462" />
4951
<file src = "$BIN_DIR$agents/net462/testcentric.metadata.dll" target="tools/agents/net462" />
5052
<file src = "nunit-agent.exe.ignore" target="tools/agents/net462" />
5153
<file src = "nunit-agent-x86.exe.ignore" target="tools/agents/net462" />
@@ -57,6 +59,7 @@
5759
<file src = "$BIN_DIR$agents/net8.0/nunit.engine.api.dll" target="tools/agents/net8.0" />
5860
<file src = "$BIN_DIR$agents/net8.0/nunit.engine.api.xml" target="tools/agents/net8.0" />
5961
<file src = "$BIN_DIR$agents/net8.0/nunit.engine.core.dll" target="tools/agents/net8.0" />
62+
<file src = "$BIN_DIR$agents/net8.0/nunit.common.dll" target="tools/agents/net8.0" />
6063
<file src = "$BIN_DIR$agents/net8.0/testcentric.metadata.dll" target="tools/agents/net8.0" />
6164
<file src = "$BIN_DIR$agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />
6265
</files>

‎nuget/engine/nunit.engine.nuspec

+8
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@
3939
<file src="net462/nunit.engine.pdb" target="lib/net462" />
4040
<file src="net462/nunit.engine.core.dll" target="lib/net462" />
4141
<file src="net462/nunit.engine.core.pdb" target="lib/net462" />
42+
<file src="net462/nunit.common.dll" target="lib/net462" />
43+
<file src="net462/nunit.common.pdb" target="lib/net462" />
4244
<file src="net462/nunit.engine.api.dll" target="lib/net462" />
4345
<file src="net462/nunit.engine.api.pdb" target="lib/net462" />
4446
<file src="net462/testcentric.metadata.dll" target="lib/net462" />
@@ -48,6 +50,8 @@
4850
<file src="net8.0/nunit.engine.pdb" target="lib/net8.0" />
4951
<file src="net8.0/nunit.engine.core.dll" target="lib/net8.0" />
5052
<file src="net8.0/nunit.engine.core.pdb" target="lib/net8.0" />
53+
<file src="net8.0/nunit.common.dll" target="lib/net8.0" />
54+
<file src="net8.0/nunit.common.pdb" target="lib/net8.0" />
5155
<file src="net8.0/nunit.engine.api.dll" target="lib/net8.0" />
5256
<file src="net8.0/nunit.engine.api.pdb" target="lib/net8.0" />
5357
<file src="net8.0/testcentric.metadata.dll" target="lib/net8.0" />
@@ -62,6 +66,8 @@
6266
<file src="agents/net462/nunit-agent-net462-x86.exe.config" target="agents/net462" />
6367
<file src="agents/net462/nunit.engine.core.dll" target="agents/net462" />
6468
<file src="agents/net462/nunit.engine.core.pdb" target="agents/net462" />
69+
<file src="agents/net462/nunit.common.dll" target="agents/net462" />
70+
<file src="agents/net462/nunit.common.pdb" target="agents/net462" />
6571
<file src="agents/net462/nunit.engine.api.dll" target="agents/net462" />
6672
<file src="agents/net462/nunit.engine.api.pdb" target="agents/net462" />
6773
<file src="agents/net462/testcentric.metadata.dll" target="agents/net462" />
@@ -73,6 +79,8 @@
7379
<file src="agents/net8.0/nunit-agent-net80.runtimeconfig.json" target="agents/net8.0" />
7480
<file src="agents/net8.0/nunit.engine.core.dll" target="agents/net8.0" />
7581
<file src="agents/net8.0/nunit.engine.core.pdb" target="agents/net8.0" />
82+
<file src="agents/net8.0/nunit.common.dll" target="agents/net8.0" />
83+
<file src="agents/net8.0/nunit.common.pdb" target="agents/net8.0" />
7684
<file src="agents/net8.0/nunit.engine.api.dll" target="agents/net8.0" />
7785
<file src="agents/net8.0/nunit.engine.api.pdb" target="agents/net8.0" />
7886
<file src="agents/net8.0/testcentric.metadata.dll" target="agents/net8.0" />

‎nuget/runners/nunit.console-runner.netcore.nuspec

+2
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,8 @@
3737
<file src="net8.0/nunit-netcore-console.runtimeconfig.json" target="tools/net8.0/any" />
3838
<file src="net8.0/nunit.engine.core.dll" target="tools/net8.0/any" />
3939
<file src="net8.0/nunit.engine.core.pdb" target="tools/net8.0/any" />
40+
<file src="net8.0/nunit.common.dll" target="tools/net8.0/any" />
41+
<file src="net8.0/nunit.common.pdb" target="tools/net8.0/any" />
4042
<file src="net8.0/nunit.engine.dll" target="tools/net8.0/any" />
4143
<file src="net8.0/nunit.engine.pdb" target="tools/net8.0/any" />
4244
<file src="net8.0/nunit.engine.api.dll" target="tools/net8.0/any" />

‎nuget/runners/nunit.console-runner.nuspec

+6
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
<file src="agents/net462/nunit.engine.api.xml" target="tools/agents/net462" />
3939
<file src="agents/net462/nunit.engine.core.dll" target="tools/agents/net462" />
4040
<file src="agents/net462/nunit.engine.core.pdb" target="tools/agents/net462" />
41+
<file src="agents/net462/nunit.common.dll" target="tools/agents/net462" />
42+
<file src="agents/net462/nunit.common.pdb" target="tools/agents/net462" />
4143
<file src="agents/net462/testcentric.metadata.dll" target="tools/agents/net462" />
4244

4345
<file src="agents/net8.0/nunit-agent-net80.dll" target="tools/agents/net8.0" />
@@ -50,6 +52,8 @@
5052
<file src="agents/net8.0/nunit.engine.api.xml" target="tools/agents/net8.0" />
5153
<file src="agents/net8.0/nunit.engine.core.dll" target="tools/agents/net8.0" />
5254
<file src="agents/net8.0/nunit.engine.core.pdb" target="tools/agents/net8.0" />
55+
<file src="agents/net8.0/nunit.common.dll" target="tools/agents/net8.0" />
56+
<file src="agents/net8.0/nunit.common.pdb" target="tools/agents/net8.0" />
5357
<file src="agents/net8.0/testcentric.metadata.dll" target="tools/agents/net8.0" />
5458
<file src="agents/net8.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net8.0" />
5559

@@ -61,6 +65,8 @@
6165
<file src="net462/nunit.engine.api.xml" target="tools" />
6266
<file src="net462/nunit.engine.core.dll" target="tools" />
6367
<file src="net462/nunit.engine.core.pdb" target="tools" />
68+
<file src="net462/nunit.common.dll" target="tools" />
69+
<file src="net462/nunit.common.pdb" target="tools" />
6470
<file src="net462/nunit.engine.dll" target="tools" />
6571
<file src="net462/nunit.engine.pdb" target="tools" />
6672
<file src="net462/testcentric.metadata.dll" target="tools" />

‎src/NUnitConsole/nunit4-console.tests/ColorConsoleTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
22

33
using System;
4-
using NUnit.Common;
54
using NUnit.Framework;
65

76
namespace NUnit.ConsoleRunner

‎src/NUnitConsole/nunit4-console.tests/ColorStyleTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
22

33
using System;
4-
using NUnit.Common;
54
using NUnit.Framework;
65

76
namespace NUnit.ConsoleRunner

‎src/NUnitConsole/nunit4-console.tests/CommandLineTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@
33
using System;
44
using System.IO;
55
using System.Reflection;
6-
using NUnit.Common;
76
using System.Collections.Generic;
87
using NUnit.Framework;
98
using NUnit.ConsoleRunner.Options;

‎src/NUnitConsole/nunit4-console.tests/ConsoleMocks.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
22

33
using NSubstitute;
4-
using NUnit.Common;
54

65
namespace NUnit.ConsoleRunner.Options
76
{

‎src/NUnitConsole/nunit4-console.tests/Options/DefaultOptionsProviderTests.cs

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
22

33
using System;
4-
using NUnit.Common;
54
using NUnit.Framework;
65

76
namespace NUnit.ConsoleRunner.Options

‎src/NUnitConsole/nunit4-console.tests/Program.cs

-4
Original file line numberDiff line numberDiff line change
@@ -8,11 +8,7 @@ class Program
88
{
99
static int Main(string[] args)
1010
{
11-
#if NETFRAMEWORK
1211
return new NUnitLite.TextRunner(typeof(Program).Assembly).Execute(args);
13-
#else
14-
return new NUnitLite.TextRunner(typeof(Program).GetTypeInfo().Assembly).Execute(args);
15-
#endif
1612
}
1713
}
1814
}

‎src/NUnitConsole/nunit4-console.tests/VirtualFileSystem.cs

-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
using System;
44
using System.Collections.Generic;
5-
using NUnit.Common;
65
using System.IO;
76

87
namespace NUnit.ConsoleRunner

‎src/NUnitConsole/nunit4-console/ColorConsoleWriter.cs

-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
22

33
using System;
4-
using System.IO;
5-
using System.Text;
6-
using NUnit.Common;
74

85
namespace NUnit.ConsoleRunner
96
{

‎src/NUnitConsole/nunit4-console/ConsoleRunner.cs

-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
using System.Collections.Generic;
55
using System.IO;
66
using System.Xml;
7-
using NUnit.Common;
87
using NUnit.ConsoleRunner.Utilities;
98
using NUnit.ConsoleRunner.Options;
109
using NUnit.Engine;

‎src/NUnitConsole/nunit4-console/Options/Options.cs

-1
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@
171171
#endif
172172
using System.Text;
173173
using System.Text.RegularExpressions;
174-
using NUnit.Common;
175174

176175

177176
#if LINQ

‎src/NUnitConsole/nunit4-console/Program.cs

-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77
using System.Linq;
88
using System.Reflection;
99
using System.Text;
10-
using NUnit.Common;
1110
using NUnit.Engine;
1211

1312
using NUnit.ConsoleRunner.Options;

0 commit comments

Comments
 (0)