Skip to content

Commit

Permalink
Resolve conflicts
Browse files Browse the repository at this point in the history
  • Loading branch information
@CharliePoole
CharliePoole committed Jan 23, 2025
1 parent c25d789 commit 9296dd4
Show file tree
Hide file tree
Showing 5 changed files with 2 additions and 138 deletions.
7 changes: 0 additions & 7 deletions NUnitConsole.sln
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "TestData", "TestData", "{37
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "agents", "agents", "{1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-net60", "src\NUnitEngine\agents\nunit-agent-net60\nunit-agent-net60.csproj", "{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit-agent-net462", "src\NUnitEngine\agents\nunit-agent-net462\nunit-agent-net462.csproj", "{E4041712-A1F1-479D-A7F7-89F491066163}"
EndProject
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}"
Expand Down Expand Up @@ -187,10 +185,6 @@ Global
{CACC0520-B452-4310-A33C-DC944129ACDD}.Debug|Any CPU.Build.0 = Debug|Any CPU
{CACC0520-B452-4310-A33C-DC944129ACDD}.Release|Any CPU.ActiveCfg = Release|Any CPU
{CACC0520-B452-4310-A33C-DC944129ACDD}.Release|Any CPU.Build.0 = Release|Any CPU
{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Debug|Any CPU.Build.0 = Debug|Any CPU
{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Release|Any CPU.ActiveCfg = Release|Any CPU
{D5CC541C-95B7-4CB4-AADD-660FDCC281B8}.Release|Any CPU.Build.0 = Release|Any CPU
{E4041712-A1F1-479D-A7F7-89F491066163}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{E4041712-A1F1-479D-A7F7-89F491066163}.Debug|Any CPU.Build.0 = Debug|Any CPU
{E4041712-A1F1-479D-A7F7-89F491066163}.Release|Any CPU.ActiveCfg = Release|Any CPU
Expand Down Expand Up @@ -287,7 +281,6 @@ Global
{068F6CA9-6108-4F45-8540-351AA5227259} = {4FDF7BFA-A337-41D3-898D-C6A98278E6AD}
{CACC0520-B452-4310-A33C-DC944129ACDD} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{1704B7B2-5AD3-44EA-AB26-445C4E4E2C54} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
{D5CC541C-95B7-4CB4-AADD-660FDCC281B8} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
{E4041712-A1F1-479D-A7F7-89F491066163} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
{D4AE483A-D4E1-4892-AF87-3607FBA8755F} = {1704B7B2-5AD3-44EA-AB26-445C4E4E2C54}
{E1F5F8D3-4AC4-4BB0-9438-2BF41768B473} = {576DB1E6-C5EC-4FEF-A826-EC19D8BEE572}
Expand Down
4 changes: 2 additions & 2 deletions build.cake
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
HasDirectory("agents/net462").WithFiles(
"nunit-agent-net462.exe", "nunit-agent-net462.exe.config",
"nunit-agent-net462-x86.exe", "nunit-agent-net462-x86.exe.config",
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") },
"nunit.engine.core.dll", "nunit.common.dll", "nunit.engine.api.dll", "testcentric.metadata.dll"),
HasDirectory("agents/net8.0").WithFiles(
"nunit-agent-net80.dll", "nunit-agent-net80.dll.config",
"nunit.engine.core.dll", "nunit.engine.api.dll", "testcentric.metadata.dll") },
Expand All @@ -117,7 +117,7 @@ BuildSettings.Packages.AddRange(new PackageDefinition[] {
HasDirectory("lib/net8.0").WithFiles(
"nunit.engine.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
HasDirectory("contentFiles/any/agents/net462").WithFiles(
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb")
"nunit-agent.pdb", "nunit-agent-x86.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb"),
HasDirectory("contentFiles/any/agents/net8.0").WithFiles(
"nunit-agent.pdb", "nunit.engine.core.pdb", "nunit.common.pdb", "nunit.engine.api.pdb")
}),
Expand Down
36 changes: 0 additions & 36 deletions choco/nunit-console-runner.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,42 +52,6 @@
<file src = "nunit-agent.exe.ignore" target="tools/agents/net462" />
<file src = "nunit-agent-x86.exe.ignore" target="tools/agents/net462" />

<<<<<<< HEAD
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit-agent-netcore31.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit-agent-netcore31.dll.config" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit-agent-netcore31.deps.json" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit-agent-netcore31.runtimeconfig.json" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.engine.api.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.engine.api.xml" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.engine.core.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/nunit.common.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/testcentric.metadata.dll" target="tools/agents/netcoreapp3.1" />
<file src = "$BIN_DIR$agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />

<file src = "$BIN_DIR$agents/net6.0/nunit-agent-net60.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit-agent-net60.dll.config" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit-agent-net60.deps.json" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit-agent-net60.runtimeconfig.json" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit.engine.api.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit.engine.api.xml" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit.engine.core.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/nunit.common.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/testcentric.metadata.dll" target="tools/agents/net6.0" />
<file src = "$BIN_DIR$agents/net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net6.0" />

<file src = "$BIN_DIR$agents/net7.0/nunit-agent-net70.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/nunit-agent-net70.dll.config" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/nunit-agent-net70.deps.json" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/nunit-agent-net70.runtimeconfig.json" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/nunit.engine.api.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/nunit.engine.api.xml" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/nunit.engine.core.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/nunit.common.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/testcentric.metadata.dll" target="tools/agents/net7.0" />
<file src = "$BIN_DIR$agents/net7.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net7.0" />

=======
>>>>>>> version4
<file src = "$BIN_DIR$agents/net8.0/nunit-agent-net80.dll" target="tools/agents/net8.0" />
<file src = "$BIN_DIR$agents/net8.0/nunit-agent-net80.dll.config" target="tools/agents/net8.0" />
<file src = "$BIN_DIR$agents/net8.0/nunit-agent-net80.deps.json" target="tools/agents/net8.0" />
Expand Down
45 changes: 0 additions & 45 deletions nuget/engine/nunit.engine.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -72,51 +72,6 @@
<file src="agents/net462/nunit.engine.api.pdb" target="agents/net462" />
<file src="agents/net462/testcentric.metadata.dll" target="agents/net462" />

<<<<<<< HEAD
<file src="agents/netcoreapp3.1/nunit-agent-netcore31.dll" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit-agent-netcore31.pdb" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit-agent-netcore31.dll.config" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit-agent-netcore31.deps.json" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit-agent-netcore31.runtimeconfig.json" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.core.dll" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.core.pdb" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.common.dll" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.common.pdb" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.api.dll" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.api.pdb" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/testcentric.metadata.dll" target="agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="agents/netcoreapp3.1" />

<file src="agents/net6.0/nunit-agent-net60.dll" target="agents/net6.0" />
<file src="agents/net6.0/nunit-agent-net60.pdb" target="agents/net6.0" />
<file src="agents/net6.0/nunit-agent-net60.dll.config" target="agents/net6.0" />
<file src="agents/net6.0/nunit-agent-net60.deps.json" target="agents/net6.0" />
<file src="agents/net6.0/nunit-agent-net60.runtimeconfig.json" target="agents/net6.0" />
<file src="agents/net6.0/nunit.engine.core.dll" target="agents/net6.0" />
<file src="agents/net6.0/nunit.engine.core.pdb" target="agents/net6.0" />
<file src="agents/net6.0/nunit.common.dll" target="agents/net6.0" />
<file src="agents/net6.0/nunit.common.pdb" target="agents/net6.0" />
<file src="agents/net6.0/nunit.engine.api.dll" target="agents/net6.0" />
<file src="agents/net6.0/nunit.engine.api.pdb" target="agents/net6.0" />
<file src="agents/net6.0/testcentric.metadata.dll" target="agents/net6.0" />
<file src="agents/net6.0/Microsoft.Extensions.DependencyModel.dll" target="agents/net6.0" />

<file src="agents/net7.0/nunit-agent-net70.dll" target="agents/net7.0" />
<file src="agents/net7.0/nunit-agent-net70.pdb" target="agents/net7.0" />
<file src="agents/net7.0/nunit-agent-net70.dll.config" target="agents/net7.0" />
<file src="agents/net7.0/nunit-agent-net70.deps.json" target="agents/net7.0" />
<file src="agents/net7.0/nunit-agent-net70.runtimeconfig.json" target="agents/net7.0" />
<file src="agents/net7.0/nunit.engine.core.dll" target="agents/net7.0" />
<file src="agents/net7.0/nunit.engine.core.pdb" target="agents/net7.0" />
<file src="agents/net7.0/nunit.common.dll" target="agents/net7.0" />
<file src="agents/net7.0/nunit.common.pdb" target="agents/net7.0" />
<file src="agents/net7.0/nunit.engine.api.dll" target="agents/net7.0" />
<file src="agents/net7.0/nunit.engine.api.pdb" target="agents/net7.0" />
<file src="agents/net7.0/testcentric.metadata.dll" target="agents/net7.0" />
<file src="agents/net7.0/Microsoft.Extensions.DependencyModel.dll" target="agents/net7.0" />

=======
>>>>>>> version4
<file src="agents/net8.0/nunit-agent-net80.dll" target="agents/net8.0" />
<file src="agents/net8.0/nunit-agent-net80.pdb" target="agents/net8.0" />
<file src="agents/net8.0/nunit-agent-net80.dll.config" target="agents/net8.0" />
Expand Down
48 changes: 0 additions & 48 deletions nuget/runners/nunit.console-runner.nuspec
View file
Original file line number Diff line number Diff line change
Expand Up @@ -42,54 +42,6 @@
<file src="agents/net462/nunit.common.pdb" target="tools/agents/net462" />
<file src="agents/net462/testcentric.metadata.dll" target="tools/agents/net462" />

<<<<<<< HEAD
<file src="agents/netcoreapp3.1/nunit-agent-netcore31.dll" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit-agent-netcore31.pdb" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit-agent-netcore31.dll.config" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit-agent-netcore31.deps.json" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit-agent-netcore31.runtimeconfig.json" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.api.dll" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.api.pdb" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.api.xml" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.core.dll" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.engine.core.pdb" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.common.dll" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/nunit.common.pdb" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/testcentric.metadata.dll" target="tools/agents/netcoreapp3.1" />
<file src="agents/netcoreapp3.1/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/netcoreapp3.1" />

<file src="agents/net6.0/nunit-agent-net60.dll" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit-agent-net60.pdb" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit-agent-net60.dll.config" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit-agent-net60.deps.json" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit-agent-net60.runtimeconfig.json" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit.engine.api.dll" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit.engine.api.pdb" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit.engine.api.xml" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit.engine.core.dll" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit.engine.core.pdb" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit.common.dll" target="tools/agents/net6.0" />
<file src="agents/net6.0/nunit.common.pdb" target="tools/agents/net6.0" />
<file src="agents/net6.0/testcentric.metadata.dll" target="tools/agents/net6.0" />
<file src="agents/net6.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net6.0" />

<file src="agents/net7.0/nunit-agent-net70.dll" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit-agent-net70.pdb" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit-agent-net70.dll.config" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit-agent-net70.deps.json" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit-agent-net70.runtimeconfig.json" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit.engine.api.dll" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit.engine.api.pdb" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit.engine.api.xml" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit.engine.core.dll" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit.engine.core.pdb" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit.common.dll" target="tools/agents/net7.0" />
<file src="agents/net7.0/nunit.common.pdb" target="tools/agents/net7.0" />
<file src="agents/net7.0/testcentric.metadata.dll" target="tools/agents/net7.0" />
<file src="agents/net7.0/Microsoft.Extensions.DependencyModel.dll" target="tools/agents/net7.0" />

=======
>>>>>>> version4
<file src="agents/net8.0/nunit-agent-net80.dll" target="tools/agents/net8.0" />
<file src="agents/net8.0/nunit-agent-net80.pdb" target="tools/agents/net8.0" />
<file src="agents/net8.0/nunit-agent-net80.dll.config" target="tools/agents/net8.0" />
Expand Down

0 comments on commit 9296dd4

Please sign in to comment.