Move nunit.common and nunit.common.tests to NUnitCommon directory

nunit · Feb 2, 2025 · 03ccd89 · 03ccd89
1 parent bb4e19e
commit 03ccd89
Show file tree

Hide file tree

Showing 35 changed files with 21 additions and 23 deletions.
diff --git a/NUnitConsole.sln b/NUnitConsole.sln
@@ -147,14 +147,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.2", "src\TestData\NU
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NUnit3.10", "src\TestData\NUnit3.10\NUnit3.10.csproj", "{0555B97D-E918-455B-951C-74EFCDA8790A}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common", "src\NUnitEngine\nunit.common\nunit.common.csproj", "{542685E5-8C2E-4425-ADD1-C45B55AFB964}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common.tests", "src\NUnitEngine\nunit.common.tests\nunit.common.tests.csproj", "{F546CFE1-74B0-45D3-A06A-8972D73F4419}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "NUnitCommon", "NUnitCommon", "{3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}"
-	ProjectSection(SolutionItems) = preProject
-		src\NUnitCommon\Directory.Build.props = src\NUnitCommmon\Directory.Build.props
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.extensibility.api", "src\NUnitCommon\nunit.extensibility.api\nunit.extensibility.api.csproj", "{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}"
 EndProject
@@ -164,6 +157,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.extensibility.tests",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FakeExtensions", "src\NUnitCommon\FakeExtensions\FakeExtensions.csproj", "{E2A4C099-E35D-4E27-B89D-957140ED970F}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common", "src\NUnitCommon\nunit.common\nunit.common.csproj", "{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "nunit.common.tests", "src\NUnitCommon\nunit.common.tests\nunit.common.tests.csproj", "{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -266,14 +263,6 @@ Global
 		{0555B97D-E918-455B-951C-74EFCDA8790A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0555B97D-E918-455B-951C-74EFCDA8790A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{0555B97D-E918-455B-951C-74EFCDA8790A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{542685E5-8C2E-4425-ADD1-C45B55AFB964}.Release|Any CPU.Build.0 = Release|Any CPU
-		{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{F546CFE1-74B0-45D3-A06A-8972D73F4419}.Release|Any CPU.Build.0 = Release|Any CPU
 		{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -290,6 +279,14 @@ Global
 		{E2A4C099-E35D-4E27-B89D-957140ED970F}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{E2A4C099-E35D-4E27-B89D-957140ED970F}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{E2A4C099-E35D-4E27-B89D-957140ED970F}.Release|Any CPU.Build.0 = Release|Any CPU
+		{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -330,12 +327,12 @@ Global
 		{56416AD9-8E7B-4F72-B0E1-E75A024431F8} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
 		{8AFBB856-700A-4CCC-AE0E-9B622178E1E0} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
 		{0555B97D-E918-455B-951C-74EFCDA8790A} = {D31607D2-D689-488B-9F9F-92F47AC1D7F6}
-		{542685E5-8C2E-4425-ADD1-C45B55AFB964} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
-		{F546CFE1-74B0-45D3-A06A-8972D73F4419} = {31B45C4C-206F-4F31-9CC6-33BF11DFEE39}
 		{71DE0F2C-C72B-4CBF-99BE-F2DC0FBEDA24} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
 		{49E8B583-37C2-4166-8007-3DB780D01004} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
 		{B22FEE5B-83D4-4021-B066-1B958332D391} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
 		{E2A4C099-E35D-4E27-B89D-957140ED970F} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
+		{9D9CAD66-8EDF-4ED0-A222-503BE9B21EC7} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
+		{6605DA54-EBF4-4ED1-B5BC-B607AD0CE308} = {3B30D2E5-1587-4D68-B848-1BDDB3C24BFC}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {D8E4FC26-5422-4C51-8BBC-D1AC0A578711}

diff --git a/...ileSystemAccess/Default/DirectoryTests.cs → ...ileSystemAccess/Default/DirectoryTests.cs b/...ileSystemAccess/Default/DirectoryTests.cs → ...ileSystemAccess/Default/DirectoryTests.cs
diff --git a/...leSystemAccess/Default/DirectoryTests2.cs → ...leSystemAccess/Default/DirectoryTests2.cs b/...leSystemAccess/Default/DirectoryTests2.cs → ...leSystemAccess/Default/DirectoryTests2.cs
diff --git a/...leSystemAccess/Default/FileSystemTests.cs → ...leSystemAccess/Default/FileSystemTests.cs b/...leSystemAccess/Default/FileSystemTests.cs → ...leSystemAccess/Default/FileSystemTests.cs
diff --git a/...sts/FileSystemAccess/Default/FileTests.cs → ...sts/FileSystemAccess/Default/FileTests.cs b/...sts/FileSystemAccess/Default/FileTests.cs → ...sts/FileSystemAccess/Default/FileTests.cs
diff --git a/...Engine/nunit.common.tests/LoggingTests.cs → ...Common/nunit.common.tests/LoggingTests.cs b/...Engine/nunit.common.tests/LoggingTests.cs → ...Common/nunit.common.tests/LoggingTests.cs
diff --git a/...NUnitEngine/nunit.common.tests/Program.cs → ...NUnitCommon/nunit.common.tests/Program.cs b/...NUnitEngine/nunit.common.tests/Program.cs → ...NUnitCommon/nunit.common.tests/Program.cs
diff --git a/...gine/nunit.common.tests/XmlHelperTests.cs → ...mmon/nunit.common.tests/XmlHelperTests.cs b/...gine/nunit.common.tests/XmlHelperTests.cs → ...mmon/nunit.common.tests/XmlHelperTests.cs
diff --git a/...it.common.tests/nunit.common.tests.csproj → ...it.common.tests/nunit.common.tests.csproj b/...it.common.tests/nunit.common.tests.csproj → ...it.common.tests/nunit.common.tests.csproj
@@ -8,7 +8,7 @@
 
   <ItemGroup>
     <ProjectReference Include="..\nunit.common\nunit.common.csproj" />
-    <ProjectReference Include="..\nunit.engine.api\nunit.engine.api.csproj" />
+    <ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...UnitEngine/nunit.common/AgentExitCodes.cs → ...UnitCommon/nunit.common/AgentExitCodes.cs b/...UnitEngine/nunit.common/AgentExitCodes.cs → ...UnitCommon/nunit.common/AgentExitCodes.cs
diff --git a/...UnitEngine/nunit.common/AssemblyHelper.cs → ...UnitCommon/nunit.common/AssemblyHelper.cs b/...UnitEngine/nunit.common/AssemblyHelper.cs → ...UnitCommon/nunit.common/AssemblyHelper.cs
diff --git a/...mmon/CallerArgumentExpressionAttribute.cs → ...mmon/CallerArgumentExpressionAttribute.cs b/...mmon/CallerArgumentExpressionAttribute.cs → ...mmon/CallerArgumentExpressionAttribute.cs
diff --git a/...ine/nunit.common/EnginePackageSettings.cs → ...mon/nunit.common/EnginePackageSettings.cs b/...ine/nunit.common/EnginePackageSettings.cs → ...mon/nunit.common/EnginePackageSettings.cs
diff --git a/...nitEngine/nunit.common/ExceptionHelper.cs → ...nitCommon/nunit.common/ExceptionHelper.cs b/...nitEngine/nunit.common/ExceptionHelper.cs → ...nitCommon/nunit.common/ExceptionHelper.cs
diff --git a/...unit.common/FileSystemAccess/Directory.cs → ...unit.common/FileSystemAccess/Directory.cs b/...unit.common/FileSystemAccess/Directory.cs → ...unit.common/FileSystemAccess/Directory.cs
diff --git a/...ommon/FileSystemAccess/DirectoryFinder.cs → ...ommon/FileSystemAccess/DirectoryFinder.cs b/...ommon/FileSystemAccess/DirectoryFinder.cs → ...ommon/FileSystemAccess/DirectoryFinder.cs
diff --git a/...ine/nunit.common/FileSystemAccess/File.cs → ...mon/nunit.common/FileSystemAccess/File.cs b/...ine/nunit.common/FileSystemAccess/File.cs → ...mon/nunit.common/FileSystemAccess/File.cs
diff --git a/...nit.common/FileSystemAccess/FileSystem.cs → ...nit.common/FileSystemAccess/FileSystem.cs b/...nit.common/FileSystemAccess/FileSystem.cs → ...nit.common/FileSystemAccess/FileSystem.cs
diff --git a/...nit.common/FileSystemAccess/IDirectory.cs → ...nit.common/FileSystemAccess/IDirectory.cs b/...nit.common/FileSystemAccess/IDirectory.cs → ...nit.common/FileSystemAccess/IDirectory.cs
diff --git a/...mmon/FileSystemAccess/IDirectoryFinder.cs → ...mmon/FileSystemAccess/IDirectoryFinder.cs b/...mmon/FileSystemAccess/IDirectoryFinder.cs → ...mmon/FileSystemAccess/IDirectoryFinder.cs
diff --git a/...ne/nunit.common/FileSystemAccess/IFile.cs → ...on/nunit.common/FileSystemAccess/IFile.cs b/...ne/nunit.common/FileSystemAccess/IFile.cs → ...on/nunit.common/FileSystemAccess/IFile.cs
diff --git a/...it.common/FileSystemAccess/IFileSystem.cs → ...it.common/FileSystemAccess/IFileSystem.cs b/...it.common/FileSystemAccess/IFileSystem.cs → ...it.common/FileSystemAccess/IFileSystem.cs
diff --git a/...ngine/nunit.common/FrameworkIdentifers.cs → ...ommon/nunit.common/FrameworkIdentifers.cs b/...ngine/nunit.common/FrameworkIdentifers.cs → ...ommon/nunit.common/FrameworkIdentifers.cs
diff --git a/src/NUnitEngine/nunit.common/Guard.cs → src/NUnitCommon/nunit.common/Guard.cs b/src/NUnitEngine/nunit.common/Guard.cs → src/NUnitCommon/nunit.common/Guard.cs
diff --git a/...ine/nunit.common/Logging/InternalTrace.cs → ...mon/nunit.common/Logging/InternalTrace.cs b/...ine/nunit.common/Logging/InternalTrace.cs → ...mon/nunit.common/Logging/InternalTrace.cs
diff --git a/...nit.common/Logging/InternalTraceWriter.cs → ...nit.common/Logging/InternalTraceWriter.cs b/...nit.common/Logging/InternalTraceWriter.cs → ...nit.common/Logging/InternalTraceWriter.cs
diff --git a/...UnitEngine/nunit.common/Logging/Logger.cs → ...UnitCommon/nunit.common/Logging/Logger.cs b/...UnitEngine/nunit.common/Logging/Logger.cs → ...UnitCommon/nunit.common/Logging/Logger.cs
diff --git a/src/NUnitEngine/nunit.common/PathUtils.cs → src/NUnitCommon/nunit.common/PathUtils.cs b/src/NUnitEngine/nunit.common/PathUtils.cs → src/NUnitCommon/nunit.common/PathUtils.cs
diff --git a/src/NUnitEngine/nunit.common/XmlHelper.cs → src/NUnitCommon/nunit.common/XmlHelper.cs b/src/NUnitEngine/nunit.common/XmlHelper.cs → src/NUnitCommon/nunit.common/XmlHelper.cs
diff --git a/...itEngine/nunit.common/nunit.common.csproj → ...itCommon/nunit.common/nunit.common.csproj b/...itEngine/nunit.common/nunit.common.csproj → ...itCommon/nunit.common/nunit.common.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\nunit.engine.api\nunit.engine.api.csproj" />
+    <ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NUnitCommon/nunit.extensibility/nunit.extensibility.csproj b/src/NUnitCommon/nunit.extensibility/nunit.extensibility.csproj
@@ -12,9 +12,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\NUnitEngine\nunit.common\nunit.common.csproj" />
     <ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
     <ProjectReference Include="..\nunit.extensibility.api\nunit.extensibility.api.csproj" />
+    <ProjectReference Include="..\..\NUnitCommon\nunit.common\nunit.common.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NUnitConsole/nunit4-console.tests/nunit4-console.tests.csproj b/src/NUnitConsole/nunit4-console.tests/nunit4-console.tests.csproj
@@ -44,6 +44,7 @@
     <ProjectReference Condition="'$(TargetFramework)'=='net462'" Include="..\nunit4-console\nunit4-console.csproj" />
     <ProjectReference Condition="'$(TargetFramework)'=='net8.0'" Include="..\nunit4-netcore-console\nunit4-netcore-console.csproj" />
     <ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
+    <ProjectReference Include="..\..\NUnitCommon\nunit.common\nunit.common.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/NUnitConsole/nunit4-console/nunit4-console.csproj b/src/NUnitConsole/nunit4-console/nunit4-console.csproj
@@ -27,8 +27,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\NUnitEngine\nunit.common\nunit.common.csproj" />
     <ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
+    <ProjectReference Include="..\..\NUnitCommon\nunit.common\nunit.common.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj b/src/NUnitConsole/nunit4-netcore-console/nunit4-netcore-console.csproj
@@ -73,8 +73,8 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\NUnitEngine\nunit.common\nunit.common.csproj" />
     <ProjectReference Include="..\..\NUnitEngine\nunit.engine.api\nunit.engine.api.csproj" />
+    <ProjectReference Include="..\..\NUnitCommon\nunit.common\nunit.common.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj b/src/NUnitEngine/nunit.engine.core/nunit.engine.core.csproj
@@ -37,9 +37,9 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\nunit.common\nunit.common.csproj" />
     <ProjectReference Include="..\nunit.engine.api\nunit.engine.api.csproj" />
     <ProjectReference Include="..\..\NUnitCommon\nunit.extensibility.api\nunit.extensibility.api.csproj" />
+    <ProjectReference Include="..\..\NUnitCommon\nunit.common\nunit.common.csproj" />
   </ItemGroup>
 
 </Project>