Add additional classes to nunit.common

nunit · Jan 22, 2025 · 9abfb9e · 9abfb9e
1 parent ed4f647
commit 9abfb9e
Show file tree

Hide file tree

Showing 29 changed files with 20 additions and 28 deletions.
diff --git a/src/NUnitConsole/nunit4-console/ConsoleRunner.cs b/src/NUnitConsole/nunit4-console/ConsoleRunner.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Xml;
-using NUnit.Common;
 using NUnit.ConsoleRunner.Utilities;
 using NUnit.ConsoleRunner.Options;
 using NUnit.Engine;

diff --git a/src/NUnitConsole/nunit4-console/Program.cs b/src/NUnitConsole/nunit4-console/Program.cs
@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using NUnit.Common;
 using NUnit.Engine;
 
 using NUnit.ConsoleRunner.Options;

diff --git a/src/NUnitConsole/nunit4-console/nunit4-console.csproj b/src/NUnitConsole/nunit4-console/nunit4-console.csproj
@@ -24,8 +24,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\NUnitEngine\nunit.engine.core\EnginePackageSettings.cs" Link="EnginePackageSettings.cs" />
-    <Compile Include="..\..\NUnitEngine\nunit.engine.core\Internal\ExceptionHelper.cs" Link="Utilities\ExceptionHelper.cs" />
     <Content Include="..\..\..\nunit.ico" Link="nunit.ico" />
   </ItemGroup>
 

diff --git a/src/NUnitConsole/nunit4-netcore-console/Program.cs b/src/NUnitConsole/nunit4-netcore-console/Program.cs
@@ -7,7 +7,6 @@
 using System.Linq;
 using System.Reflection;
 using System.Text;
-using NUnit.Common;
 using NUnit.Engine;
 
 using NUnit.ConsoleRunner.Options;

diff --git a/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj b/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj
@@ -42,8 +42,6 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="..\..\NUnitEngine\nunit.engine.core\EnginePackageSettings.cs" Link="EnginePackageSettings.cs" />
-    <Compile Include="..\..\NUnitEngine\nunit.engine.core\Internal\ExceptionHelper.cs" Link="Utilities\ExceptionHelper.cs" />
     <Compile Include="..\nunit4-console\ColorConsole.cs" Link="ColorConsole.cs" />
     <Compile Include="..\nunit4-console\ColorConsoleWriter.cs" Link="ColorConsoleWriter.cs" />
     <Compile Include="..\nunit4-console\ColorStyle.cs" Link="ColorStyle.cs" />

diff --git a/src/NUnitEngine/agents/AgentExitCodes.cs b/src/NUnitEngine/agents/AgentExitCodes.cs
@@ -1,6 +1,6 @@
 // Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
 
