From 520e1c193a2fd305cc51d75090f208dec462869a Mon Sep 17 00:00:00 2001 From: Bruno Massa Date: Wed, 10 Apr 2024 18:51:22 -0500 Subject: [PATCH] chore: merge Nuke folders --- {.build.Nuke => .nuke}/Build.Compile.cs | 2 +- {.build.Nuke => .nuke}/Build.Container.cs | 2 +- {.build.Nuke => .nuke}/Build.GitLab.cs | 2 +- {.build.Nuke => .nuke}/Build.Publish.cs | 2 +- {.build.Nuke => .nuke}/Build.Solution.cs | 2 +- {.build.Nuke => .nuke}/Build.Test.cs | 4 ++-- {.build.Nuke => .nuke}/Build.Version.cs | 2 +- {.build.Nuke => .nuke}/Build.cs | 2 +- {.build.Nuke => .nuke}/Configuration.cs | 2 +- {.build.Nuke => .nuke}/Directory.Build.props | 0 {.build.Nuke => .nuke}/Directory.Build.targets | 0 .build.Nuke/_build_nuke.csproj => .nuke/_nuke.csproj | 0 .../_nuke.csproj.DotSettings | 0 SuCoS.sln | 2 +- build.ps1 | 2 +- build.sh | 2 +- 16 files changed, 13 insertions(+), 13 deletions(-) rename {.build.Nuke => .nuke}/Build.Compile.cs (98%) rename {.build.Nuke => .nuke}/Build.Container.cs (99%) rename {.build.Nuke => .nuke}/Build.GitLab.cs (99%) rename {.build.Nuke => .nuke}/Build.Publish.cs (98%) rename {.build.Nuke => .nuke}/Build.Solution.cs (96%) rename {.build.Nuke => .nuke}/Build.Test.cs (98%) rename {.build.Nuke => .nuke}/Build.Version.cs (99%) rename {.build.Nuke => .nuke}/Build.cs (92%) rename {.build.Nuke => .nuke}/Configuration.cs (95%) rename {.build.Nuke => .nuke}/Directory.Build.props (100%) rename {.build.Nuke => .nuke}/Directory.Build.targets (100%) rename .build.Nuke/_build_nuke.csproj => .nuke/_nuke.csproj (100%) rename .build.Nuke/_build_nuke.csproj.DotSettings => .nuke/_nuke.csproj.DotSettings (100%) diff --git a/.build.Nuke/Build.Compile.cs b/.nuke/Build.Compile.cs similarity index 98% rename from .build.Nuke/Build.Compile.cs rename to .nuke/Build.Compile.cs index d298cce..a17d533 100644 --- a/.build.Nuke/Build.Compile.cs +++ b/.nuke/Build.Compile.cs @@ -5,7 +5,7 @@ using Nuke.Common.Utilities.Collections; using Serilog; using static Nuke.Common.Tools.DotNet.DotNetTasks; -namespace SuCoS; +namespace SuCoS.Nuke; /// /// This is the main build file for the project. diff --git a/.build.Nuke/Build.Container.cs b/.nuke/Build.Container.cs similarity index 99% rename from .build.Nuke/Build.Container.cs rename to .nuke/Build.Container.cs index 5d7849a..683b2f6 100644 --- a/.build.Nuke/Build.Container.cs +++ b/.nuke/Build.Container.cs @@ -6,7 +6,7 @@ using System; using System.Collections.Generic; using System.Linq; -namespace SuCoS; +namespace SuCoS.Nuke; /// /// This is the main build file for the project. diff --git a/.build.Nuke/Build.GitLab.cs b/.nuke/Build.GitLab.cs similarity index 99% rename from .build.Nuke/Build.GitLab.cs rename to .nuke/Build.GitLab.cs index aa3ac4d..c7403af 100644 --- a/.build.Nuke/Build.GitLab.cs +++ b/.nuke/Build.GitLab.cs @@ -11,7 +11,7 @@ using System.IO.Compression; using System.Net.Http; using System.Net.Http.Json; -namespace SuCoS; +namespace SuCoS.Nuke; /// /// This is the main build file for the project. diff --git a/.build.Nuke/Build.Publish.cs b/.nuke/Build.Publish.cs similarity index 98% rename from .build.Nuke/Build.Publish.cs rename to .nuke/Build.Publish.cs index 0e5dd12..49a8f7e 100644 --- a/.build.Nuke/Build.Publish.cs +++ b/.nuke/Build.Publish.cs @@ -3,7 +3,7 @@ using Nuke.Common.IO; using Nuke.Common.Tools.DotNet; using static Nuke.Common.Tools.DotNet.DotNetTasks; -namespace SuCoS; +namespace SuCoS.Nuke; /// /// This is the main build file for the project. diff --git a/.build.Nuke/Build.Solution.cs b/.nuke/Build.Solution.cs similarity index 96% rename from .build.Nuke/Build.Solution.cs rename to .nuke/Build.Solution.cs index 2612b15..c6a8090 100644 --- a/.build.Nuke/Build.Solution.cs +++ b/.nuke/Build.Solution.cs @@ -2,7 +2,7 @@ using Nuke.Common; using Nuke.Common.IO; using Nuke.Common.ProjectModel; -namespace SuCoS; +namespace SuCoS.Nuke; /// /// This is the main build file for the project. diff --git a/.build.Nuke/Build.Test.cs b/.nuke/Build.Test.cs similarity index 98% rename from .build.Nuke/Build.Test.cs rename to .nuke/Build.Test.cs index 374b925..c525413 100644 --- a/.build.Nuke/Build.Test.cs +++ b/.nuke/Build.Test.cs @@ -9,7 +9,7 @@ using System; using static Nuke.Common.Tools.Coverlet.CoverletTasks; using static Nuke.Common.Tools.ReportGenerator.ReportGeneratorTasks; -namespace SuCoS; +namespace SuCoS.Nuke; /// /// This is the main build file for the project. @@ -27,7 +27,7 @@ sealed partial class Build : NukeBuild static AbsolutePath coverageReportSummaryDirectory => coverageReportDirectory / "Summary.txt"; Target Test => td => td - .DependsOn(Compile) + .After(Compile) .Executes(() => { _ = coverageResultDirectory.CreateDirectory(); diff --git a/.build.Nuke/Build.Version.cs b/.nuke/Build.Version.cs similarity index 99% rename from .build.Nuke/Build.Version.cs rename to .nuke/Build.Version.cs index eb19708..d0595e7 100644 --- a/.build.Nuke/Build.Version.cs +++ b/.nuke/Build.Version.cs @@ -4,7 +4,7 @@ using Nuke.Common.Tools.GitVersion; using Serilog; using System.Linq; -namespace SuCoS; +namespace SuCoS.Nuke; /// /// This is the main build file for the project. diff --git a/.build.Nuke/Build.cs b/.nuke/Build.cs similarity index 92% rename from .build.Nuke/Build.cs rename to .nuke/Build.cs index 3c144dc..a7e1ec2 100644 --- a/.build.Nuke/Build.cs +++ b/.nuke/Build.cs @@ -1,7 +1,7 @@ using Nuke.Common; using Nuke.Common.CI; -namespace SuCoS; +namespace SuCoS.Nuke; /// /// This is the main build file for the project. diff --git a/.build.Nuke/Configuration.cs b/.nuke/Configuration.cs similarity index 95% rename from .build.Nuke/Configuration.cs rename to .nuke/Configuration.cs index 5fde430..5253daa 100644 --- a/.build.Nuke/Configuration.cs +++ b/.nuke/Configuration.cs @@ -1,7 +1,7 @@ using Nuke.Common.Tooling; using System.ComponentModel; -namespace SuCoS; +namespace SuCoS.Nuke; [TypeConverter(typeof(TypeConverter))] public class Configuration : Enumeration diff --git a/.build.Nuke/Directory.Build.props b/.nuke/Directory.Build.props similarity index 100% rename from .build.Nuke/Directory.Build.props rename to .nuke/Directory.Build.props diff --git a/.build.Nuke/Directory.Build.targets b/.nuke/Directory.Build.targets similarity index 100% rename from .build.Nuke/Directory.Build.targets rename to .nuke/Directory.Build.targets diff --git a/.build.Nuke/_build_nuke.csproj b/.nuke/_nuke.csproj similarity index 100% rename from .build.Nuke/_build_nuke.csproj rename to .nuke/_nuke.csproj diff --git a/.build.Nuke/_build_nuke.csproj.DotSettings b/.nuke/_nuke.csproj.DotSettings similarity index 100% rename from .build.Nuke/_build_nuke.csproj.DotSettings rename to .nuke/_nuke.csproj.DotSettings diff --git a/SuCoS.sln b/SuCoS.sln index ba7d46a..0974c4c 100644 --- a/SuCoS.sln +++ b/SuCoS.sln @@ -7,7 +7,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "source", "source", "{1A5752 EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SuCoS", "source\SuCoS.csproj", "{2395B57B-24D7-47AB-B400-7AC6C1FCAFA1}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_build_nuke", ".build.Nuke\_build_nuke.csproj", "{26DB04F6-DA88-43D7-8F4B-535D4D68C24E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "_nuke", ".nuke\_nuke.csproj", "{26DB04F6-DA88-43D7-8F4B-535D4D68C24E}" EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "test", "test\test.csproj", "{F3D789FD-6AC5-4A45-B9AC-079035F5909C}" EndProject diff --git a/build.ps1 b/build.ps1 index b925017..8995ce7 100644 --- a/build.ps1 +++ b/build.ps1 @@ -13,7 +13,7 @@ $PSScriptRoot = Split-Path $MyInvocation.MyCommand.Path -Parent # CONFIGURATION ########################################################################### -$BuildProjectFile = "$PSScriptRoot\.build.Nuke\_build_nuke.csproj" +$BuildProjectFile = "$PSScriptRoot\.nuke\_nuke.csproj" $TempDirectory = "$PSScriptRoot\.nuke\temp" $DotNetGlobalFile = "$PSScriptRoot\..\global.json" diff --git a/build.sh b/build.sh index 7b5bb52..ebde16d 100644 --- a/build.sh +++ b/build.sh @@ -9,7 +9,7 @@ SCRIPT_DIR=$(cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd) # CONFIGURATION ########################################################################### -BUILD_PROJECT_FILE="$SCRIPT_DIR/.build.Nuke/_build_nuke.csproj" +BUILD_PROJECT_FILE="$SCRIPT_DIR/.nuke/_nuke.csproj" TEMP_DIRECTORY="$SCRIPT_DIR/.nuke/temp" DOTNET_GLOBAL_FILE="$SCRIPT_DIR/../global.json" -- GitLab