From af03cd20e31c033f8d4df0ff0771d7d8b91cd21e Mon Sep 17 00:00:00 2001 From: Simon Schmid Date: Wed, 12 Oct 2022 16:45:51 +0200 Subject: [PATCH] Restructure project using tests folder --- .github/workflows/build.yml | 2 +- src/Directory.Build.props => Directory.Build.props | 0 src/Directory.Build.targets => Directory.Build.targets | 0 Sherlog.sln | 10 +++++----- samples/SherlogSamples/SherlogSamples.csproj | 6 +++--- samples/SherlogServer/SherlogServer.csproj | 2 +- .../{src => }/AbstractTcpSocketAppender.cs | 0 src/Sherlog.Appenders/{src => }/ConsoleAppender.cs | 0 src/Sherlog.Appenders/{src => }/FileWriterAppender.cs | 0 .../{src => }/Sherlog.Appenders.csproj | 2 +- src/Sherlog.Appenders/{src => }/SosMaxAppender.cs | 0 src/Sherlog.Appenders/{src => }/TcpSocketAppender.cs | 0 src/Sherlog.Formatters/{src => }/ColorCodeFormatter.cs | 0 src/Sherlog.Formatters/{src => }/LogFormatter.cs | 0 .../{src => }/LogMessageFormatter.cs | 0 .../{src => }/Sherlog.Formatters.csproj | 2 +- src/Sherlog.Formatters/{src => }/TimestampFormatter.cs | 0 src/Sherlog/{src => }/LogLevel.cs | 0 src/Sherlog/{src => }/Logger.cs | 0 src/Sherlog/{src => }/LoggerStatic.cs | 0 src/Sherlog/{src => }/Sherlog.csproj | 0 .../Sherlog.Formatters}/LogMessageFormatterTests.cs | 0 .../Sherlog.Formatters.Tests.csproj | 3 +-- {src/Sherlog/tests => tests/Sherlog}/LoggerTests.cs | 0 .../tests => tests/Sherlog}/Sherlog.Tests.csproj | 2 +- {src/Sherlog/tests => tests/Sherlog}/SherlogTests.cs | 0 26 files changed, 14 insertions(+), 15 deletions(-) rename src/Directory.Build.props => Directory.Build.props (100%) rename src/Directory.Build.targets => Directory.Build.targets (100%) rename src/Sherlog.Appenders/{src => }/AbstractTcpSocketAppender.cs (100%) rename src/Sherlog.Appenders/{src => }/ConsoleAppender.cs (100%) rename src/Sherlog.Appenders/{src => }/FileWriterAppender.cs (100%) rename src/Sherlog.Appenders/{src => }/Sherlog.Appenders.csproj (82%) rename src/Sherlog.Appenders/{src => }/SosMaxAppender.cs (100%) rename src/Sherlog.Appenders/{src => }/TcpSocketAppender.cs (100%) rename src/Sherlog.Formatters/{src => }/ColorCodeFormatter.cs (100%) rename src/Sherlog.Formatters/{src => }/LogFormatter.cs (100%) rename src/Sherlog.Formatters/{src => }/LogMessageFormatter.cs (100%) rename src/Sherlog.Formatters/{src => }/Sherlog.Formatters.csproj (76%) rename src/Sherlog.Formatters/{src => }/TimestampFormatter.cs (100%) rename src/Sherlog/{src => }/LogLevel.cs (100%) rename src/Sherlog/{src => }/Logger.cs (100%) rename src/Sherlog/{src => }/LoggerStatic.cs (100%) rename src/Sherlog/{src => }/Sherlog.csproj (100%) rename {src/Sherlog.Formatters/tests => tests/Sherlog.Formatters}/LogMessageFormatterTests.cs (100%) rename {src/Sherlog.Formatters/tests => tests/Sherlog.Formatters}/Sherlog.Formatters.Tests.csproj (84%) rename {src/Sherlog/tests => tests/Sherlog}/LoggerTests.cs (100%) rename {src/Sherlog/tests => tests/Sherlog}/Sherlog.Tests.csproj (91%) rename {src/Sherlog/tests => tests/Sherlog}/SherlogTests.cs (100%) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 542d9df..960b748 100644 --- 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 b/Directory.Build.props similarity index 100% rename from src/Directory.Build.props rename to Directory.Build.props diff --git a/src/Directory.Build.targets b/Directory.Build.targets similarity index 100% rename from src/Directory.Build.targets rename to Directory.Build.targets diff --git a/Sherlog.sln b/Sherlog.sln index 799b209..96bf6b7 100644 --- 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 index 1155c40..4079d31 100644 --- a/samples/SherlogSamples/SherlogSamples.csproj +++ b/samples/SherlogSamples/SherlogSamples.csproj @@ -9,9 +9,9 @@ - - - + + + diff --git a/samples/SherlogServer/SherlogServer.csproj b/samples/SherlogServer/SherlogServer.csproj index 78a9432..991c965 100644 --- a/samples/SherlogServer/SherlogServer.csproj +++ b/samples/SherlogServer/SherlogServer.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/Sherlog.Appenders/src/AbstractTcpSocketAppender.cs b/src/Sherlog.Appenders/AbstractTcpSocketAppender.cs similarity index 100% rename from src/Sherlog.Appenders/src/AbstractTcpSocketAppender.cs rename to src/Sherlog.Appenders/AbstractTcpSocketAppender.cs diff --git a/src/Sherlog.Appenders/src/ConsoleAppender.cs b/src/Sherlog.Appenders/ConsoleAppender.cs similarity index 100% rename from src/Sherlog.Appenders/src/ConsoleAppender.cs rename to src/Sherlog.Appenders/ConsoleAppender.cs diff --git a/src/Sherlog.Appenders/src/FileWriterAppender.cs b/src/Sherlog.Appenders/FileWriterAppender.cs similarity index 100% rename from src/Sherlog.Appenders/src/FileWriterAppender.cs rename to src/Sherlog.Appenders/FileWriterAppender.cs diff --git a/src/Sherlog.Appenders/src/Sherlog.Appenders.csproj b/src/Sherlog.Appenders/Sherlog.Appenders.csproj similarity index 82% rename from src/Sherlog.Appenders/src/Sherlog.Appenders.csproj rename to src/Sherlog.Appenders/Sherlog.Appenders.csproj index 7b6e7c1..dd96dda 100644 --- a/src/Sherlog.Appenders/src/Sherlog.Appenders.csproj +++ b/src/Sherlog.Appenders/Sherlog.Appenders.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Sherlog.Appenders/src/SosMaxAppender.cs b/src/Sherlog.Appenders/SosMaxAppender.cs similarity index 100% rename from src/Sherlog.Appenders/src/SosMaxAppender.cs rename to src/Sherlog.Appenders/SosMaxAppender.cs diff --git a/src/Sherlog.Appenders/src/TcpSocketAppender.cs b/src/Sherlog.Appenders/TcpSocketAppender.cs similarity index 100% rename from src/Sherlog.Appenders/src/TcpSocketAppender.cs rename to src/Sherlog.Appenders/TcpSocketAppender.cs diff --git a/src/Sherlog.Formatters/src/ColorCodeFormatter.cs b/src/Sherlog.Formatters/ColorCodeFormatter.cs similarity index 100% rename from src/Sherlog.Formatters/src/ColorCodeFormatter.cs rename to src/Sherlog.Formatters/ColorCodeFormatter.cs diff --git a/src/Sherlog.Formatters/src/LogFormatter.cs b/src/Sherlog.Formatters/LogFormatter.cs similarity index 100% rename from src/Sherlog.Formatters/src/LogFormatter.cs rename to src/Sherlog.Formatters/LogFormatter.cs diff --git a/src/Sherlog.Formatters/src/LogMessageFormatter.cs b/src/Sherlog.Formatters/LogMessageFormatter.cs similarity index 100% rename from src/Sherlog.Formatters/src/LogMessageFormatter.cs rename to src/Sherlog.Formatters/LogMessageFormatter.cs diff --git a/src/Sherlog.Formatters/src/Sherlog.Formatters.csproj b/src/Sherlog.Formatters/Sherlog.Formatters.csproj similarity index 76% rename from src/Sherlog.Formatters/src/Sherlog.Formatters.csproj rename to src/Sherlog.Formatters/Sherlog.Formatters.csproj index 93f900d..a66863f 100644 --- a/src/Sherlog.Formatters/src/Sherlog.Formatters.csproj +++ b/src/Sherlog.Formatters/Sherlog.Formatters.csproj @@ -6,7 +6,7 @@ - + diff --git a/src/Sherlog.Formatters/src/TimestampFormatter.cs b/src/Sherlog.Formatters/TimestampFormatter.cs similarity index 100% rename from src/Sherlog.Formatters/src/TimestampFormatter.cs rename to src/Sherlog.Formatters/TimestampFormatter.cs diff --git a/src/Sherlog/src/LogLevel.cs b/src/Sherlog/LogLevel.cs similarity index 100% rename from src/Sherlog/src/LogLevel.cs rename to src/Sherlog/LogLevel.cs diff --git a/src/Sherlog/src/Logger.cs b/src/Sherlog/Logger.cs similarity index 100% rename from src/Sherlog/src/Logger.cs rename to src/Sherlog/Logger.cs diff --git a/src/Sherlog/src/LoggerStatic.cs b/src/Sherlog/LoggerStatic.cs similarity index 100% rename from src/Sherlog/src/LoggerStatic.cs rename to src/Sherlog/LoggerStatic.cs diff --git a/src/Sherlog/src/Sherlog.csproj b/src/Sherlog/Sherlog.csproj similarity index 100% rename from src/Sherlog/src/Sherlog.csproj rename to src/Sherlog/Sherlog.csproj diff --git a/src/Sherlog.Formatters/tests/LogMessageFormatterTests.cs b/tests/Sherlog.Formatters/LogMessageFormatterTests.cs similarity index 100% rename from src/Sherlog.Formatters/tests/LogMessageFormatterTests.cs rename to tests/Sherlog.Formatters/LogMessageFormatterTests.cs diff --git a/src/Sherlog.Formatters/tests/Sherlog.Formatters.Tests.csproj b/tests/Sherlog.Formatters/Sherlog.Formatters.Tests.csproj similarity index 84% rename from src/Sherlog.Formatters/tests/Sherlog.Formatters.Tests.csproj rename to tests/Sherlog.Formatters/Sherlog.Formatters.Tests.csproj index 6d4d75c..6fd0e24 100644 --- a/src/Sherlog.Formatters/tests/Sherlog.Formatters.Tests.csproj +++ b/tests/Sherlog.Formatters/Sherlog.Formatters.Tests.csproj @@ -16,8 +16,7 @@ - - + diff --git a/src/Sherlog/tests/LoggerTests.cs b/tests/Sherlog/LoggerTests.cs similarity index 100% rename from src/Sherlog/tests/LoggerTests.cs rename to tests/Sherlog/LoggerTests.cs diff --git a/src/Sherlog/tests/Sherlog.Tests.csproj b/tests/Sherlog/Sherlog.Tests.csproj similarity index 91% rename from src/Sherlog/tests/Sherlog.Tests.csproj rename to tests/Sherlog/Sherlog.Tests.csproj index c4a17cf..b8ac078 100644 --- a/src/Sherlog/tests/Sherlog.Tests.csproj +++ b/tests/Sherlog/Sherlog.Tests.csproj @@ -16,7 +16,7 @@ - + diff --git a/src/Sherlog/tests/SherlogTests.cs b/tests/Sherlog/SherlogTests.cs similarity index 100% rename from src/Sherlog/tests/SherlogTests.cs rename to tests/Sherlog/SherlogTests.cs