From 7187a95ebf5f90b10001eeff8654ae2e38d75f84 Mon Sep 17 00:00:00 2001 From: Bruno Massa Date: Tue, 14 May 2024 13:35:41 -0500 Subject: [PATCH 1/2] refactor: rename the test folder back to "test" --- .nuke/Build.Compile.cs | 15 ++--- .nuke/Build.Container.cs | 16 +++-- .nuke/Build.GitLab.cs | 22 ++++--- .nuke/Build.Publish.cs | 33 +++++------ .nuke/Build.Solution.cs | 4 +- .nuke/Build.Test.cs | 42 ++++++-------- .nuke/Build.Version.cs | 4 +- .nuke/Build.cs | 4 +- .nuke/Configuration.cs | 6 +- SuCoS.sln | 2 +- source/AssemblyInfo.cs | 2 +- .../.TestSites/01/content/categories.md | 0 .../.TestSites/01/content/date-future.md | 0 .../.TestSites/01/content/date-ok.md | 0 .../.TestSites/01/content/expired.md | 0 .../01/content/publishdate-future.md | 0 .../.TestSites/01/content/publishdate-ok.md | 0 .../.TestSites/01/content/test01.md | 0 {Tests => test}/.TestSites/01/sucos.yaml | 0 .../.TestSites/02-have-index/content/alias.md | 0 .../02-have-index/content/categories.md | 0 .../02-have-index/content/date-future.md | 0 .../02-have-index/content/date-ok.md | 0 .../02-have-index/content/expired.md | 0 .../.TestSites/02-have-index/content/index.md | 0 .../content/publishdate-future.md | 0 .../02-have-index/content/publishdate-ok.md | 0 .../02-have-index/content/test01.md | 0 .../.TestSites/02-have-index/sucos.yaml | 0 .../03-section/content/blog/alias.md | 0 .../03-section/content/blog/categories.md | 0 .../03-section/content/blog/date-future.md | 0 .../03-section/content/blog/date-ok.md | 0 .../03-section/content/blog/expired.md | 0 .../content/blog/publishdate-future.md | 0 .../03-section/content/blog/publishdate-ok.md | 0 .../03-section/content/blog/test01.md | 0 .../content/blog/weight-negative-1.md | 0 .../content/blog/weight-negative-100.md | 0 .../content/blog/weight-positive-1.md | 0 .../content/blog/weight-positive-100.md | 0 .../.TestSites/03-section/sucos.yaml | 0 .../04-tags/content/blog/categories.md | 0 .../04-tags/content/blog/date-future.md | 0 .../04-tags/content/blog/date-ok.md | 0 .../04-tags/content/blog/expired.md | 0 .../content/blog/publishdate-future.md | 0 .../04-tags/content/blog/publishdate-ok.md | 0 .../04-tags/content/blog/subsection/alias.md | 0 .../04-tags/content/blog/tags-01.md | 0 .../04-tags/content/blog/tags-02.md | 0 .../04-tags/content/blog/tags-03.md | 0 .../04-tags/content/blog/tags-04.md | 0 .../04-tags/content/blog/tags-05.md | 0 .../04-tags/content/blog/tags-06.md | 0 .../04-tags/content/blog/tags-07.md | 0 .../04-tags/content/blog/tags-08.md | 0 .../04-tags/content/blog/tags-09.md | 0 .../04-tags/content/blog/tags-10.md | 0 .../.TestSites/04-tags/content/blog/test01.md | 0 .../04-tags/content/blog/weight-negative-1.md | 0 .../content/blog/weight-negative-100.md | 0 .../04-tags/content/blog/weight-positive-1.md | 0 .../content/blog/weight-positive-100.md | 0 .../.TestSites/04-tags/content/index.md | 0 {Tests => test}/.TestSites/04-tags/sucos.yaml | 0 .../05-theme-no-baseof/content/blog/alias.md | 0 .../content/blog/categories.md | 0 .../content/blog/date-future.md | 0 .../content/blog/date-ok.md | 0 .../content/blog/expired.md | 0 .../content/blog/publishdate-future.md | 0 .../content/blog/publishdate-ok.md | 0 .../content/blog/tags-01.md | 0 .../content/blog/tags-02.md | 0 .../05-theme-no-baseof/content/blog/test01.md | 0 .../content/blog/weight-negative-1.md | 0 .../content/blog/weight-negative-100.md | 0 .../content/blog/weight-positive-1.md | 0 .../content/blog/weight-positive-100.md | 0 .../05-theme-no-baseof/content/index.md | 0 .../.TestSites/05-theme-no-baseof/index.md | 0 .../.TestSites/05-theme-no-baseof/sucos.yaml | 0 .../themes/test/_default/index.liquid | 0 .../themes/test/_default/list.liquid | 0 .../themes/test/_default/single.liquid | 0 .../.TestSites/06-theme/content/blog/alias.md | 0 .../06-theme/content/blog/categories.md | 0 .../06-theme/content/blog/date-future.md | 0 .../06-theme/content/blog/date-ok.md | 0 .../06-theme/content/blog/expired.md | 0 .../content/blog/publishdate-future.md | 0 .../06-theme/content/blog/publishdate-ok.md | 0 .../06-theme/content/blog/tags-01.md | 0 .../06-theme/content/blog/tags-02.md | 0 .../06-theme/content/blog/test01.md | 0 .../content/blog/weight-negative-1.md | 0 .../content/blog/weight-negative-100.md | 0 .../content/blog/weight-positive-1.md | 0 .../content/blog/weight-positive-100.md | 0 .../.TestSites/06-theme/content/index.md | 0 {Tests => test}/.TestSites/06-theme/index.md | 0 .../.TestSites/06-theme/sucos.yaml | 0 .../themes/test/_default/baseof.liquid | 0 .../themes/test/_default/index.liquid | 0 .../06-theme/themes/test/_default/list.liquid | 0 .../themes/test/_default/single.liquid | 0 .../content/blog/alias.md | 0 .../content/blog/categories.md | 0 .../content/blog/date-future.md | 0 .../content/blog/date-ok.md | 0 .../content/blog/expired.md | 0 .../content/blog/publishdate-future.md | 0 .../content/blog/publishdate-ok.md | 0 .../content/blog/tags-01.md | 0 .../content/blog/tags-02.md | 0 .../content/blog/test01.md | 0 .../content/blog/weight-negative-1.md | 0 .../content/blog/weight-negative-100.md | 0 .../content/blog/weight-positive-1.md | 0 .../content/blog/weight-positive-100.md | 0 .../07-theme-no-baseof-error/content/index.md | 0 .../07-theme-no-baseof-error/index.md | 0 .../07-theme-no-baseof-error/sucos.yaml | 0 .../themes/test/_default/index.liquid | 0 .../themes/test/_default/list.liquid | 0 .../themes/test/_default/single.liquid | 0 .../08-theme-html/content/blog/alias.md | 0 .../08-theme-html/content/blog/categories.md | 0 .../08-theme-html/content/blog/date-future.md | 0 .../08-theme-html/content/blog/date-ok.md | 0 .../08-theme-html/content/blog/expired.md | 0 .../content/blog/publishdate-future.md | 0 .../content/blog/publishdate-ok.md | 0 .../08-theme-html/content/blog/tags-01.md | 0 .../08-theme-html/content/blog/tags-02.md | 0 .../08-theme-html/content/blog/test01.md | 0 .../content/blog/weight-negative-1.md | 0 .../content/blog/weight-negative-100.md | 0 .../content/blog/weight-positive-1.md | 0 .../content/blog/weight-positive-100.md | 0 .../.TestSites/08-theme-html/content/index.md | 0 .../.TestSites/08-theme-html/index.md | 0 .../.TestSites/08-theme-html/sucos.yaml | 0 .../themes/test/_default/baseof.liquid | 0 .../themes/test/_default/index.liquid | 0 .../themes/test/_default/list.liquid | 0 .../themes/test/_default/single.liquid | 0 .../Commands/BaseGeneratorCommandTests.cs | 8 +-- {Tests => test}/Commands/BuildCommandTests.cs | 6 +- .../Commands/NewSiteCommandTests.cs | 8 +-- .../Helpers/StopwatchReporterTests.cs | 9 ++- {Tests => test}/Helpers/UrlizerTests.cs | 2 +- {Tests => test}/Models/FrontMatterTests.cs | 2 +- {Tests => test}/Models/PageTests.cs | 2 +- {Tests => test}/Models/SiteTests.cs | 2 +- {Tests => test}/Parser/YAMLParserTests.cs | 2 +- {Tests => test}/ProgramTest.cs | 2 +- .../ServerHandlers/PingRequestHandlerTests.cs | 2 +- .../RegisteredPageRequestHandlerTests.cs | 2 +- .../StaticFileRequestHandlerTests.cs | 2 +- {Tests => test}/TestSetup.cs | 8 +-- Tests/Tests.csproj => test/test.csproj | 58 +++++++++---------- 163 files changed, 120 insertions(+), 145 deletions(-) rename {Tests => test}/.TestSites/01/content/categories.md (100%) rename {Tests => test}/.TestSites/01/content/date-future.md (100%) rename {Tests => test}/.TestSites/01/content/date-ok.md (100%) rename {Tests => test}/.TestSites/01/content/expired.md (100%) rename {Tests => test}/.TestSites/01/content/publishdate-future.md (100%) rename {Tests => test}/.TestSites/01/content/publishdate-ok.md (100%) rename {Tests => test}/.TestSites/01/content/test01.md (100%) rename {Tests => test}/.TestSites/01/sucos.yaml (100%) rename {Tests => test}/.TestSites/02-have-index/content/alias.md (100%) rename {Tests => test}/.TestSites/02-have-index/content/categories.md (100%) rename {Tests => test}/.TestSites/02-have-index/content/date-future.md (100%) rename {Tests => test}/.TestSites/02-have-index/content/date-ok.md (100%) rename {Tests => test}/.TestSites/02-have-index/content/expired.md (100%) rename {Tests => test}/.TestSites/02-have-index/content/index.md (100%) rename {Tests => test}/.TestSites/02-have-index/content/publishdate-future.md (100%) rename {Tests => test}/.TestSites/02-have-index/content/publishdate-ok.md (100%) rename {Tests => test}/.TestSites/02-have-index/content/test01.md (100%) rename {Tests => test}/.TestSites/02-have-index/sucos.yaml (100%) rename {Tests => test}/.TestSites/03-section/content/blog/alias.md (100%) rename {Tests => test}/.TestSites/03-section/content/blog/categories.md (100%) rename {Tests => test}/.TestSites/03-section/content/blog/date-future.md (100%) rename {Tests => test}/.TestSites/03-section/content/blog/date-ok.md (100%) rename {Tests => test}/.TestSites/03-section/content/blog/expired.md (100%) rename {Tests => test}/.TestSites/03-section/content/blog/publishdate-future.md (100%) rename {Tests => test}/.TestSites/03-section/content/blog/publishdate-ok.md (100%) rename {Tests => test}/.TestSites/03-section/content/blog/test01.md (100%) rename {Tests => test}/.TestSites/03-section/content/blog/weight-negative-1.md (100%) rename {Tests => test}/.TestSites/03-section/content/blog/weight-negative-100.md (100%) rename {Tests => test}/.TestSites/03-section/content/blog/weight-positive-1.md (100%) rename {Tests => test}/.TestSites/03-section/content/blog/weight-positive-100.md (100%) rename {Tests => test}/.TestSites/03-section/sucos.yaml (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/categories.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/date-future.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/date-ok.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/expired.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/publishdate-future.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/publishdate-ok.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/subsection/alias.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/tags-01.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/tags-02.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/tags-03.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/tags-04.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/tags-05.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/tags-06.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/tags-07.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/tags-08.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/tags-09.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/tags-10.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/test01.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/weight-negative-1.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/weight-negative-100.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/weight-positive-1.md (100%) rename {Tests => test}/.TestSites/04-tags/content/blog/weight-positive-100.md (100%) rename {Tests => test}/.TestSites/04-tags/content/index.md (100%) rename {Tests => test}/.TestSites/04-tags/sucos.yaml (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/alias.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/categories.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/date-future.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/date-ok.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/expired.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/publishdate-future.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/publishdate-ok.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/tags-01.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/tags-02.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/test01.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/weight-negative-1.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/weight-negative-100.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/weight-positive-1.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/blog/weight-positive-100.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/content/index.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/index.md (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/sucos.yaml (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/themes/test/_default/index.liquid (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/themes/test/_default/list.liquid (100%) rename {Tests => test}/.TestSites/05-theme-no-baseof/themes/test/_default/single.liquid (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/alias.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/categories.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/date-future.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/date-ok.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/expired.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/publishdate-future.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/publishdate-ok.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/tags-01.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/tags-02.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/test01.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/weight-negative-1.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/weight-negative-100.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/weight-positive-1.md (100%) rename {Tests => test}/.TestSites/06-theme/content/blog/weight-positive-100.md (100%) rename {Tests => test}/.TestSites/06-theme/content/index.md (100%) rename {Tests => test}/.TestSites/06-theme/index.md (100%) rename {Tests => test}/.TestSites/06-theme/sucos.yaml (100%) rename {Tests => test}/.TestSites/06-theme/themes/test/_default/baseof.liquid (100%) rename {Tests => test}/.TestSites/06-theme/themes/test/_default/index.liquid (100%) rename {Tests => test}/.TestSites/06-theme/themes/test/_default/list.liquid (100%) rename {Tests => test}/.TestSites/06-theme/themes/test/_default/single.liquid (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/alias.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/categories.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/date-future.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/date-ok.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/expired.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-future.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-ok.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/tags-01.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/tags-02.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/test01.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-1.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-100.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-1.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-100.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/content/index.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/index.md (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/sucos.yaml (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/themes/test/_default/index.liquid (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/themes/test/_default/list.liquid (100%) rename {Tests => test}/.TestSites/07-theme-no-baseof-error/themes/test/_default/single.liquid (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/alias.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/categories.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/date-future.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/date-ok.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/expired.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/publishdate-future.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/publishdate-ok.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/tags-01.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/tags-02.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/test01.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/weight-negative-1.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/weight-negative-100.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/weight-positive-1.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/blog/weight-positive-100.md (100%) rename {Tests => test}/.TestSites/08-theme-html/content/index.md (100%) rename {Tests => test}/.TestSites/08-theme-html/index.md (100%) rename {Tests => test}/.TestSites/08-theme-html/sucos.yaml (100%) rename {Tests => test}/.TestSites/08-theme-html/themes/test/_default/baseof.liquid (100%) rename {Tests => test}/.TestSites/08-theme-html/themes/test/_default/index.liquid (100%) rename {Tests => test}/.TestSites/08-theme-html/themes/test/_default/list.liquid (100%) rename {Tests => test}/.TestSites/08-theme-html/themes/test/_default/single.liquid (100%) rename {Tests => test}/Commands/BaseGeneratorCommandTests.cs (98%) rename {Tests => test}/Commands/BuildCommandTests.cs (99%) rename {Tests => test}/Commands/NewSiteCommandTests.cs (99%) rename {Tests => test}/Helpers/StopwatchReporterTests.cs (99%) rename {Tests => test}/Helpers/UrlizerTests.cs (99%) rename {Tests => test}/Models/FrontMatterTests.cs (99%) rename {Tests => test}/Models/PageTests.cs (99%) rename {Tests => test}/Models/SiteTests.cs (99%) rename {Tests => test}/Parser/YAMLParserTests.cs (99%) rename {Tests => test}/ProgramTest.cs (96%) rename {Tests => test}/ServerHandlers/PingRequestHandlerTests.cs (97%) rename {Tests => test}/ServerHandlers/RegisteredPageRequestHandlerTests.cs (98%) rename {Tests => test}/ServerHandlers/StaticFileRequestHandlerTests.cs (98%) rename {Tests => test}/TestSetup.cs (95%) rename Tests/Tests.csproj => test/test.csproj (97%) diff --git a/.nuke/Build.Compile.cs b/.nuke/Build.Compile.cs index a17d533..9944cf7 100644 --- a/.nuke/Build.Compile.cs +++ b/.nuke/Build.Compile.cs @@ -3,9 +3,6 @@ using Nuke.Common.IO; using Nuke.Common.Tools.DotNet; using Nuke.Common.Utilities.Collections; using Serilog; -using static Nuke.Common.Tools.DotNet.DotNetTasks; - -namespace SuCoS.Nuke; /// /// This is the main build file for the project. @@ -30,8 +27,8 @@ sealed partial class Build : NukeBuild .After(Clean) .Executes(() => { - _ = DotNetRestore(s => s - .SetProjectFile(solution)); + _ = DotNetTasks.DotNetRestore(s => DotNetRestoreSettingsExtensions + .SetProjectFile(s, solution)); }); Target Compile => td => td @@ -40,11 +37,11 @@ sealed partial class Build : NukeBuild { Log.Debug("Configuration {Configuration}", configurationSet); Log.Debug("configuration {configuration}", configuration); - _ = DotNetBuild(s => s - .SetNoLogo(true) + _ = DotNetTasks.DotNetBuild(s => DotNetBuildSettingsExtensions + .SetNoLogo(s, true) .SetProjectFile(solution) .SetConfiguration(configurationSet) .EnableNoRestore() - ); + ); }); -} +} \ No newline at end of file diff --git a/.nuke/Build.Container.cs b/.nuke/Build.Container.cs index 35b795e..401ac17 100644 --- a/.nuke/Build.Container.cs +++ b/.nuke/Build.Container.cs @@ -1,12 +1,10 @@ +using System; +using System.Collections.Generic; +using System.Linq; using Nuke.Common; using Nuke.Common.Tooling; using Nuke.Common.Tools.Docker; using Serilog; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace SuCoS.Nuke; /// /// This is the main build file for the project. @@ -50,7 +48,7 @@ sealed partial class Build : NukeBuild Log.Debug(output); } }) - ); + ); }); string BaseImage => runtimeIdentifier switch @@ -83,8 +81,8 @@ sealed partial class Build : NukeBuild } var tags = tagsOriginal.Select(tag => string.IsNullOrEmpty(tag) - ? $"{ContainerRuntimeIdentifier.Item1}" - : $"{ContainerRuntimeIdentifier.Item1}-{tag}").ToList(); + ? $"{ContainerRuntimeIdentifier.Item1}" + : $"{ContainerRuntimeIdentifier.Item1}-{tag}").ToList(); if (containerDefaultRID == runtimeIdentifier) { tags.AddRange(tagsOriginal); @@ -92,4 +90,4 @@ sealed partial class Build : NukeBuild return tags; } -} +} \ No newline at end of file diff --git a/.nuke/Build.GitLab.cs b/.nuke/Build.GitLab.cs index 7551972..0dd88e6 100644 --- a/.nuke/Build.GitLab.cs +++ b/.nuke/Build.GitLab.cs @@ -1,9 +1,3 @@ -using Nuke.Common; -using Nuke.Common.CI.GitLab; -using Nuke.Common.IO; -using Nuke.Common.Tools.Docker; -using Nuke.Common.Tools.Git; -using Serilog; using System; using System.Globalization; using System.IO; @@ -11,8 +5,12 @@ using System.IO.Compression; using System.Net.Http; using System.Net.Http.Json; using System.Threading.Tasks; - -namespace SuCoS.Nuke; +using Nuke.Common; +using Nuke.Common.CI.GitLab; +using Nuke.Common.IO; +using Nuke.Common.Tools.Docker; +using Nuke.Common.Tools.Git; +using Serilog; /// /// This is the main build file for the project. @@ -69,7 +67,7 @@ sealed partial class Build : NukeBuild filter: x => !x.HasExtension("pdb", "xml"), compressionLevel: CompressionLevel.Optimal, fileMode: FileMode.Create // overwrite if exists - ); + ); } catch (Exception ex) { @@ -174,14 +172,14 @@ sealed partial class Build : NukeBuild .SetServer("registry.gitlab.com") .SetUsername("gitlab-ci-token") .SetPassword(GitLab.JobToken) - ); + ); // Push the container images foreach (var tag in tags) { _ = DockerTasks.DockerPush(_ => _ .SetName($"{ContainerRegistryImage}:{tag}") - ); + ); // Create a link to the GitLab release var tagLink = GitLabAPIUrl($"?orderBy=NAME&sort=asc&search[]={tag}"); @@ -239,4 +237,4 @@ sealed partial class Build : NukeBuild throw; } } -} +} \ No newline at end of file diff --git a/.nuke/Build.Publish.cs b/.nuke/Build.Publish.cs index daa7b85..12a71be 100644 --- a/.nuke/Build.Publish.cs +++ b/.nuke/Build.Publish.cs @@ -1,9 +1,6 @@ using Nuke.Common; using Nuke.Common.IO; using Nuke.Common.Tools.DotNet; -using static Nuke.Common.Tools.DotNet.DotNetTasks; - -namespace SuCoS.Nuke; /// /// This is the main build file for the project. @@ -34,19 +31,19 @@ sealed partial class Build : NukeBuild .After(Restore) .Executes(() => { - _ = DotNetPublish(s => s - .SetNoLogo(true) - .SetProject("source/SuCoS.csproj") - .SetConfiguration(configurationSet) - .SetOutput(PublishDirectory) - .SetRuntime(runtimeIdentifier) - .SetSelfContained(publishSelfContained) - .SetPublishSingleFile(publishSingleFile) - .SetPublishTrimmed(publishTrimmed) - .SetPublishReadyToRun(publishReadyToRun) - .SetVersion(CurrentVersion) - .SetAssemblyVersion(CurrentVersion) - .SetInformationalVersion(CurrentVersion) - ); + _ = DotNetTasks.DotNetPublish(s => DotNetPublishSettingsExtensions + .SetNoLogo(s, true) + .SetProject("source/SuCoS.csproj") + .SetConfiguration(configurationSet) + .SetOutput(PublishDirectory) + .SetRuntime(runtimeIdentifier) + .SetSelfContained(publishSelfContained) + .SetPublishSingleFile(publishSingleFile) + .SetPublishTrimmed(publishTrimmed) + .SetPublishReadyToRun(publishReadyToRun) + .SetVersion(CurrentVersion) + .SetAssemblyVersion(CurrentVersion) + .SetInformationalVersion(CurrentVersion) + ); }); -} +} \ No newline at end of file diff --git a/.nuke/Build.Solution.cs b/.nuke/Build.Solution.cs index c6a8090..17c3193 100644 --- a/.nuke/Build.Solution.cs +++ b/.nuke/Build.Solution.cs @@ -2,8 +2,6 @@ using Nuke.Common; using Nuke.Common.IO; using Nuke.Common.ProjectModel; -namespace SuCoS.Nuke; - /// /// This is the main build file for the project. /// This partial is responsible for the solution-wide variables. @@ -18,4 +16,4 @@ sealed partial class Build : NukeBuild readonly Solution solution; static AbsolutePath sourceDirectory => RootDirectory / "source"; -} +} \ No newline at end of file diff --git a/.nuke/Build.Test.cs b/.nuke/Build.Test.cs index 6570230..fb23f5d 100644 --- a/.nuke/Build.Test.cs +++ b/.nuke/Build.Test.cs @@ -1,15 +1,9 @@ +using System; using Nuke.Common; using Nuke.Common.IO; using Nuke.Common.Tools.Coverlet; -using Nuke.Common.Tools.DotNet; -using Nuke.Common.Tools.OpenCover; using Nuke.Common.Tools.ReportGenerator; using Serilog; -using System; -using static Nuke.Common.Tools.Coverlet.CoverletTasks; -using static Nuke.Common.Tools.ReportGenerator.ReportGeneratorTasks; - -namespace SuCoS.Nuke; /// /// This is the main build file for the project. @@ -17,9 +11,9 @@ namespace SuCoS.Nuke; /// sealed partial class Build : NukeBuild { - static AbsolutePath testDirectory => RootDirectory / "Tests"; + static AbsolutePath testDirectory => RootDirectory / "test"; static AbsolutePath testDLLDirectory => testDirectory / "bin" / "Debug" / "net8.0"; - static AbsolutePath testAssembly => testDLLDirectory / "Tests.dll"; + static AbsolutePath testAssembly => testDLLDirectory / "test.dll"; static AbsolutePath coverageDirectory => RootDirectory / "coverage-results"; static AbsolutePath coverageResultDirectory => coverageDirectory / "coverage"; static AbsolutePath coverageResultFile => coverageResultDirectory / "coverage.xml"; @@ -31,15 +25,15 @@ sealed partial class Build : NukeBuild .Executes(() => { _ = coverageResultDirectory.CreateDirectory(); - _ = Coverlet(s => s - .SetTarget("dotnet") - .SetTargetArgs("test --no-build --no-restore") - .SetAssembly(testAssembly) - // .SetThreshold(75) - .SetOutput(coverageResultFile) - .SetFormat(CoverletOutputFormat.cobertura) - .SetExcludeByFile(["**/*.g.cs"]) // Exclude source generated files - ); + _ = CoverletTasks.Coverlet(s => CoverletSettingsExtensions + .SetTarget(s, "dotnet") + .SetTargetArgs("test --no-build --no-restore") + .SetAssembly(testAssembly) + // .SetThreshold(75) + .SetOutput(coverageResultFile) + .SetFormat(CoverletOutputFormat.cobertura) + .SetExcludeByFile(["**/*.g.cs"]) // Exclude source generated files + ); }); public Target TestReport => td => td @@ -47,12 +41,12 @@ sealed partial class Build : NukeBuild .Executes(() => { _ = coverageReportDirectory.CreateDirectory(); - _ = ReportGenerator(s => s - .SetTargetDirectory(coverageReportDirectory) - .SetReportTypes([ReportTypes.Html, ReportTypes.TextSummary]) - .SetReports(coverageResultFile) - ); + _ = ReportGeneratorTasks.ReportGenerator(s => ReportGeneratorSettingsExtensions + .SetTargetDirectory(s, coverageReportDirectory) + .SetReportTypes([ReportTypes.Html, ReportTypes.TextSummary]) + .SetReports(coverageResultFile) + ); var summaryText = coverageReportSummaryDirectory.ReadAllLines(); Log.Information(string.Join(Environment.NewLine, summaryText)); }); -} +} \ No newline at end of file diff --git a/.nuke/Build.Version.cs b/.nuke/Build.Version.cs index 521e76c..da598b7 100644 --- a/.nuke/Build.Version.cs +++ b/.nuke/Build.Version.cs @@ -1,10 +1,8 @@ +using System.Linq; using Nuke.Common; using Nuke.Common.Tools.Git; using Nuke.Common.Tools.GitVersion; using Serilog; -using System.Linq; - -namespace SuCoS.Nuke; /// /// This is the main build file for the project. diff --git a/.nuke/Build.cs b/.nuke/Build.cs index a7e1ec2..2f5973e 100644 --- a/.nuke/Build.cs +++ b/.nuke/Build.cs @@ -1,8 +1,6 @@ using Nuke.Common; using Nuke.Common.CI; -namespace SuCoS.Nuke; - /// /// This is the main build file for the project. /// @@ -10,4 +8,4 @@ namespace SuCoS.Nuke; sealed partial class Build : NukeBuild { static int Main() => Execute(x => x.Compile); -} +} \ No newline at end of file diff --git a/.nuke/Configuration.cs b/.nuke/Configuration.cs index 5253daa..d7d456d 100644 --- a/.nuke/Configuration.cs +++ b/.nuke/Configuration.cs @@ -1,7 +1,5 @@ -using Nuke.Common.Tooling; using System.ComponentModel; - -namespace SuCoS.Nuke; +using Nuke.Common.Tooling; [TypeConverter(typeof(TypeConverter))] public class Configuration : Enumeration @@ -10,4 +8,4 @@ public class Configuration : Enumeration public static Configuration Release { get; set; } = new() { Value = nameof(Release) }; public static implicit operator string(Configuration configuration) => configuration?.Value; -} +} \ No newline at end of file diff --git a/SuCoS.sln b/SuCoS.sln index 49c59b3..0974c4c 100644 --- a/SuCoS.sln +++ b/SuCoS.sln @@ -9,7 +9,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SuCoS", "source\SuCoS.cspro EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_nuke", ".nuke\_nuke.csproj", "{26DB04F6-DA88-43D7-8F4B-535D4D68C24E}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Tests", "Tests\Tests.csproj", "{F3D789FD-6AC5-4A45-B9AC-079035F5909C}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "test\test.csproj", "{F3D789FD-6AC5-4A45-B9AC-079035F5909C}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/source/AssemblyInfo.cs b/source/AssemblyInfo.cs index 9ead8d2..52f99c7 100644 --- a/source/AssemblyInfo.cs +++ b/source/AssemblyInfo.cs @@ -1,3 +1,3 @@ using System.Runtime.CompilerServices; -[assembly: InternalsVisibleTo("Tests")] +[assembly: InternalsVisibleTo("test")] diff --git a/Tests/.TestSites/01/content/categories.md b/test/.TestSites/01/content/categories.md similarity index 100% rename from Tests/.TestSites/01/content/categories.md rename to test/.TestSites/01/content/categories.md diff --git a/Tests/.TestSites/01/content/date-future.md b/test/.TestSites/01/content/date-future.md similarity index 100% rename from Tests/.TestSites/01/content/date-future.md rename to test/.TestSites/01/content/date-future.md diff --git a/Tests/.TestSites/01/content/date-ok.md b/test/.TestSites/01/content/date-ok.md similarity index 100% rename from Tests/.TestSites/01/content/date-ok.md rename to test/.TestSites/01/content/date-ok.md diff --git a/Tests/.TestSites/01/content/expired.md b/test/.TestSites/01/content/expired.md similarity index 100% rename from Tests/.TestSites/01/content/expired.md rename to test/.TestSites/01/content/expired.md diff --git a/Tests/.TestSites/01/content/publishdate-future.md b/test/.TestSites/01/content/publishdate-future.md similarity index 100% rename from Tests/.TestSites/01/content/publishdate-future.md rename to test/.TestSites/01/content/publishdate-future.md diff --git a/Tests/.TestSites/01/content/publishdate-ok.md b/test/.TestSites/01/content/publishdate-ok.md similarity index 100% rename from Tests/.TestSites/01/content/publishdate-ok.md rename to test/.TestSites/01/content/publishdate-ok.md diff --git a/Tests/.TestSites/01/content/test01.md b/test/.TestSites/01/content/test01.md similarity index 100% rename from Tests/.TestSites/01/content/test01.md rename to test/.TestSites/01/content/test01.md diff --git a/Tests/.TestSites/01/sucos.yaml b/test/.TestSites/01/sucos.yaml similarity index 100% rename from Tests/.TestSites/01/sucos.yaml rename to test/.TestSites/01/sucos.yaml diff --git a/Tests/.TestSites/02-have-index/content/alias.md b/test/.TestSites/02-have-index/content/alias.md similarity index 100% rename from Tests/.TestSites/02-have-index/content/alias.md rename to test/.TestSites/02-have-index/content/alias.md diff --git a/Tests/.TestSites/02-have-index/content/categories.md b/test/.TestSites/02-have-index/content/categories.md similarity index 100% rename from Tests/.TestSites/02-have-index/content/categories.md rename to test/.TestSites/02-have-index/content/categories.md diff --git a/Tests/.TestSites/02-have-index/content/date-future.md b/test/.TestSites/02-have-index/content/date-future.md similarity index 100% rename from Tests/.TestSites/02-have-index/content/date-future.md rename to test/.TestSites/02-have-index/content/date-future.md diff --git a/Tests/.TestSites/02-have-index/content/date-ok.md b/test/.TestSites/02-have-index/content/date-ok.md similarity index 100% rename from Tests/.TestSites/02-have-index/content/date-ok.md rename to test/.TestSites/02-have-index/content/date-ok.md diff --git a/Tests/.TestSites/02-have-index/content/expired.md b/test/.TestSites/02-have-index/content/expired.md similarity index 100% rename from Tests/.TestSites/02-have-index/content/expired.md rename to test/.TestSites/02-have-index/content/expired.md diff --git a/Tests/.TestSites/02-have-index/content/index.md b/test/.TestSites/02-have-index/content/index.md similarity index 100% rename from Tests/.TestSites/02-have-index/content/index.md rename to test/.TestSites/02-have-index/content/index.md diff --git a/Tests/.TestSites/02-have-index/content/publishdate-future.md b/test/.TestSites/02-have-index/content/publishdate-future.md similarity index 100% rename from Tests/.TestSites/02-have-index/content/publishdate-future.md rename to test/.TestSites/02-have-index/content/publishdate-future.md diff --git a/Tests/.TestSites/02-have-index/content/publishdate-ok.md b/test/.TestSites/02-have-index/content/publishdate-ok.md similarity index 100% rename from Tests/.TestSites/02-have-index/content/publishdate-ok.md rename to test/.TestSites/02-have-index/content/publishdate-ok.md diff --git a/Tests/.TestSites/02-have-index/content/test01.md b/test/.TestSites/02-have-index/content/test01.md similarity index 100% rename from Tests/.TestSites/02-have-index/content/test01.md rename to test/.TestSites/02-have-index/content/test01.md diff --git a/Tests/.TestSites/02-have-index/sucos.yaml b/test/.TestSites/02-have-index/sucos.yaml similarity index 100% rename from Tests/.TestSites/02-have-index/sucos.yaml rename to test/.TestSites/02-have-index/sucos.yaml diff --git a/Tests/.TestSites/03-section/content/blog/alias.md b/test/.TestSites/03-section/content/blog/alias.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/alias.md rename to test/.TestSites/03-section/content/blog/alias.md diff --git a/Tests/.TestSites/03-section/content/blog/categories.md b/test/.TestSites/03-section/content/blog/categories.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/categories.md rename to test/.TestSites/03-section/content/blog/categories.md diff --git a/Tests/.TestSites/03-section/content/blog/date-future.md b/test/.TestSites/03-section/content/blog/date-future.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/date-future.md rename to test/.TestSites/03-section/content/blog/date-future.md diff --git a/Tests/.TestSites/03-section/content/blog/date-ok.md b/test/.TestSites/03-section/content/blog/date-ok.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/date-ok.md rename to test/.TestSites/03-section/content/blog/date-ok.md diff --git a/Tests/.TestSites/03-section/content/blog/expired.md b/test/.TestSites/03-section/content/blog/expired.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/expired.md rename to test/.TestSites/03-section/content/blog/expired.md diff --git a/Tests/.TestSites/03-section/content/blog/publishdate-future.md b/test/.TestSites/03-section/content/blog/publishdate-future.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/publishdate-future.md rename to test/.TestSites/03-section/content/blog/publishdate-future.md diff --git a/Tests/.TestSites/03-section/content/blog/publishdate-ok.md b/test/.TestSites/03-section/content/blog/publishdate-ok.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/publishdate-ok.md rename to test/.TestSites/03-section/content/blog/publishdate-ok.md diff --git a/Tests/.TestSites/03-section/content/blog/test01.md b/test/.TestSites/03-section/content/blog/test01.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/test01.md rename to test/.TestSites/03-section/content/blog/test01.md diff --git a/Tests/.TestSites/03-section/content/blog/weight-negative-1.md b/test/.TestSites/03-section/content/blog/weight-negative-1.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/weight-negative-1.md rename to test/.TestSites/03-section/content/blog/weight-negative-1.md diff --git a/Tests/.TestSites/03-section/content/blog/weight-negative-100.md b/test/.TestSites/03-section/content/blog/weight-negative-100.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/weight-negative-100.md rename to test/.TestSites/03-section/content/blog/weight-negative-100.md diff --git a/Tests/.TestSites/03-section/content/blog/weight-positive-1.md b/test/.TestSites/03-section/content/blog/weight-positive-1.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/weight-positive-1.md rename to test/.TestSites/03-section/content/blog/weight-positive-1.md diff --git a/Tests/.TestSites/03-section/content/blog/weight-positive-100.md b/test/.TestSites/03-section/content/blog/weight-positive-100.md similarity index 100% rename from Tests/.TestSites/03-section/content/blog/weight-positive-100.md rename to test/.TestSites/03-section/content/blog/weight-positive-100.md diff --git a/Tests/.TestSites/03-section/sucos.yaml b/test/.TestSites/03-section/sucos.yaml similarity index 100% rename from Tests/.TestSites/03-section/sucos.yaml rename to test/.TestSites/03-section/sucos.yaml diff --git a/Tests/.TestSites/04-tags/content/blog/categories.md b/test/.TestSites/04-tags/content/blog/categories.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/categories.md rename to test/.TestSites/04-tags/content/blog/categories.md diff --git a/Tests/.TestSites/04-tags/content/blog/date-future.md b/test/.TestSites/04-tags/content/blog/date-future.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/date-future.md rename to test/.TestSites/04-tags/content/blog/date-future.md diff --git a/Tests/.TestSites/04-tags/content/blog/date-ok.md b/test/.TestSites/04-tags/content/blog/date-ok.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/date-ok.md rename to test/.TestSites/04-tags/content/blog/date-ok.md diff --git a/Tests/.TestSites/04-tags/content/blog/expired.md b/test/.TestSites/04-tags/content/blog/expired.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/expired.md rename to test/.TestSites/04-tags/content/blog/expired.md diff --git a/Tests/.TestSites/04-tags/content/blog/publishdate-future.md b/test/.TestSites/04-tags/content/blog/publishdate-future.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/publishdate-future.md rename to test/.TestSites/04-tags/content/blog/publishdate-future.md diff --git a/Tests/.TestSites/04-tags/content/blog/publishdate-ok.md b/test/.TestSites/04-tags/content/blog/publishdate-ok.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/publishdate-ok.md rename to test/.TestSites/04-tags/content/blog/publishdate-ok.md diff --git a/Tests/.TestSites/04-tags/content/blog/subsection/alias.md b/test/.TestSites/04-tags/content/blog/subsection/alias.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/subsection/alias.md rename to test/.TestSites/04-tags/content/blog/subsection/alias.md diff --git a/Tests/.TestSites/04-tags/content/blog/tags-01.md b/test/.TestSites/04-tags/content/blog/tags-01.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/tags-01.md rename to test/.TestSites/04-tags/content/blog/tags-01.md diff --git a/Tests/.TestSites/04-tags/content/blog/tags-02.md b/test/.TestSites/04-tags/content/blog/tags-02.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/tags-02.md rename to test/.TestSites/04-tags/content/blog/tags-02.md diff --git a/Tests/.TestSites/04-tags/content/blog/tags-03.md b/test/.TestSites/04-tags/content/blog/tags-03.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/tags-03.md rename to test/.TestSites/04-tags/content/blog/tags-03.md diff --git a/Tests/.TestSites/04-tags/content/blog/tags-04.md b/test/.TestSites/04-tags/content/blog/tags-04.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/tags-04.md rename to test/.TestSites/04-tags/content/blog/tags-04.md diff --git a/Tests/.TestSites/04-tags/content/blog/tags-05.md b/test/.TestSites/04-tags/content/blog/tags-05.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/tags-05.md rename to test/.TestSites/04-tags/content/blog/tags-05.md diff --git a/Tests/.TestSites/04-tags/content/blog/tags-06.md b/test/.TestSites/04-tags/content/blog/tags-06.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/tags-06.md rename to test/.TestSites/04-tags/content/blog/tags-06.md diff --git a/Tests/.TestSites/04-tags/content/blog/tags-07.md b/test/.TestSites/04-tags/content/blog/tags-07.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/tags-07.md rename to test/.TestSites/04-tags/content/blog/tags-07.md diff --git a/Tests/.TestSites/04-tags/content/blog/tags-08.md b/test/.TestSites/04-tags/content/blog/tags-08.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/tags-08.md rename to test/.TestSites/04-tags/content/blog/tags-08.md diff --git a/Tests/.TestSites/04-tags/content/blog/tags-09.md b/test/.TestSites/04-tags/content/blog/tags-09.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/tags-09.md rename to test/.TestSites/04-tags/content/blog/tags-09.md diff --git a/Tests/.TestSites/04-tags/content/blog/tags-10.md b/test/.TestSites/04-tags/content/blog/tags-10.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/tags-10.md rename to test/.TestSites/04-tags/content/blog/tags-10.md diff --git a/Tests/.TestSites/04-tags/content/blog/test01.md b/test/.TestSites/04-tags/content/blog/test01.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/test01.md rename to test/.TestSites/04-tags/content/blog/test01.md diff --git a/Tests/.TestSites/04-tags/content/blog/weight-negative-1.md b/test/.TestSites/04-tags/content/blog/weight-negative-1.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/weight-negative-1.md rename to test/.TestSites/04-tags/content/blog/weight-negative-1.md diff --git a/Tests/.TestSites/04-tags/content/blog/weight-negative-100.md b/test/.TestSites/04-tags/content/blog/weight-negative-100.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/weight-negative-100.md rename to test/.TestSites/04-tags/content/blog/weight-negative-100.md diff --git a/Tests/.TestSites/04-tags/content/blog/weight-positive-1.md b/test/.TestSites/04-tags/content/blog/weight-positive-1.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/weight-positive-1.md rename to test/.TestSites/04-tags/content/blog/weight-positive-1.md diff --git a/Tests/.TestSites/04-tags/content/blog/weight-positive-100.md b/test/.TestSites/04-tags/content/blog/weight-positive-100.md similarity index 100% rename from Tests/.TestSites/04-tags/content/blog/weight-positive-100.md rename to test/.TestSites/04-tags/content/blog/weight-positive-100.md diff --git a/Tests/.TestSites/04-tags/content/index.md b/test/.TestSites/04-tags/content/index.md similarity index 100% rename from Tests/.TestSites/04-tags/content/index.md rename to test/.TestSites/04-tags/content/index.md diff --git a/Tests/.TestSites/04-tags/sucos.yaml b/test/.TestSites/04-tags/sucos.yaml similarity index 100% rename from Tests/.TestSites/04-tags/sucos.yaml rename to test/.TestSites/04-tags/sucos.yaml diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/alias.md b/test/.TestSites/05-theme-no-baseof/content/blog/alias.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/alias.md rename to test/.TestSites/05-theme-no-baseof/content/blog/alias.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/categories.md b/test/.TestSites/05-theme-no-baseof/content/blog/categories.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/categories.md rename to test/.TestSites/05-theme-no-baseof/content/blog/categories.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/date-future.md b/test/.TestSites/05-theme-no-baseof/content/blog/date-future.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/date-future.md rename to test/.TestSites/05-theme-no-baseof/content/blog/date-future.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/date-ok.md b/test/.TestSites/05-theme-no-baseof/content/blog/date-ok.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/date-ok.md rename to test/.TestSites/05-theme-no-baseof/content/blog/date-ok.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/expired.md b/test/.TestSites/05-theme-no-baseof/content/blog/expired.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/expired.md rename to test/.TestSites/05-theme-no-baseof/content/blog/expired.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/publishdate-future.md b/test/.TestSites/05-theme-no-baseof/content/blog/publishdate-future.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/publishdate-future.md rename to test/.TestSites/05-theme-no-baseof/content/blog/publishdate-future.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/publishdate-ok.md b/test/.TestSites/05-theme-no-baseof/content/blog/publishdate-ok.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/publishdate-ok.md rename to test/.TestSites/05-theme-no-baseof/content/blog/publishdate-ok.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/tags-01.md b/test/.TestSites/05-theme-no-baseof/content/blog/tags-01.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/tags-01.md rename to test/.TestSites/05-theme-no-baseof/content/blog/tags-01.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/tags-02.md b/test/.TestSites/05-theme-no-baseof/content/blog/tags-02.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/tags-02.md rename to test/.TestSites/05-theme-no-baseof/content/blog/tags-02.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/test01.md b/test/.TestSites/05-theme-no-baseof/content/blog/test01.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/test01.md rename to test/.TestSites/05-theme-no-baseof/content/blog/test01.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/weight-negative-1.md b/test/.TestSites/05-theme-no-baseof/content/blog/weight-negative-1.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/weight-negative-1.md rename to test/.TestSites/05-theme-no-baseof/content/blog/weight-negative-1.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/weight-negative-100.md b/test/.TestSites/05-theme-no-baseof/content/blog/weight-negative-100.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/weight-negative-100.md rename to test/.TestSites/05-theme-no-baseof/content/blog/weight-negative-100.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/weight-positive-1.md b/test/.TestSites/05-theme-no-baseof/content/blog/weight-positive-1.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/weight-positive-1.md rename to test/.TestSites/05-theme-no-baseof/content/blog/weight-positive-1.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/blog/weight-positive-100.md b/test/.TestSites/05-theme-no-baseof/content/blog/weight-positive-100.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/blog/weight-positive-100.md rename to test/.TestSites/05-theme-no-baseof/content/blog/weight-positive-100.md diff --git a/Tests/.TestSites/05-theme-no-baseof/content/index.md b/test/.TestSites/05-theme-no-baseof/content/index.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/content/index.md rename to test/.TestSites/05-theme-no-baseof/content/index.md diff --git a/Tests/.TestSites/05-theme-no-baseof/index.md b/test/.TestSites/05-theme-no-baseof/index.md similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/index.md rename to test/.TestSites/05-theme-no-baseof/index.md diff --git a/Tests/.TestSites/05-theme-no-baseof/sucos.yaml b/test/.TestSites/05-theme-no-baseof/sucos.yaml similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/sucos.yaml rename to test/.TestSites/05-theme-no-baseof/sucos.yaml diff --git a/Tests/.TestSites/05-theme-no-baseof/themes/test/_default/index.liquid b/test/.TestSites/05-theme-no-baseof/themes/test/_default/index.liquid similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/themes/test/_default/index.liquid rename to test/.TestSites/05-theme-no-baseof/themes/test/_default/index.liquid diff --git a/Tests/.TestSites/05-theme-no-baseof/themes/test/_default/list.liquid b/test/.TestSites/05-theme-no-baseof/themes/test/_default/list.liquid similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/themes/test/_default/list.liquid rename to test/.TestSites/05-theme-no-baseof/themes/test/_default/list.liquid diff --git a/Tests/.TestSites/05-theme-no-baseof/themes/test/_default/single.liquid b/test/.TestSites/05-theme-no-baseof/themes/test/_default/single.liquid similarity index 100% rename from Tests/.TestSites/05-theme-no-baseof/themes/test/_default/single.liquid rename to test/.TestSites/05-theme-no-baseof/themes/test/_default/single.liquid diff --git a/Tests/.TestSites/06-theme/content/blog/alias.md b/test/.TestSites/06-theme/content/blog/alias.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/alias.md rename to test/.TestSites/06-theme/content/blog/alias.md diff --git a/Tests/.TestSites/06-theme/content/blog/categories.md b/test/.TestSites/06-theme/content/blog/categories.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/categories.md rename to test/.TestSites/06-theme/content/blog/categories.md diff --git a/Tests/.TestSites/06-theme/content/blog/date-future.md b/test/.TestSites/06-theme/content/blog/date-future.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/date-future.md rename to test/.TestSites/06-theme/content/blog/date-future.md diff --git a/Tests/.TestSites/06-theme/content/blog/date-ok.md b/test/.TestSites/06-theme/content/blog/date-ok.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/date-ok.md rename to test/.TestSites/06-theme/content/blog/date-ok.md diff --git a/Tests/.TestSites/06-theme/content/blog/expired.md b/test/.TestSites/06-theme/content/blog/expired.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/expired.md rename to test/.TestSites/06-theme/content/blog/expired.md diff --git a/Tests/.TestSites/06-theme/content/blog/publishdate-future.md b/test/.TestSites/06-theme/content/blog/publishdate-future.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/publishdate-future.md rename to test/.TestSites/06-theme/content/blog/publishdate-future.md diff --git a/Tests/.TestSites/06-theme/content/blog/publishdate-ok.md b/test/.TestSites/06-theme/content/blog/publishdate-ok.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/publishdate-ok.md rename to test/.TestSites/06-theme/content/blog/publishdate-ok.md diff --git a/Tests/.TestSites/06-theme/content/blog/tags-01.md b/test/.TestSites/06-theme/content/blog/tags-01.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/tags-01.md rename to test/.TestSites/06-theme/content/blog/tags-01.md diff --git a/Tests/.TestSites/06-theme/content/blog/tags-02.md b/test/.TestSites/06-theme/content/blog/tags-02.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/tags-02.md rename to test/.TestSites/06-theme/content/blog/tags-02.md diff --git a/Tests/.TestSites/06-theme/content/blog/test01.md b/test/.TestSites/06-theme/content/blog/test01.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/test01.md rename to test/.TestSites/06-theme/content/blog/test01.md diff --git a/Tests/.TestSites/06-theme/content/blog/weight-negative-1.md b/test/.TestSites/06-theme/content/blog/weight-negative-1.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/weight-negative-1.md rename to test/.TestSites/06-theme/content/blog/weight-negative-1.md diff --git a/Tests/.TestSites/06-theme/content/blog/weight-negative-100.md b/test/.TestSites/06-theme/content/blog/weight-negative-100.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/weight-negative-100.md rename to test/.TestSites/06-theme/content/blog/weight-negative-100.md diff --git a/Tests/.TestSites/06-theme/content/blog/weight-positive-1.md b/test/.TestSites/06-theme/content/blog/weight-positive-1.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/weight-positive-1.md rename to test/.TestSites/06-theme/content/blog/weight-positive-1.md diff --git a/Tests/.TestSites/06-theme/content/blog/weight-positive-100.md b/test/.TestSites/06-theme/content/blog/weight-positive-100.md similarity index 100% rename from Tests/.TestSites/06-theme/content/blog/weight-positive-100.md rename to test/.TestSites/06-theme/content/blog/weight-positive-100.md diff --git a/Tests/.TestSites/06-theme/content/index.md b/test/.TestSites/06-theme/content/index.md similarity index 100% rename from Tests/.TestSites/06-theme/content/index.md rename to test/.TestSites/06-theme/content/index.md diff --git a/Tests/.TestSites/06-theme/index.md b/test/.TestSites/06-theme/index.md similarity index 100% rename from Tests/.TestSites/06-theme/index.md rename to test/.TestSites/06-theme/index.md diff --git a/Tests/.TestSites/06-theme/sucos.yaml b/test/.TestSites/06-theme/sucos.yaml similarity index 100% rename from Tests/.TestSites/06-theme/sucos.yaml rename to test/.TestSites/06-theme/sucos.yaml diff --git a/Tests/.TestSites/06-theme/themes/test/_default/baseof.liquid b/test/.TestSites/06-theme/themes/test/_default/baseof.liquid similarity index 100% rename from Tests/.TestSites/06-theme/themes/test/_default/baseof.liquid rename to test/.TestSites/06-theme/themes/test/_default/baseof.liquid diff --git a/Tests/.TestSites/06-theme/themes/test/_default/index.liquid b/test/.TestSites/06-theme/themes/test/_default/index.liquid similarity index 100% rename from Tests/.TestSites/06-theme/themes/test/_default/index.liquid rename to test/.TestSites/06-theme/themes/test/_default/index.liquid diff --git a/Tests/.TestSites/06-theme/themes/test/_default/list.liquid b/test/.TestSites/06-theme/themes/test/_default/list.liquid similarity index 100% rename from Tests/.TestSites/06-theme/themes/test/_default/list.liquid rename to test/.TestSites/06-theme/themes/test/_default/list.liquid diff --git a/Tests/.TestSites/06-theme/themes/test/_default/single.liquid b/test/.TestSites/06-theme/themes/test/_default/single.liquid similarity index 100% rename from Tests/.TestSites/06-theme/themes/test/_default/single.liquid rename to test/.TestSites/06-theme/themes/test/_default/single.liquid diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/alias.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/alias.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/alias.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/alias.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/categories.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/categories.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/categories.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/categories.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/date-future.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/date-future.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/date-future.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/date-future.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/date-ok.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/date-ok.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/date-ok.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/date-ok.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/expired.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/expired.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/expired.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/expired.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-future.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-future.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-future.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-future.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-ok.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-ok.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-ok.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/publishdate-ok.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/tags-01.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/tags-01.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/tags-01.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/tags-01.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/tags-02.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/tags-02.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/tags-02.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/tags-02.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/test01.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/test01.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/test01.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/test01.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-1.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-1.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-1.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-1.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-100.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-100.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-100.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/weight-negative-100.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-1.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-1.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-1.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-1.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-100.md b/test/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-100.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-100.md rename to test/.TestSites/07-theme-no-baseof-error/content/blog/weight-positive-100.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/content/index.md b/test/.TestSites/07-theme-no-baseof-error/content/index.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/content/index.md rename to test/.TestSites/07-theme-no-baseof-error/content/index.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/index.md b/test/.TestSites/07-theme-no-baseof-error/index.md similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/index.md rename to test/.TestSites/07-theme-no-baseof-error/index.md diff --git a/Tests/.TestSites/07-theme-no-baseof-error/sucos.yaml b/test/.TestSites/07-theme-no-baseof-error/sucos.yaml similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/sucos.yaml rename to test/.TestSites/07-theme-no-baseof-error/sucos.yaml diff --git a/Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/index.liquid b/test/.TestSites/07-theme-no-baseof-error/themes/test/_default/index.liquid similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/index.liquid rename to test/.TestSites/07-theme-no-baseof-error/themes/test/_default/index.liquid diff --git a/Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/list.liquid b/test/.TestSites/07-theme-no-baseof-error/themes/test/_default/list.liquid similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/list.liquid rename to test/.TestSites/07-theme-no-baseof-error/themes/test/_default/list.liquid diff --git a/Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/single.liquid b/test/.TestSites/07-theme-no-baseof-error/themes/test/_default/single.liquid similarity index 100% rename from Tests/.TestSites/07-theme-no-baseof-error/themes/test/_default/single.liquid rename to test/.TestSites/07-theme-no-baseof-error/themes/test/_default/single.liquid diff --git a/Tests/.TestSites/08-theme-html/content/blog/alias.md b/test/.TestSites/08-theme-html/content/blog/alias.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/alias.md rename to test/.TestSites/08-theme-html/content/blog/alias.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/categories.md b/test/.TestSites/08-theme-html/content/blog/categories.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/categories.md rename to test/.TestSites/08-theme-html/content/blog/categories.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/date-future.md b/test/.TestSites/08-theme-html/content/blog/date-future.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/date-future.md rename to test/.TestSites/08-theme-html/content/blog/date-future.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/date-ok.md b/test/.TestSites/08-theme-html/content/blog/date-ok.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/date-ok.md rename to test/.TestSites/08-theme-html/content/blog/date-ok.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/expired.md b/test/.TestSites/08-theme-html/content/blog/expired.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/expired.md rename to test/.TestSites/08-theme-html/content/blog/expired.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/publishdate-future.md b/test/.TestSites/08-theme-html/content/blog/publishdate-future.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/publishdate-future.md rename to test/.TestSites/08-theme-html/content/blog/publishdate-future.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/publishdate-ok.md b/test/.TestSites/08-theme-html/content/blog/publishdate-ok.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/publishdate-ok.md rename to test/.TestSites/08-theme-html/content/blog/publishdate-ok.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/tags-01.md b/test/.TestSites/08-theme-html/content/blog/tags-01.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/tags-01.md rename to test/.TestSites/08-theme-html/content/blog/tags-01.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/tags-02.md b/test/.TestSites/08-theme-html/content/blog/tags-02.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/tags-02.md rename to test/.TestSites/08-theme-html/content/blog/tags-02.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/test01.md b/test/.TestSites/08-theme-html/content/blog/test01.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/test01.md rename to test/.TestSites/08-theme-html/content/blog/test01.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/weight-negative-1.md b/test/.TestSites/08-theme-html/content/blog/weight-negative-1.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/weight-negative-1.md rename to test/.TestSites/08-theme-html/content/blog/weight-negative-1.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/weight-negative-100.md b/test/.TestSites/08-theme-html/content/blog/weight-negative-100.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/weight-negative-100.md rename to test/.TestSites/08-theme-html/content/blog/weight-negative-100.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/weight-positive-1.md b/test/.TestSites/08-theme-html/content/blog/weight-positive-1.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/weight-positive-1.md rename to test/.TestSites/08-theme-html/content/blog/weight-positive-1.md diff --git a/Tests/.TestSites/08-theme-html/content/blog/weight-positive-100.md b/test/.TestSites/08-theme-html/content/blog/weight-positive-100.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/blog/weight-positive-100.md rename to test/.TestSites/08-theme-html/content/blog/weight-positive-100.md diff --git a/Tests/.TestSites/08-theme-html/content/index.md b/test/.TestSites/08-theme-html/content/index.md similarity index 100% rename from Tests/.TestSites/08-theme-html/content/index.md rename to test/.TestSites/08-theme-html/content/index.md diff --git a/Tests/.TestSites/08-theme-html/index.md b/test/.TestSites/08-theme-html/index.md similarity index 100% rename from Tests/.TestSites/08-theme-html/index.md rename to test/.TestSites/08-theme-html/index.md diff --git a/Tests/.TestSites/08-theme-html/sucos.yaml b/test/.TestSites/08-theme-html/sucos.yaml similarity index 100% rename from Tests/.TestSites/08-theme-html/sucos.yaml rename to test/.TestSites/08-theme-html/sucos.yaml diff --git a/Tests/.TestSites/08-theme-html/themes/test/_default/baseof.liquid b/test/.TestSites/08-theme-html/themes/test/_default/baseof.liquid similarity index 100% rename from Tests/.TestSites/08-theme-html/themes/test/_default/baseof.liquid rename to test/.TestSites/08-theme-html/themes/test/_default/baseof.liquid diff --git a/Tests/.TestSites/08-theme-html/themes/test/_default/index.liquid b/test/.TestSites/08-theme-html/themes/test/_default/index.liquid similarity index 100% rename from Tests/.TestSites/08-theme-html/themes/test/_default/index.liquid rename to test/.TestSites/08-theme-html/themes/test/_default/index.liquid diff --git a/Tests/.TestSites/08-theme-html/themes/test/_default/list.liquid b/test/.TestSites/08-theme-html/themes/test/_default/list.liquid similarity index 100% rename from Tests/.TestSites/08-theme-html/themes/test/_default/list.liquid rename to test/.TestSites/08-theme-html/themes/test/_default/list.liquid diff --git a/Tests/.TestSites/08-theme-html/themes/test/_default/single.liquid b/test/.TestSites/08-theme-html/themes/test/_default/single.liquid similarity index 100% rename from Tests/.TestSites/08-theme-html/themes/test/_default/single.liquid rename to test/.TestSites/08-theme-html/themes/test/_default/single.liquid diff --git a/Tests/Commands/BaseGeneratorCommandTests.cs b/test/Commands/BaseGeneratorCommandTests.cs similarity index 98% rename from Tests/Commands/BaseGeneratorCommandTests.cs rename to test/Commands/BaseGeneratorCommandTests.cs index 7e1a22f..db9f559 100644 --- a/Tests/Commands/BaseGeneratorCommandTests.cs +++ b/test/Commands/BaseGeneratorCommandTests.cs @@ -1,13 +1,13 @@ +using System.Reflection; using NSubstitute; using Serilog; -using SuCoS.Models.CommandLineOptions; -using SuCoS.TemplateEngine; -using System.Reflection; using SuCoS.Commands; using SuCoS.Helpers; +using SuCoS.Models.CommandLineOptions; +using SuCoS.TemplateEngine; using Xunit; -namespace Tests.Commands; +namespace test.Commands; public class BaseGeneratorCommandTests { diff --git a/Tests/Commands/BuildCommandTests.cs b/test/Commands/BuildCommandTests.cs similarity index 99% rename from Tests/Commands/BuildCommandTests.cs rename to test/Commands/BuildCommandTests.cs index 1099113..03893ac 100644 --- a/Tests/Commands/BuildCommandTests.cs +++ b/test/Commands/BuildCommandTests.cs @@ -1,11 +1,11 @@ -using SuCoS.Models.CommandLineOptions; -using Xunit; using NSubstitute; using Serilog; using SuCoS.Commands; using SuCoS.Helpers; +using SuCoS.Models.CommandLineOptions; +using Xunit; -namespace Tests.Commands; +namespace test.Commands; public class BuildCommandTests { diff --git a/Tests/Commands/NewSiteCommandTests.cs b/test/Commands/NewSiteCommandTests.cs similarity index 99% rename from Tests/Commands/NewSiteCommandTests.cs rename to test/Commands/NewSiteCommandTests.cs index b148000..c2a7bdc 100644 --- a/Tests/Commands/NewSiteCommandTests.cs +++ b/test/Commands/NewSiteCommandTests.cs @@ -1,12 +1,12 @@ -using SuCoS.Models; -using SuCoS.Models.CommandLineOptions; -using Xunit; using NSubstitute; using Serilog; using SuCoS.Commands; using SuCoS.Helpers; +using SuCoS.Models; +using SuCoS.Models.CommandLineOptions; +using Xunit; -namespace Tests.Commands; +namespace test.Commands; public class NewSiteCommandTests { diff --git a/Tests/Helpers/StopwatchReporterTests.cs b/test/Helpers/StopwatchReporterTests.cs similarity index 99% rename from Tests/Helpers/StopwatchReporterTests.cs rename to test/Helpers/StopwatchReporterTests.cs index adde67c..5a18d1d 100644 --- a/Tests/Helpers/StopwatchReporterTests.cs +++ b/test/Helpers/StopwatchReporterTests.cs @@ -1,13 +1,12 @@ - -using Serilog; -using Serilog.Sinks.InMemory; -using SuCoS.Helpers; using System.Diagnostics; using System.Globalization; using System.Reflection; +using Serilog; +using Serilog.Sinks.InMemory; +using SuCoS.Helpers; using Xunit; -namespace Tests.Helpers; +namespace test.Helpers; public class StopwatchReporterTests { diff --git a/Tests/Helpers/UrlizerTests.cs b/test/Helpers/UrlizerTests.cs similarity index 99% rename from Tests/Helpers/UrlizerTests.cs rename to test/Helpers/UrlizerTests.cs index 02b44ff..9291848 100644 --- a/Tests/Helpers/UrlizerTests.cs +++ b/test/Helpers/UrlizerTests.cs @@ -1,7 +1,7 @@ using SuCoS.Helpers; using Xunit; -namespace Tests.Helpers; +namespace test.Helpers; public class UrlizerTests { diff --git a/Tests/Models/FrontMatterTests.cs b/test/Models/FrontMatterTests.cs similarity index 99% rename from Tests/Models/FrontMatterTests.cs rename to test/Models/FrontMatterTests.cs index 7336a7c..cfb770a 100644 --- a/Tests/Models/FrontMatterTests.cs +++ b/test/Models/FrontMatterTests.cs @@ -2,7 +2,7 @@ using System.Globalization; using SuCoS.Models; using Xunit; -namespace Tests.Models; +namespace test.Models; public class FrontMatterTests : TestSetup { diff --git a/Tests/Models/PageTests.cs b/test/Models/PageTests.cs similarity index 99% rename from Tests/Models/PageTests.cs rename to test/Models/PageTests.cs index 42dec2b..eba6149 100644 --- a/Tests/Models/PageTests.cs +++ b/test/Models/PageTests.cs @@ -4,7 +4,7 @@ using SuCoS.Models; using SuCoS.Models.CommandLineOptions; using Xunit; -namespace Tests.Models; +namespace test.Models; public class PageTests : TestSetup { diff --git a/Tests/Models/SiteTests.cs b/test/Models/SiteTests.cs similarity index 99% rename from Tests/Models/SiteTests.cs rename to test/Models/SiteTests.cs index 60cad0d..aebe3c9 100644 --- a/Tests/Models/SiteTests.cs +++ b/test/Models/SiteTests.cs @@ -4,7 +4,7 @@ using SuCoS.Models.CommandLineOptions; using SuCoS.Parsers; using Xunit; -namespace Tests.Models; +namespace test.Models; /// /// Unit tests for the Site class. diff --git a/Tests/Parser/YAMLParserTests.cs b/test/Parser/YAMLParserTests.cs similarity index 99% rename from Tests/Parser/YAMLParserTests.cs rename to test/Parser/YAMLParserTests.cs index ef67089..1cabb84 100644 --- a/Tests/Parser/YAMLParserTests.cs +++ b/test/Parser/YAMLParserTests.cs @@ -4,7 +4,7 @@ using SuCoS.Models; using SuCoS.Parsers; using Xunit; -namespace Tests.YAMLParser; +namespace test.Parser; public class YamlParserTests : TestSetup { diff --git a/Tests/ProgramTest.cs b/test/ProgramTest.cs similarity index 96% rename from Tests/ProgramTest.cs rename to test/ProgramTest.cs index e25a052..2f307c9 100644 --- a/Tests/ProgramTest.cs +++ b/test/ProgramTest.cs @@ -2,7 +2,7 @@ using Serilog.Events; using SuCoS; using Xunit; -namespace Tests; +namespace test; public class ProgramTests : TestSetup { diff --git a/Tests/ServerHandlers/PingRequestHandlerTests.cs b/test/ServerHandlers/PingRequestHandlerTests.cs similarity index 97% rename from Tests/ServerHandlers/PingRequestHandlerTests.cs rename to test/ServerHandlers/PingRequestHandlerTests.cs index a254fbb..f1dbeb7 100644 --- a/Tests/ServerHandlers/PingRequestHandlerTests.cs +++ b/test/ServerHandlers/PingRequestHandlerTests.cs @@ -2,7 +2,7 @@ using NSubstitute; using SuCoS.ServerHandlers; using Xunit; -namespace Tests.ServerHandlers; +namespace test.ServerHandlers; public class PingRequestHandlerTests : TestSetup { diff --git a/Tests/ServerHandlers/RegisteredPageRequestHandlerTests.cs b/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs similarity index 98% rename from Tests/ServerHandlers/RegisteredPageRequestHandlerTests.cs rename to test/ServerHandlers/RegisteredPageRequestHandlerTests.cs index ea788ec..3c01fa8 100644 --- a/Tests/ServerHandlers/RegisteredPageRequestHandlerTests.cs +++ b/test/ServerHandlers/RegisteredPageRequestHandlerTests.cs @@ -6,7 +6,7 @@ using SuCoS.Parsers; using SuCoS.ServerHandlers; using Xunit; -namespace Tests.ServerHandlers; +namespace test.ServerHandlers; public class RegisteredPageRequestHandlerTests : TestSetup { diff --git a/Tests/ServerHandlers/StaticFileRequestHandlerTests.cs b/test/ServerHandlers/StaticFileRequestHandlerTests.cs similarity index 98% rename from Tests/ServerHandlers/StaticFileRequestHandlerTests.cs rename to test/ServerHandlers/StaticFileRequestHandlerTests.cs index 1a0fd3a..581c7c4 100644 --- a/Tests/ServerHandlers/StaticFileRequestHandlerTests.cs +++ b/test/ServerHandlers/StaticFileRequestHandlerTests.cs @@ -2,7 +2,7 @@ using NSubstitute; using SuCoS.ServerHandlers; using Xunit; -namespace Tests.ServerHandlers; +namespace test.ServerHandlers; public class StaticFileRequestHandlerTests : TestSetup, IDisposable { diff --git a/Tests/TestSetup.cs b/test/TestSetup.cs similarity index 95% rename from Tests/TestSetup.cs rename to test/TestSetup.cs index a565294..902b815 100644 --- a/Tests/TestSetup.cs +++ b/test/TestSetup.cs @@ -1,11 +1,11 @@ +using System.Globalization; using NSubstitute; using Serilog; using SuCoS.Models; using SuCoS.Models.CommandLineOptions; using SuCoS.Parsers; -using System.Globalization; -namespace Tests; +namespace test; public class TestSetup { @@ -36,8 +36,8 @@ public class TestSetup protected ISite Site; - // based on the compiled Tests.dll path - // that is typically "bin/Debug/netX.0/Tests.dll" + // based on the compiled test.dll path + // that is typically "bin/Debug/netX.0/test.dll" protected const string TestSitesPath = "../../.."; protected TestSetup() diff --git a/Tests/Tests.csproj b/test/test.csproj similarity index 97% rename from Tests/Tests.csproj rename to test/test.csproj index 75fa457..9a5cddb 100644 --- a/Tests/Tests.csproj +++ b/test/test.csproj @@ -1,29 +1,29 @@ - - - - net8.0 - enable - enable - - false - - test - - - - - - - - - - runtime; build; native; contentfiles; analyzers; buildtransitive - all - - - - - - - - + + + + net8.0 + enable + enable + + false + + test + + + + + + + + + + runtime; build; native; contentfiles; analyzers; buildtransitive + all + + + + + + + + -- GitLab From 960af936c6222d54541892496199e64b467bac17 Mon Sep 17 00:00:00 2001 From: Bruno Massa Date: Tue, 14 May 2024 14:57:35 -0500 Subject: [PATCH 2/2] chore: several small code enhancements --- source/Commands/ServeCommand.cs | 30 +++++----------------- source/Helpers/SourceFileWatcher.cs | 7 +++-- source/Models/IFile.cs | 5 ++-- source/ServerHandlers/StaticFileRequest.cs | 27 +++++-------------- 4 files changed, 17 insertions(+), 52 deletions(-) diff --git a/source/Commands/ServeCommand.cs b/source/Commands/ServeCommand.cs index 253c8ce..02fd4ca 100644 --- a/source/Commands/ServeCommand.cs +++ b/source/Commands/ServeCommand.cs @@ -54,7 +54,7 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable private Task? _loop; - private (WatcherChangeTypes changeType, string fullPath, DateTime dateTime) lastFileChanged; + private (WatcherChangeTypes changeType, string fullPath, DateTime dateTime) _lastFileChanged; /// /// Constructor for the ServeCommand class. @@ -75,30 +75,13 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable fileWatcher.Start(sourceAbsolutePath, OnSourceFileChanged); } - /// - /// Starts the server asynchronously. - /// - public void StartServer() - { - StartServer(BaseUrlDefault, PortDefault); - } - - /// - /// Starts the server asynchronously. - /// - /// - public void StartServer(string baseUrl) - { - StartServer(baseUrl, PortDefault); - } - /// /// Starts the server asynchronously. /// /// The base URL for the server. /// The port number for the server. /// A Task representing the asynchronous operation. - public void StartServer(string baseUrl, int port) + public void StartServer(string baseUrl = BaseUrlDefault, int port = PortDefault) { Logger.Information("Starting server..."); @@ -156,7 +139,6 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable _listener?.Close(); _fileWatcher.Stop(); _debounceTimer?.Dispose(); - GC.SuppressFinalize(this); } /// @@ -254,14 +236,14 @@ public sealed class ServeCommand : BaseGeneratorCommand, IDisposable return; } - if (lastFileChanged.fullPath == e.FullPath - && e.ChangeType == lastFileChanged.changeType - && (DateTime.Now - lastFileChanged.dateTime).TotalMilliseconds < 150) + if (_lastFileChanged.fullPath == e.FullPath + && e.ChangeType == _lastFileChanged.changeType + && (DateTime.Now - _lastFileChanged.dateTime).TotalMilliseconds < 150) { return; } - lastFileChanged = (e.ChangeType, e.FullPath, DateTime.Now); + _lastFileChanged = (e.ChangeType, e.FullPath, DateTime.Now); // File changes are firing multiple events in a short time. // Debounce the event handler to prevent multiple events from firing in a short time diff --git a/source/Helpers/SourceFileWatcher.cs b/source/Helpers/SourceFileWatcher.cs index 794223e..b742760 100644 --- a/source/Helpers/SourceFileWatcher.cs +++ b/source/Helpers/SourceFileWatcher.cs @@ -27,9 +27,9 @@ public sealed class SourceFileWatcher : IFileWatcher, IDisposable }; // Subscribe to the desired events - _fileWatcher.Changed += new FileSystemEventHandler(onSourceFileChanged.Invoke); - _fileWatcher.Created += new FileSystemEventHandler(onSourceFileChanged.Invoke); - _fileWatcher.Deleted += new FileSystemEventHandler(onSourceFileChanged.Invoke); + _fileWatcher.Changed += onSourceFileChanged.Invoke; + _fileWatcher.Created += onSourceFileChanged.Invoke; + _fileWatcher.Deleted += onSourceFileChanged.Invoke; _fileWatcher.Renamed += new RenamedEventHandler(onSourceFileChanged); } @@ -43,7 +43,6 @@ public sealed class SourceFileWatcher : IFileWatcher, IDisposable public void Dispose() { Dispose(true); - GC.SuppressFinalize(this); } private void Dispose(bool disposing) diff --git a/source/Models/IFile.cs b/source/Models/IFile.cs index fe2b817..69000c1 100644 --- a/source/Models/IFile.cs +++ b/source/Models/IFile.cs @@ -1,7 +1,6 @@ using FolkerKinzel.MimeTypes; - -// using Microsoft.AspNetCore.StaticFiles; using SuCoS.Helpers; +// using Microsoft.AspNetCore.StaticFiles; namespace SuCoS.Models; @@ -43,7 +42,7 @@ public interface IFile /// /// File MIME type. /// - string MimeType => MimeString.FromFileName(SourceFullPath) ?? "application/octet-stream"; + string MimeType => MimeString.FromFileName(SourceFullPath); /// /// File size in bytes. diff --git a/source/ServerHandlers/StaticFileRequest.cs b/source/ServerHandlers/StaticFileRequest.cs index 67abd35..a6a8116 100644 --- a/source/ServerHandlers/StaticFileRequest.cs +++ b/source/ServerHandlers/StaticFileRequest.cs @@ -5,33 +5,19 @@ namespace SuCoS.ServerHandlers; /// /// Check if it is one of the Static files (serve the actual file) /// -public class StaticFileRequest : IServerHandlers +public class StaticFileRequest(string? basePath, bool inTheme) : IServerHandlers { - private readonly string? _basePath; - private readonly bool _inTheme; - - /// - /// Constructor - /// - /// - /// - public StaticFileRequest(string? basePath, bool inTheme) - { - _basePath = basePath; - _inTheme = inTheme; - } - /// public bool Check(string requestPath) { ArgumentNullException.ThrowIfNull(requestPath); - if (string.IsNullOrEmpty(_basePath)) + if (string.IsNullOrEmpty(basePath)) { return false; } - var fileAbsolutePath = Path.Combine(_basePath, requestPath.TrimStart('/')); + var fileAbsolutePath = Path.Combine(basePath, requestPath.TrimStart('/')); return File.Exists(fileAbsolutePath); } @@ -41,12 +27,12 @@ public class StaticFileRequest : IServerHandlers ArgumentNullException.ThrowIfNull(requestPath); ArgumentNullException.ThrowIfNull(response); - var fileAbsolutePath = Path.Combine(_basePath!, requestPath.TrimStart('/')); + var fileAbsolutePath = Path.Combine(basePath!, requestPath.TrimStart('/')); response.ContentType = GetContentType(fileAbsolutePath); await using var fileStream = new FileStream(fileAbsolutePath, FileMode.Open, FileAccess.Read, FileShare.ReadWrite); response.ContentLength64 = fileStream.Length; await fileStream.CopyToAsync(response.OutputStream).ConfigureAwait(false); - return _inTheme ? "themeSt" : "static"; + return inTheme ? "themeSt" : "static"; } /// @@ -55,6 +41,5 @@ public class StaticFileRequest : IServerHandlers /// /// The path of the file. /// The content type of the file. - private static string GetContentType(string filePath) => - MimeString.FromFileName(filePath) ?? "application/octet-stream"; + private static string GetContentType(string filePath) => MimeString.FromFileName(filePath); } -- GitLab