diff options
| author |  vnugent <public@vaughnnugent.com> | 2024-09-06 20:50:06 -0400 |
|---|---|---|
| committer | vnugent <public@vaughnnugent.com> | 2024-09-06 20:50:06 -0400 |
| commit | 7f1482c5d77b1b5f7e369ade925d2351d7623fa1 (patch) | |
| tree | c99a0c8a0137e940492892977ef1e4f6f42b6d52 /src/Extensions | |
| parent | 79d824cfb0e0cc9ff4fab0e0c546a83c0edaae1c (diff) | |
cleanup and add fluent-ftp as an publishing location
Diffstat (limited to 'src/Extensions')
| -rw-r--r-- | src/Extensions/BuildExtensions.cs | 2 | ||||
| -rw-r--r-- | src/Extensions/ProjectExtensions.cs | 16 |
2 files changed, 11 insertions, 7 deletions
diff --git a/src/Extensions/BuildExtensions.cs b/src/Extensions/BuildExtensions.cs index 24af05e..a7e5931 100644 --- a/src/Extensions/BuildExtensions.cs +++ b/src/Extensions/BuildExtensions.cs @@ -103,7 +103,7 @@ namespace VNLib.Tools.Build.Executor.Extensions SemVersion baseVersion; //Get latest version tag from git - Tag? vTag = mod.Repository.Tags.OrderByDescending(p => SemVersion.Parse(p.FriendlyName, style)).FirstOrDefault(); + Tag? vTag = mod.Repository.Tags.OrderByDescending(p => SemVersion.Parse(p.FriendlyName, style), SemVersion.SortOrderComparer).FirstOrDefault(); //Find the number of commits since the last tag if (vTag != null) diff --git a/src/Extensions/ProjectExtensions.cs b/src/Extensions/ProjectExtensions.cs index a24e6c5..9bb55c1 100644 --- a/src/Extensions/ProjectExtensions.cs +++ b/src/Extensions/ProjectExtensions.cs @@ -61,12 +61,14 @@ namespace VNLib.Tools.Build.Executor.Extensions //realtive file path outDir = Path.Combine(project.WorkingDir.FullName, outDir); - return new DirectoryInfo(outDir).EnumerateFiles(config.OutputFileType, SearchOption.TopDirectoryOnly); - } - else - { - return project.WorkingDir.EnumerateFiles(config.OutputFileType, SearchOption.AllDirectories); + if (Directory.Exists(outDir)) + { + return new DirectoryInfo(outDir) + .EnumerateFiles(config.OutputFileType, SearchOption.TopDirectoryOnly); + } } + + return project.WorkingDir.EnumerateFiles(config.OutputFileType, SearchOption.AllDirectories); } /// <summary> @@ -122,7 +124,9 @@ namespace VNLib.Tools.Build.Executor.Extensions public static string GetSafeProjectName(this IProject project) { - return project.ProjectName.Replace('/', '-').Replace('\\','-'); + return project.ProjectName + .Replace('/', '-') + .Replace('\\','-'); } } }
\ No newline at end of file |