Restructure project using tests folder

sschmid · Oct 12, 2022 · af03cd2 · af03cd2
1 parent 526c0e3
commit af03cd2
Show file tree

Hide file tree

Showing 26 changed files with 14 additions and 15 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -43,7 +43,7 @@ jobs:
       - name: "Generate Coverage Report"
         run: |
           dotnet tool install -g dotnet-reportgenerator-globaltool
-          reportgenerator -reports:"src/**/tests/TestResults/**/coverage.cobertura.xml" -targetdir:"coverage" -reporttypes:"Html;lcov"
+          reportgenerator -reports:"tests/**/TestResults/**/coverage.cobertura.xml" -targetdir:"coverage" -reporttypes:"Html;lcov"
 
       - name: "Upload Coverage Report"
         uses: actions/upload-artifact@v3

diff --git a/src/Directory.Build.props → Directory.Build.props b/src/Directory.Build.props → Directory.Build.props
diff --git a/src/Directory.Build.targets → Directory.Build.targets b/src/Directory.Build.targets → Directory.Build.targets
diff --git a/Sherlog.sln b/Sherlog.sln
@@ -2,19 +2,19 @@
 #
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sherlog", "Sherlog", "{5BAFDDD4-9388-4E43-8CBB-C648243AE78F}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sherlog", "src\Sherlog\src\Sherlog.csproj", "{5E53385B-6709-4DE3-BD63-44C7C6506189}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sherlog", "src\Sherlog\Sherlog.csproj", "{5E53385B-6709-4DE3-BD63-44C7C6506189}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sherlog.Tests", "src\Sherlog\tests\Sherlog.Tests.csproj", "{DC32B1D6-8292-47DC-9900-B33EA52C01C6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sherlog.Tests", "tests\Sherlog\Sherlog.Tests.csproj", "{DC32B1D6-8292-47DC-9900-B33EA52C01C6}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sherlog.Appenders", "Sherlog.Appenders", "{AFF34632-3CAD-4034-A277-2CEA95A70612}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sherlog.Appenders", "src\Sherlog.Appenders\src\Sherlog.Appenders.csproj", "{0A087C52-6165-4CC1-9BF3-9866D1D8AC92}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sherlog.Appenders", "src\Sherlog.Appenders\Sherlog.Appenders.csproj", "{0A087C52-6165-4CC1-9BF3-9866D1D8AC92}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Sherlog.Formatters", "Sherlog.Formatters", "{B6A57558-6B16-4C20-B7A3-258DF1FC28E5}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sherlog.Formatters", "src\Sherlog.Formatters\src\Sherlog.Formatters.csproj", "{A90D7628-BCBC-47CB-B70D-C199FD2387E1}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sherlog.Formatters", "src\Sherlog.Formatters\Sherlog.Formatters.csproj", "{A90D7628-BCBC-47CB-B70D-C199FD2387E1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sherlog.Formatters.Tests", "src\Sherlog.Formatters\tests\Sherlog.Formatters.Tests.csproj", "{834C76D3-F2AC-4281-98F1-CCB8EB6B3D2D}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Sherlog.Formatters.Tests", "tests\Sherlog.Formatters\Sherlog.Formatters.Tests.csproj", "{834C76D3-F2AC-4281-98F1-CCB8EB6B3D2D}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Samples", "Samples", "{12018E82-628D-4740-8423-E7FE68B66F4E}"
 EndProject

diff --git a/samples/SherlogSamples/SherlogSamples.csproj b/samples/SherlogSamples/SherlogSamples.csproj
@@ -9,9 +9,9 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Sherlog.Appenders\src\Sherlog.Appenders.csproj" />
-    <ProjectReference Include="..\..\src\Sherlog.Formatters\src\Sherlog.Formatters.csproj" />
-    <ProjectReference Include="..\..\src\Sherlog\src\Sherlog.csproj" />
+    <ProjectReference Include="../../src/Sherlog.Appenders/Sherlog.Appenders.csproj" />
+    <ProjectReference Include="../../src/Sherlog.Formatters/Sherlog.Formatters.csproj" />
+    <ProjectReference Include="../../src/Sherlog/Sherlog.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/samples/SherlogServer/SherlogServer.csproj b/samples/SherlogServer/SherlogServer.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\src\Sherlog.Formatters\src\Sherlog.Formatters.csproj" />
+    <ProjectReference Include="../../src/Sherlog.Formatters/Sherlog.Formatters.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...ppenders/src/AbstractTcpSocketAppender.cs → ...og.Appenders/AbstractTcpSocketAppender.cs b/...ppenders/src/AbstractTcpSocketAppender.cs → ...og.Appenders/AbstractTcpSocketAppender.cs
diff --git a/src/Sherlog.Appenders/src/ConsoleAppender.cs → src/Sherlog.Appenders/ConsoleAppender.cs b/src/Sherlog.Appenders/src/ConsoleAppender.cs → src/Sherlog.Appenders/ConsoleAppender.cs
diff --git a/...erlog.Appenders/src/FileWriterAppender.cs → src/Sherlog.Appenders/FileWriterAppender.cs b/...erlog.Appenders/src/FileWriterAppender.cs → src/Sherlog.Appenders/FileWriterAppender.cs
diff --git a/...og.Appenders/src/Sherlog.Appenders.csproj → ...herlog.Appenders/Sherlog.Appenders.csproj b/...og.Appenders/src/Sherlog.Appenders.csproj → ...herlog.Appenders/Sherlog.Appenders.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../Sherlog/src/Sherlog.csproj" />
+    <ProjectReference Include="../Sherlog/Sherlog.csproj" />
   </ItemGroup>
 
   <ItemGroup>

diff --git a/src/Sherlog.Appenders/src/SosMaxAppender.cs → src/Sherlog.Appenders/SosMaxAppender.cs b/src/Sherlog.Appenders/src/SosMaxAppender.cs → src/Sherlog.Appenders/SosMaxAppender.cs
diff --git a/...herlog.Appenders/src/TcpSocketAppender.cs → src/Sherlog.Appenders/TcpSocketAppender.cs b/...herlog.Appenders/src/TcpSocketAppender.cs → src/Sherlog.Appenders/TcpSocketAppender.cs
diff --git a/...rlog.Formatters/src/ColorCodeFormatter.cs → src/Sherlog.Formatters/ColorCodeFormatter.cs b/...rlog.Formatters/src/ColorCodeFormatter.cs → src/Sherlog.Formatters/ColorCodeFormatter.cs
diff --git a/src/Sherlog.Formatters/src/LogFormatter.cs → src/Sherlog.Formatters/LogFormatter.cs b/src/Sherlog.Formatters/src/LogFormatter.cs → src/Sherlog.Formatters/LogFormatter.cs
diff --git a/...log.Formatters/src/LogMessageFormatter.cs → ...Sherlog.Formatters/LogMessageFormatter.cs b/...log.Formatters/src/LogMessageFormatter.cs → ...Sherlog.Formatters/LogMessageFormatter.cs
diff --git a/....Formatters/src/Sherlog.Formatters.csproj → ...rlog.Formatters/Sherlog.Formatters.csproj b/....Formatters/src/Sherlog.Formatters.csproj → ...rlog.Formatters/Sherlog.Formatters.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../Sherlog/src/Sherlog.csproj" />
+    <ProjectReference Include="../Sherlog/Sherlog.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/...rlog.Formatters/src/TimestampFormatter.cs → src/Sherlog.Formatters/TimestampFormatter.cs b/...rlog.Formatters/src/TimestampFormatter.cs → src/Sherlog.Formatters/TimestampFormatter.cs
diff --git a/src/Sherlog/src/LogLevel.cs → src/Sherlog/LogLevel.cs b/src/Sherlog/src/LogLevel.cs → src/Sherlog/LogLevel.cs
diff --git a/src/Sherlog/src/Logger.cs → src/Sherlog/Logger.cs b/src/Sherlog/src/Logger.cs → src/Sherlog/Logger.cs
diff --git a/src/Sherlog/src/LoggerStatic.cs → src/Sherlog/LoggerStatic.cs b/src/Sherlog/src/LoggerStatic.cs → src/Sherlog/LoggerStatic.cs
diff --git a/src/Sherlog/src/Sherlog.csproj → src/Sherlog/Sherlog.csproj b/src/Sherlog/src/Sherlog.csproj → src/Sherlog/Sherlog.csproj
diff --git a/...matters/tests/LogMessageFormatterTests.cs → ...og.Formatters/LogMessageFormatterTests.cs b/...matters/tests/LogMessageFormatterTests.cs → ...og.Formatters/LogMessageFormatterTests.cs
diff --git a/...ers/tests/Sherlog.Formatters.Tests.csproj → ...ormatters/Sherlog.Formatters.Tests.csproj b/...ers/tests/Sherlog.Formatters.Tests.csproj → ...ormatters/Sherlog.Formatters.Tests.csproj
@@ -16,8 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../../Sherlog/src/Sherlog.csproj" />
-    <ProjectReference Include="../src/Sherlog.Formatters.csproj" />
+    <ProjectReference Include="../../src/Sherlog.Formatters/Sherlog.Formatters.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Sherlog/tests/LoggerTests.cs → tests/Sherlog/LoggerTests.cs b/src/Sherlog/tests/LoggerTests.cs → tests/Sherlog/LoggerTests.cs
diff --git a/src/Sherlog/tests/Sherlog.Tests.csproj → tests/Sherlog/Sherlog.Tests.csproj b/src/Sherlog/tests/Sherlog.Tests.csproj → tests/Sherlog/Sherlog.Tests.csproj
@@ -16,7 +16,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="../src/Sherlog.csproj" />
+    <ProjectReference Include="../../src/Sherlog/Sherlog.csproj" />
   </ItemGroup>
 
 </Project>
diff --git a/src/Sherlog/tests/SherlogTests.cs → tests/Sherlog/SherlogTests.cs b/src/Sherlog/tests/SherlogTests.cs → tests/Sherlog/SherlogTests.cs