diff --git a/samples/SwaggerUI_IndexStream_Knife4jUI_Demo/SwaggerUI_IndexStream_Knife4jUI_Demo.csproj b/samples/SwaggerUI_IndexStream_Knife4jUI_Demo/SwaggerUI_IndexStream_Knife4jUI_Demo.csproj index db679e1..baaeb80 100644 --- a/samples/SwaggerUI_IndexStream_Knife4jUI_Demo/SwaggerUI_IndexStream_Knife4jUI_Demo.csproj +++ b/samples/SwaggerUI_IndexStream_Knife4jUI_Demo/SwaggerUI_IndexStream_Knife4jUI_Demo.csproj @@ -8,9 +8,9 @@ <ItemGroup> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" /> - <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="5.5.1" /> - <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.5.1" /> - <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="5.5.1" /> + <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.4" /> + <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.4" /> + <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.4" /> </ItemGroup> diff --git a/src/IGeekFan.AspNetCore.Knife4jUI/IGeekFan.AspNetCore.Knife4jUI.csproj b/src/IGeekFan.AspNetCore.Knife4jUI/IGeekFan.AspNetCore.Knife4jUI.csproj index 177e6a5..fcda3f7 100644 --- a/src/IGeekFan.AspNetCore.Knife4jUI/IGeekFan.AspNetCore.Knife4jUI.csproj +++ b/src/IGeekFan.AspNetCore.Knife4jUI/IGeekFan.AspNetCore.Knife4jUI.csproj @@ -19,8 +19,13 @@ <PackageLicenseExpression></PackageLicenseExpression> <AssemblyVersion>0.0.8.0</AssemblyVersion> <FileVersion>0.0.8.0</FileVersion> + <PublishRepositoryUrl>true</PublishRepositoryUrl> + <EmbedUntrackedSources>true</EmbedUntrackedSources> + <AllowedOutputExtensionsInPackageBuildOutputFolder>$(AllowedOutputExtensionsInPackageBuildOutputFolder);.pdb</AllowedOutputExtensionsInPackageBuildOutputFolder> </PropertyGroup> - + <ItemGroup> + <PackageReference Include="Microsoft.SourceLink.GitHub" Version="1.0.0" PrivateAssets="All"/> + </ItemGroup> <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' "> <PackageReference Include="Microsoft.AspNetCore.Routing" Version="2.1.0" /> <PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.1.0" /> diff --git a/test/Basic/Basic.csproj b/test/Basic/Basic.csproj index b872dee..8b268e5 100644 --- a/test/Basic/Basic.csproj +++ b/test/Basic/Basic.csproj @@ -1,14 +1,14 @@ <Project Sdk="Microsoft.NET.Sdk.Web"> <PropertyGroup> - <TargetFramework>netcoreapp3.0</TargetFramework> + <TargetFramework>netcoreapp3.1</TargetFramework> <NoWarn>$(NoWarn);1591</NoWarn> <GenerateDocumentationFile>true</GenerateDocumentationFile> </PropertyGroup> <ItemGroup> - <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="5.5.1" /> - <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="5.5.1" /> + <PackageReference Include="Swashbuckle.AspNetCore.Annotations" Version="6.1.4" /> + <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.4" /> </ItemGroup> <ItemGroup> diff --git a/test/Basic/Startup.cs b/test/Basic/Startup.cs index 64c9007..503030d 100644 --- a/test/Basic/Startup.cs +++ b/test/Basic/Startup.cs @@ -103,13 +103,13 @@ namespace Basic app.UseSwaggerUI(c => { - c.RoutePrefix = ""; // serve the UI at root + c.RoutePrefix = "swagger"; // serve the UI at root c.SwaggerEndpoint("/v1/api-docs", "V1 Docs"); c.SwaggerEndpoint("/gp/api-docs", "��¼ģ��"); }); app.UseKnife4UI(c => { - //c.RoutePrefix = ""; // serve the UI at root + c.RoutePrefix = ""; // serve the UI at root c.SwaggerEndpoint("/v1/api-docs", "V1 Docs"); c.SwaggerEndpoint("/gp/api-docs", "��¼ģ��"); }); diff --git a/test/Knife4jUIDemo/Knife4jUIDemo.csproj b/test/Knife4jUIDemo/Knife4jUIDemo.csproj index 0e6231a..1a330bf 100644 --- a/test/Knife4jUIDemo/Knife4jUIDemo.csproj +++ b/test/Knife4jUIDemo/Knife4jUIDemo.csproj @@ -11,7 +11,7 @@ </PropertyGroup> <ItemGroup> - <PackageReference Include="Swashbuckle.AspNetCore" Version="5.5.1" /> + <PackageReference Include="Swashbuckle.AspNetCore" Version="6.1.4" /> <PackageReference Include="Microsoft.VisualStudio.Azure.Containers.Tools.Targets" Version="1.10.9" /> </ItemGroup> diff --git a/test/Knife4jUIDemo/Startup.cs b/test/Knife4jUIDemo/Startup.cs index 43e43a1..54c32a4 100644 --- a/test/Knife4jUIDemo/Startup.cs +++ b/test/Knife4jUIDemo/Startup.cs @@ -60,6 +60,7 @@ namespace Knife4jUIDemo app.UseSwaggerUI(c => { + c.RoutePrefix = "swagger"; // serve the UI at root c.SwaggerEndpoint("/v1/api-docs", "LinCms"); }); diff --git a/test/WebSites/NSwag.Swagger.Knife4jUI/Startup.cs b/test/WebSites/NSwag.Swagger.Knife4jUI/Startup.cs index b5f8dce..faf7abe 100644 --- a/test/WebSites/NSwag.Swagger.Knife4jUI/Startup.cs +++ b/test/WebSites/NSwag.Swagger.Knife4jUI/Startup.cs @@ -55,6 +55,7 @@ namespace NSwag.Swagger.Knife4jUI }); app.UseKnife4UI(c => { + c.RoutePrefix = ""; // serve the UI at root // c.RoutePrefix = "/docs"; // serve the UI at root c.SwaggerEndpoint("/swagger/v1/swagger.json", "V1 Docs"); }); diff --git a/test/WebSites/OAuth2Integration/OAuth2Integration.csproj b/test/WebSites/OAuth2Integration/OAuth2Integration.csproj index a2a2ce0..32ddaf2 100644 --- a/test/WebSites/OAuth2Integration/OAuth2Integration.csproj +++ b/test/WebSites/OAuth2Integration/OAuth2Integration.csproj @@ -1,16 +1,16 @@ <Project Sdk="Microsoft.NET.Sdk.Web"> <PropertyGroup> - <TargetFramework>netcoreapp3.0</TargetFramework> + <TargetFramework>netcoreapp3.1</TargetFramework> </PropertyGroup> <ItemGroup> <PackageReference Include="IdentityServer4" Version="3.0.2" /> <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.1" /> <PackageReference Include="NCaptcha.AspNetCore.SessionImages" Version="0.1.0" /> - <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="5.5.1" /> - <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="5.5.1" /> - <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="5.5.1" /> + <PackageReference Include="Swashbuckle.AspNetCore.Swagger" Version="6.1.4" /> + <PackageReference Include="Swashbuckle.AspNetCore.SwaggerGen" Version="6.1.4" /> + <PackageReference Include="Swashbuckle.AspNetCore.SwaggerUi" Version="6.1.4" /> </ItemGroup> <ItemGroup>