Changes from code review

nunit · Jan 23, 2025 · 47d96af · 47d96af
1 parent 0db9a60
commit 47d96af
Show file tree

Hide file tree

Showing 14 changed files with 1 addition and 47 deletions.
diff --git a/src/NUnitConsole/nunit4-console.tests/Program.cs b/src/NUnitConsole/nunit4-console.tests/Program.cs
@@ -8,11 +8,7 @@ class Program
     {
         static int Main(string[] args)
         {
-#if NETFRAMEWORK
             return new NUnitLite.TextRunner(typeof(Program).Assembly).Execute(args);
-#else
-            return new NUnitLite.TextRunner(typeof(Program).GetTypeInfo().Assembly).Execute(args);
-#endif
         }
     }
 }
diff --git a/src/NUnitEngine/agents/AgentExitCodes.cs b/src/NUnitEngine/agents/AgentExitCodes.cs
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
@@ -24,7 +24,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
   </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
@@ -23,7 +23,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
   </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
@@ -24,7 +24,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
   </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
@@ -24,7 +24,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
   </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
@@ -25,7 +25,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
   </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
@@ -25,7 +25,6 @@
   </ItemGroup>
 
   <ItemGroup>
-    <Compile Include="..\AgentExitCodes.cs" Link="AgentExitCodes.cs" />
     <Compile Include="..\Program.cs" Link="Program.cs" />
   </ItemGroup>
 

diff --git a/src/NUnitEngine/nunit.common.tests/Program.cs b/src/NUnitEngine/nunit.common.tests/Program.cs
@@ -9,11 +9,7 @@ class Program
     {
         static int Main(string[] args)
         {
-#if NETFRAMEWORK
             return new TextRunner(typeof(Program).Assembly).Execute(args);
-#else
-            return new TextRunner(typeof(Program).GetTypeInfo().Assembly).Execute(args);
-#endif
         }
     }
 }
diff --git a/src/NUnitEngine/nunit.common/AgentExitCodes.cs b/src/NUnitEngine/nunit.common/AgentExitCodes.cs
@@ -2,7 +2,7 @@
 
 namespace NUnit
 {
-    internal static class AgentExitCodes
+    public static class AgentExitCodes
     {
         public const int OK = 0;
         public const int PARENT_PROCESS_TERMINATED = -1;

diff --git a/src/NUnitEngine/nunit.engine.core.tests/Program.cs b/src/NUnitEngine/nunit.engine.core.tests/Program.cs
@@ -9,11 +9,7 @@ class Program
     {
         static int Main(string[] args)
         {
-#if NETFRAMEWORK
             return new TextRunner(typeof(Program).Assembly).Execute(args);
-#else
-            return new TextRunner(typeof(Program).GetTypeInfo().Assembly).Execute(args);
-#endif
         }
     }
 }
diff --git a/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj b/src/NUnitEngine/nunit.engine.core.tests/nunit.engine.core.tests.csproj
@@ -65,8 +65,4 @@
     <None Include="App.config" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Folder Include="Internal\Logging\" />
-  </ItemGroup>
-
 </Project>
diff --git a/src/NUnitEngine/nunit.engine.tests/Program.cs b/src/NUnitEngine/nunit.engine.tests/Program.cs
@@ -9,11 +9,7 @@ class Program
     {
         static int Main(string[] args)
         {
-#if NETFRAMEWORK
             return new TextRunner(typeof(Program).Assembly).Execute(args);
-#else
-            return new TextRunner(typeof(Program).GetTypeInfo().Assembly).Execute(args);
-#endif
         }
     }
 }
diff --git a/src/NUnitEngine/nunit.engine/nunit.engine.csproj b/src/NUnitEngine/nunit.engine/nunit.engine.csproj
@@ -23,10 +23,6 @@
     <Reference Include="System.Web" />
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\agents\AgentExitCodes.cs" LinkBase="Agents" />
-  </ItemGroup>
-
   <ItemGroup>
     <ProjectReference Include="..\nunit.engine.api\nunit.engine.api.csproj" />
     <ProjectReference Include="..\nunit.engine.core\nunit.engine.core.csproj" />