-namespace NUnit.Common
+namespace NUnit
 {
     internal static class AgentExitCodes
     {

diff --git a/src/NUnitEngine/agents/Program.cs b/src/NUnitEngine/agents/Program.cs
@@ -4,10 +4,8 @@
 using System.Diagnostics;
 using System.Runtime.InteropServices;
 using System.Security;
-using NUnit.Common;
 using NUnit.Engine;
 using NUnit.Engine.Agents;
-using NUnit.Engine.Internal;
 
 #if NETFRAMEWORK
 using RuntimeInformation = NUnit.Engine.Internal.Backports.RuntimeInformation;

diff --git a/src/NUnitEngine/agents/nunit-agent-net462-x86/nunit-agent-net462-x86.csproj b/src/NUnitEngine/agents/nunit-agent-net462-x86/nunit-agent-net462-x86.csproj
@@ -26,7 +26,6 @@
   <ItemGroup>
     <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
-    <Compile Include="..\..\nunit.engine.core\Internal\ExceptionHelper.cs" Link="ExceptionHelper.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NUnitEngine/agents/nunit-agent-net462/nunit-agent-net462.csproj b/src/NUnitEngine/agents/nunit-agent-net462/nunit-agent-net462.csproj
@@ -25,7 +25,6 @@
   <ItemGroup>
     <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
-    <Compile Include="..\..\nunit.engine.core\Internal\ExceptionHelper.cs" Link="ExceptionHelper.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NUnitEngine/agents/nunit-agent-net60/nunit-agent-net60.csproj b/src/NUnitEngine/agents/nunit-agent-net60/nunit-agent-net60.csproj
@@ -26,7 +26,6 @@
   <ItemGroup>
     <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
-    <Compile Include="..\..\nunit.engine.core\Internal\ExceptionHelper.cs" Link="ExceptionHelper.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NUnitEngine/agents/nunit-agent-net70/nunit-agent-net70.csproj b/src/NUnitEngine/agents/nunit-agent-net70/nunit-agent-net70.csproj
@@ -26,7 +26,6 @@
   <ItemGroup>
     <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
-    <Compile Include="..\..\nunit.engine.core\Internal\ExceptionHelper.cs" Link="ExceptionHelper.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NUnitEngine/agents/nunit-agent-net80/nunit-agent-net80.csproj b/src/NUnitEngine/agents/nunit-agent-net80/nunit-agent-net80.csproj
@@ -27,7 +27,6 @@
   <ItemGroup>
     <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
-    <Compile Include="..\..\nunit.engine.core\Internal\ExceptionHelper.cs" Link="ExceptionHelper.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NUnitEngine/agents/nunit-agent-netcore31/nunit-agent-netcore31.csproj b/src/NUnitEngine/agents/nunit-agent-netcore31/nunit-agent-netcore31.csproj
@@ -27,7 +27,6 @@
   <ItemGroup>
     <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
-    <Compile Include="..\..\nunit.engine.core\Internal\ExceptionHelper.cs" Link="ExceptionHelper.cs" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NUnitEngine/nunit.common/AgentExitCodes.cs b/src/NUnitEngine/nunit.common/AgentExitCodes.cs
@@ -0,0 +1,16 @@
+// Copyright (c) Charlie Poole, Rob Prouse and Contributors. MIT License - see LICENSE.txt
+
+namespace NUnit
+{
+    internal static class AgentExitCodes
+    {
+        public const int OK = 0;
+        public const int PARENT_PROCESS_TERMINATED = -1;
+        public const int FAILED_TO_START_REMOTE_AGENT = -2;
+        public const int DEBUGGER_SECURITY_VIOLATION = -3;
+        public const int DEBUGGER_NOT_IMPLEMENTED = -4;
+        public const int UNABLE_TO_LOCATE_AGENCY = -5;
+        public const int UNEXPECTED_EXCEPTION = -100;
+        public const int STACK_OVERFLOW_EXCEPTION = -1073741571;
+    }
+}
diff --git a/...unit.engine.core/EnginePackageSettings.cs → ...ine/nunit.common/EnginePackageSettings.cs b/...unit.engine.core/EnginePackageSettings.cs → ...ine/nunit.common/EnginePackageSettings.cs
diff --git a/...t.engine.core/Internal/ExceptionHelper.cs → ...nitEngine/nunit.common/ExceptionHelper.cs b/...t.engine.core/Internal/ExceptionHelper.cs → ...nitEngine/nunit.common/ExceptionHelper.cs
@@ -9,9 +9,9 @@
 
 #nullable enable
 
-namespace NUnit.Common
+namespace NUnit
 {
-    internal static class ExceptionHelper
+    public static class ExceptionHelper
     {
         /// <summary>
         /// Builds up a message, using the Message field of the specified exception

diff --git a/...NUnitEngine/nunit.common/InternalTrace.cs → ...ine/nunit.common/Logging/InternalTrace.cs b/...NUnitEngine/nunit.common/InternalTrace.cs → ...ine/nunit.common/Logging/InternalTrace.cs
diff --git a/...ngine/nunit.common/InternalTraceWriter.cs → ...nit.common/Logging/InternalTraceWriter.cs b/...ngine/nunit.common/InternalTraceWriter.cs → ...nit.common/Logging/InternalTraceWriter.cs
diff --git a/src/NUnitEngine/nunit.common/Logger.cs → ...UnitEngine/nunit.common/Logging/Logger.cs b/src/NUnitEngine/nunit.common/Logger.cs → ...UnitEngine/nunit.common/Logging/Logger.cs
diff --git a/...e/nunit.engine.core/Internal/XmlHelper.cs → src/NUnitEngine/nunit.common/XmlHelper.cs b/...e/nunit.engine.core/Internal/XmlHelper.cs → src/NUnitEngine/nunit.common/XmlHelper.cs
@@ -11,7 +11,7 @@ namespace System.Runtime.CompilerServices
     sealed class ExtensionAttribute : Attribute { }
 }
 
-namespace NUnit.Engine.Internal
+namespace NUnit
 {
     /// <summary>
     /// XmlHelper provides static methods for basic XML operations.

diff --git a/...tEngine/nunit.engine.core/Communication/Transports/Remoting/TestAgentRemotingTransport.cs b/...tEngine/nunit.engine.core/Communication/Transports/Remoting/TestAgentRemotingTransport.cs
@@ -5,7 +5,6 @@
 using System.Runtime.Remoting.Channels;
 using System.Runtime.Remoting.Channels.Tcp;
 using System.Threading;
-using NUnit.Common;
 using NUnit.Engine.Agents;
 using NUnit.Engine.Internal;
 

diff --git a/src/NUnitEngine/nunit.engine.core/Compatibility/FrameworkName.cs b/src/NUnitEngine/nunit.engine.core/Compatibility/FrameworkName.cs
@@ -3,7 +3,6 @@
 #if NET20 || NET35
 using System;
 using System.Diagnostics;
-using NUnit.Common;
 
 // NOTE: Since the .NET 4.5 engine refers to this assembly, we can't define
 // FrameworkName in the System.Runtime.Versioning namespace.

diff --git a/src/NUnitEngine/nunit.engine.core/Internal/DomainDetailsBuilder.cs b/src/NUnitEngine/nunit.engine.core/Internal/DomainDetailsBuilder.cs
@@ -4,7 +4,6 @@
 using System.Collections.Generic;
 using System.Reflection;
 using System.Text;
-using NUnit.Common;
 
 namespace NUnit.Engine.Internal
 {

diff --git a/src/NUnitEngine/nunit.engine.core/Internal/TcpChannelUtils.cs b/src/NUnitEngine/nunit.engine.core/Internal/TcpChannelUtils.cs
@@ -8,7 +8,6 @@
 using System.Runtime.Remoting.Channels.Tcp;
 using System.Runtime.Serialization.Formatters;
 using System.Threading;
-using NUnit.Common;
 
 namespace NUnit.Engine.Internal
 {

diff --git a/src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyResolver.cs b/src/NUnitEngine/nunit.engine.core/Internal/TestAssemblyResolver.cs
@@ -5,7 +5,6 @@
 using Microsoft.Extensions.DependencyModel;
 using Microsoft.Extensions.DependencyModel.Resolution;
 using Microsoft.Win32;
-using NUnit.Common;
 using System;
 using System.Collections.Generic;
 using System.Diagnostics.CodeAnalysis;

diff --git a/src/NUnitEngine/nunit.engine.core/Runners/DomainManager.cs b/src/NUnitEngine/nunit.engine.core/Runners/DomainManager.cs
@@ -10,7 +10,6 @@
 using System.Security;
 using System.Security.Policy;
 using System.Security.Principal;
-using NUnit.Common;
 using NUnit.Engine.Internal;
 using System.Linq;
 

diff --git a/src/NUnitEngine/nunit.engine/Runners/ProcessRunner.cs b/src/NUnitEngine/nunit.engine/Runners/ProcessRunner.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Diagnostics;
 using System.Diagnostics.CodeAnalysis;
-using NUnit.Common;
 using NUnit.Engine.Internal;
 using NUnit.Engine.Services;
 

diff --git a/src/NUnitEngine/nunit.engine/Services/TestAgency.cs b/src/NUnitEngine/nunit.engine/Services/TestAgency.cs
@@ -4,7 +4,6 @@
 using System;
 using System.Threading;
 using System.Diagnostics;
-using NUnit.Common;
 using NUnit.Engine.Internal;
 using NUnit.Engine.Communication.Transports.Remoting;
 using NUnit.Engine.Communication.Transports.Tcp;

diff --git a/src/NUnitEngine/nunit.engine/nunit.engine.csproj b/src/NUnitEngine/nunit.engine/nunit.engine.csproj
@@ -25,7 +25,6 @@
 
   <ItemGroup>
     <Compile Include="..\agents\AgentExitCodes.cs" LinkBase="Agents" />
-    <Compile Include="..\nunit.engine.core\Internal\ExceptionHelper.cs" Link="Internal\ExceptionHelper.cs" />
   </ItemGroup>
 
   <ItemGroup>