diff --git a/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.csproj b/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.csproj index 99066c0b9b..3ace59af1e 100644 --- a/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.csproj +++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo.Docs.Domain.Shared.csproj @@ -10,6 +10,10 @@ + + + + diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/Version/SemanticVersionHelper.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Version/SemanticVersionHelper.cs similarity index 83% rename from modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/Version/SemanticVersionHelper.cs rename to modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Version/SemanticVersionHelper.cs index fbd315f834..5b5f25fac7 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/Version/SemanticVersionHelper.cs +++ b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Documents/Version/SemanticVersionHelper.cs @@ -7,24 +7,24 @@ using Volo.Docs.Projects; namespace Volo.Docs.GitHub.Documents.Version { - public class SemanticVersionHelper : IVersionHelper, ITransientDependency + public static class SemanticVersionHelper { - public List OrderByDescending(List versions) + public static List OrderByDescending(List versions) { return versions.OrderByDescending(v=> SemanticVersion.Parse(NormalizeVersion(v)), new VersionComparer()).ToList(); } - public List OrderByDescending(List versions) + public static List OrderByDescending(List versions) { return versions.OrderByDescending(v => SemanticVersion.Parse(NormalizeVersion(v.Name)), new VersionComparer()).ToList(); } - public bool IsPreRelease(string version) + public static bool IsPreRelease(string version) { return SemanticVersion.Parse(NormalizeVersion(version)).IsPrerelease; } - private string NormalizeVersion(string version) + private static string NormalizeVersion(string version) { version = version.RemovePreFix("v"); diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/VersionInfo.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Projects/VersionInfo.cs similarity index 100% rename from modules/docs/src/Volo.Docs.Domain/Volo/Docs/Projects/VersionInfo.cs rename to modules/docs/src/Volo.Docs.Domain.Shared/Volo/Docs/Projects/VersionInfo.cs diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Extensions/DocsJsonSerializerHelper.cs b/modules/docs/src/Volo.Docs.Domain.Shared/Volo/Extensions/DocsJsonSerializerHelper.cs similarity index 100% rename from modules/docs/src/Volo.Docs.Domain/Volo/Extensions/DocsJsonSerializerHelper.cs rename to modules/docs/src/Volo.Docs.Domain.Shared/Volo/Extensions/DocsJsonSerializerHelper.cs diff --git a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj index 64af5f4066..79f6a77679 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj +++ b/modules/docs/src/Volo.Docs.Domain/Volo.Docs.Domain.csproj @@ -21,7 +21,6 @@ - diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs index dfc79f7547..d03d8078e4 100644 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs +++ b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/GithubDocumentSource.cs @@ -23,13 +23,11 @@ namespace Volo.Docs.GitHub.Documents private readonly IGithubRepositoryManager _githubRepositoryManager; private readonly IGithubPatchAnalyzer _githubPatchAnalyzer; - private readonly IVersionHelper _versionHelper; - public GithubDocumentSource(IGithubRepositoryManager githubRepositoryManager, IGithubPatchAnalyzer githubPatchAnalyzer, IVersionHelper versionHelper) + public GithubDocumentSource(IGithubRepositoryManager githubRepositoryManager, IGithubPatchAnalyzer githubPatchAnalyzer) { _githubRepositoryManager = githubRepositoryManager; _githubPatchAnalyzer = githubPatchAnalyzer; - _versionHelper = versionHelper; } public virtual async Task GetDocumentAsync(Project project, string documentName, string languageCode, string version, DateTime? lastKnownSignificantUpdateTime = null) @@ -277,7 +275,7 @@ namespace Volo.Docs.GitHub.Documents } } - versions = _versionHelper.OrderByDescending(versions); + versions = SemanticVersionHelper.OrderByDescending(versions); } if(githubVersionProviderSource == GithubVersionProviderSource.Releases) @@ -288,7 +286,7 @@ namespace Volo.Docs.GitHub.Documents } else { - versions = _versionHelper.OrderByDescending(versions); + versions = SemanticVersionHelper.OrderByDescending(versions); } } diff --git a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/Version/IVersionHelper.cs b/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/Version/IVersionHelper.cs deleted file mode 100644 index 67bed57093..0000000000 --- a/modules/docs/src/Volo.Docs.Domain/Volo/Docs/GitHub/Documents/Version/IVersionHelper.cs +++ /dev/null @@ -1,14 +0,0 @@ -using System.Collections.Generic; -using Volo.Docs.Projects; - -namespace Volo.Docs.GitHub.Documents.Version -{ - public interface IVersionHelper - { - List OrderByDescending(List versions); - - List OrderByDescending(List versions); - - bool IsPreRelease(string version); - } -} diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs index 6a23afba29..048d1031f7 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Project/Index.cshtml.cs @@ -83,7 +83,6 @@ namespace Volo.Docs.Pages.Documents.Project private readonly IDocumentToHtmlConverterFactory _documentToHtmlConverterFactory; private readonly IProjectAppService _projectAppService; private readonly IDocumentSectionRenderer _documentSectionRenderer; - private readonly IVersionHelper _versionHelper; private readonly DocsUiOptions _uiOptions; public IndexModel( @@ -91,8 +90,7 @@ namespace Volo.Docs.Pages.Documents.Project IDocumentToHtmlConverterFactory documentToHtmlConverterFactory, IProjectAppService projectAppService, IOptions options, - IDocumentSectionRenderer documentSectionRenderer, - IVersionHelper versionHelper) + IDocumentSectionRenderer documentSectionRenderer) { ObjectMapperContext = typeof(DocsWebModule); @@ -100,7 +98,6 @@ namespace Volo.Docs.Pages.Documents.Project _documentToHtmlConverterFactory = documentToHtmlConverterFactory; _projectAppService = projectAppService; _documentSectionRenderer = documentSectionRenderer; - _versionHelper = versionHelper; _uiOptions = options.Value; LocalizationResourceType = typeof(DocsResource); @@ -331,7 +328,7 @@ namespace Volo.Docs.Pages.Documents.Project } } - return versions.FirstOrDefault(v => !_versionHelper.IsPreRelease(v.Version)) ?? versions.First(); + return versions.FirstOrDefault(v => !SemanticVersionHelper.IsPreRelease(v.Version)) ?? versions.First(); } private string RemoveVersionPrefix(string version) @@ -356,7 +353,7 @@ namespace Volo.Docs.Pages.Documents.Project if (!Project.ExtraProperties.ContainsKey("GithubVersionProviderSource") || (GithubVersionProviderSource) (long) Project.ExtraProperties["GithubVersionProviderSource"] == GithubVersionProviderSource.Releases) { - versions.First(v=> !_versionHelper.IsPreRelease(v.Version)).Version = Project.LatestVersionBranchName; + versions.First(v=> !SemanticVersionHelper.IsPreRelease(v.Version)).Version = Project.LatestVersionBranchName; } } diff --git a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs index fbd58275ff..d1f7b50b70 100644 --- a/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs +++ b/modules/docs/src/Volo.Docs.Web/Pages/Documents/Search.cshtml.cs @@ -30,17 +30,14 @@ namespace Volo.Docs.Pages.Documents private readonly IProjectAppService _projectAppService; private readonly IDocumentAppService _documentAppService; private readonly HtmlEncoder _encoder; - private readonly IVersionHelper _versionHelper; public SearchModel(IProjectAppService projectAppService, IDocumentAppService documentAppService, - HtmlEncoder encoder, - IVersionHelper versionHelper) + HtmlEncoder encoder) { _projectAppService = projectAppService; _documentAppService = documentAppService; _encoder = encoder; - _versionHelper = versionHelper; } public List SearchOutputs { get; set; } = new List(); @@ -71,7 +68,7 @@ namespace Volo.Docs.Pages.Documents } else { - Version = (versions.FirstOrDefault(v => !_versionHelper.IsPreRelease(v.Name)) ?? versions.First()).Name; + Version = (versions.FirstOrDefault(v => !SemanticVersionHelper.IsPreRelease(v.Name)) ?? versions.First()).Name; } } diff --git a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj index 90d738f09e..c2d91d6154 100644 --- a/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj +++ b/modules/docs/src/Volo.Docs.Web/Volo.Docs.Web.csproj @@ -20,7 +20,6 @@ -