Merge e491edf into 6d5a9bd

ErpNetDocs · Sep 21, 2023 · 3b46445 · 3b46445
2 parents 6d5a9bd + e491edf
commit 3b46445
Show file tree

Hide file tree

Showing 52 changed files with 2,937 additions and 19 deletions.
diff --git a/samples/seed/dotnet/solution/CatLibrary/Class1.cs b/samples/seed/dotnet/solution/CatLibrary/Class1.cs
@@ -177,8 +177,8 @@ public void Jump(T ownType, K anotherOwnType, ref bool cheat)
         /// <summary>
         /// Addition operator of this class.
         /// </summary>
-        /// <param name="lsr">...</param>
-        /// <param name="rsr">~~~</param>
+        /// <param name="lsr">..</param>
+        /// <param name="rsr">~~</param>
         /// <returns>Result with <i>int</i> type.</returns>
         public static int operator +(Cat<T, K> lsr, int rsr) { return 1; }
 

diff --git a/src/Docfx.Dotnet/DotnetApiCatalog.cs b/src/Docfx.Dotnet/DotnetApiCatalog.cs
@@ -119,6 +119,7 @@ private static ExtractMetadataConfig ConvertConfig(MetadataJsonItemConfig config
             IncludePrivateMembers = configModel?.IncludePrivateMembers ?? false,
             GlobalNamespaceId = configModel?.GlobalNamespaceId,
             MSBuildProperties = configModel?.MSBuildProperties,
+            OutputFormat = configModel?.OutputFormat ?? default,
             OutputFolder = Path.GetFullPath(Path.Combine(outputDirectory, outputFolder)),
             CodeSourceBasePath = configModel?.CodeSourceBasePath,
             DisableDefaultFilter = configModel?.DisableDefaultFilter ?? false,

diff --git a/src/Docfx.Dotnet/ExtractMetadata/ExtractMetadataConfig.cs b/src/Docfx.Dotnet/ExtractMetadata/ExtractMetadataConfig.cs
@@ -11,6 +11,8 @@ internal class ExtractMetadataConfig
 
     public string OutputFolder { get; init; }
 
+    public MetadataOutputFormat OutputFormat { get; init; }
+
     public bool ShouldSkipMarkup { get; init; }
 
     public string FilterConfigFile { get; init; }

diff --git a/src/Docfx.Dotnet/ExtractMetadata/ExtractMetadataWorker.cs b/src/Docfx.Dotnet/ExtractMetadata/ExtractMetadataWorker.cs
@@ -138,6 +138,12 @@ await LoadCompilationFromProject(project.AbsolutePath) is { } compilation)
             return;
         }
 
+        if (_config.OutputFormat is MetadataOutputFormat.Markdown)
+        {
+            MarkdownFormatter.Save(assemblies, _config, _options);
+            return;
+        }
+
         var projectMetadataList = new List<MetadataItem>();
         var extensionMethods = assemblies.SelectMany(assembly => assembly.Item1.FindExtensionMethods()).ToArray();
         var filter = new SymbolFilter(_config, _options);