Fix #13

Fix #14
unchase · Jul 29, 2020 · a4ee18d · a4ee18d
1 parent a3d1193
commit a4ee18d
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,7 +8,12 @@
 
 These are the changes to each version that has been released on the [nuget](https://www.nuget.org/packages/Unchase.Swashbuckle.AspNetCore.Extensions/).
 
-## v2.3.9 `(2020-07-11)`
+## v2.3.10 `(2020-07-29)`
+
+- [x] Fix [issue #13](https://github.com/unchase/Unchase.Swashbuckle.AspNetCore.Extensions/issues/13)
+- [x] Fix [issue #14](https://github.com/unchase/Unchase.Swashbuckle.AspNetCore.Extensions/issues/14)
+
+## v2.3.9 `(2020-07-28)`
 
 - [x] Update nuget dependencies for sample WebAPI
 - [x] Fix [issue #12](https://github.com/unchase/Unchase.Swashbuckle.AspNetCore.Extensions/issues/12)

diff --git a/README.md b/README.md
@@ -103,6 +103,9 @@ public void ConfigureServices(IServiceCollection services)
     {
         options.SwaggerDoc("v1", new OpenApiInfo { Title = "My API", Version = "v1" });
 
+        // use it if you want to hide Paths and Definitions from OpenApi documentation correctly
+        options.UseAllOfToExtendReferenceSchemas();
+
         // if you want to add xml comments into the swagger documentation, first of all add:
         var xmlFilePath = Path.Combine(AppContext.BaseDirectory, "WebApi3.1-Swashbuckle.xml");
         options.IncludeXmlComments(xmlFilePath);

diff --git a/src/Unchase.Swashbuckle.AspNetCore.Extensions/Extensions/EnumTypeExtensions.cs b/src/Unchase.Swashbuckle.AspNetCore.Extensions/Extensions/EnumTypeExtensions.cs
@@ -102,7 +102,10 @@ private static string TryGetMemberComments(MemberInfo memberInfo, IEnumerable<XP
                 var xpathNavigator1 = xmlNavigator.SelectSingleNode(
                     $"/doc/members/member[@name='{nodeNameForMember}']");
                 var xpathNavigator2 = xpathNavigator1?.SelectSingleNode("summary");
-                return xpathNavigator2 != null ? XmlCommentsTextHelper.Humanize(xpathNavigator2.InnerXml) : string.Empty;
+                if (xpathNavigator2 != null)
+                {
+                    return XmlCommentsTextHelper.Humanize(xpathNavigator2.InnerXml);
+                }
             }
 
             return string.Empty;

diff --git a/...nchase.Swashbuckle.AspNetCore.Extensions/Unchase.Swashbuckle.AspNetCore.Extensions.csproj b/...nchase.Swashbuckle.AspNetCore.Extensions/Unchase.Swashbuckle.AspNetCore.Extensions.csproj
@@ -14,9 +14,9 @@
     <NeutralLanguage></NeutralLanguage>
     <LangVersion>7.3</LangVersion>
     <PackageIconUrl>https://github.com/unchase/Unchase.Swashbuckle.AspNetCore.Extensions/blob/master/assets/icon.png?raw=true</PackageIconUrl>
-    <Version>2.3.9</Version>
-    <AssemblyVersion>2.3.9.0</AssemblyVersion>
-    <FileVersion>2.3.9.0</FileVersion>
+    <Version>2.3.10</Version>
+    <AssemblyVersion>2.3.10.0</AssemblyVersion>
+    <FileVersion>2.3.10.0</FileVersion>
     <GeneratePackageOnBuild>false</GeneratePackageOnBuild>
     <DocumentationFile>Unchase.Swashbuckle.AspNetCore.Extensions.xml</DocumentationFile>
   </PropertyGroup>

diff --git a/test/WebApi3.1-Swashbuckle/Startup.cs b/test/WebApi3.1-Swashbuckle/Startup.cs
@@ -31,6 +31,9 @@ public void ConfigureServices(IServiceCollection services)
             {
                 options.SwaggerDoc("v1", new OpenApiInfo { Title = "My API", Version = "v1" });
 
+                // use it if you want to hide Paths and Definitions from OpenApi documentation correctly
+                options.UseAllOfToExtendReferenceSchemas();
+
                 #region AddEnumsWithValuesFixFilters
 
                 // if you want to add xml comments into the swagger documentation, first of all add: