Skip to content

Commit aac612e

Browse files
f7qf7q
committed
update GroongaSample
1 parent dcf1d07 commit aac612e

File tree

3 files changed

+51
-39
lines changed

3 files changed

+51
-39
lines changed

‎GroongaSample/global.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"projects": [ "src" ],
33
"sdk": {
4-
"version": "1.0.0"
4+
"version": "1.1.0"
55
}
66
}

‎GroongaSample/src/WebApiSample/Startup.cs

Lines changed: 26 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,9 @@
77
using Microsoft.Extensions.Configuration;
88
using Microsoft.Extensions.DependencyInjection;
99
using Microsoft.Extensions.Logging;
10-
using Swashbuckle.Swagger.Model;
10+
using Swashbuckle.AspNetCore.Swagger;
11+
using Swashbuckle.AspNetCore.SwaggerGen;
12+
using Swashbuckle.AspNetCore.SwaggerUI;
1113
using WebApiSample.Models;
1214
using Microsoft.EntityFrameworkCore;
1315

@@ -87,18 +89,22 @@ public void ConfigureServices(IServiceCollection services)
8789
}
8890
// Add framework services.
8991
services.AddMvc();
90-
services.AddSwaggerGen();
91-
services.ConfigureSwaggerGen(options =>
92+
services.AddSwaggerGen(c =>
9293
{
93-
options.SingleApiVersion(new Info
94-
{
95-
Version = "v1",
96-
Title = "Geo Search API",
97-
Description = "A simple api to search using geo location in Elasticsearch",
98-
TermsOfService = "None"
99-
});
100-
//options.IncludeXmlComments(pathToDoc);
101-
options.DescribeAllEnumsAsStrings();
94+
c.SwaggerDoc("v1",
95+
new Info
96+
{
97+
Version = "v1",
98+
Title = "Geo Search API",
99+
Description = "A simple api to search using geo location in Elasticsearch",
100+
TermsOfService = "None"
101+
}
102+
);
103+
104+
//var filePath = Path.Combine(PlatformServices.Default.Application.ApplicationBasePath, "MyApi.xml");
105+
//c.IncludeXmlComments(filePath);
106+
//c.IncludeXmlComments(pathToDoc);
107+
c.DescribeAllEnumsAsStrings();
102108
});
103109
}
104110

@@ -110,8 +116,14 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
110116

111117
app.UseMvc();
112118

113-
app.UseSwagger();
114-
app.UseSwaggerUi();
119+
app.UseSwagger(c =>
120+
{
121+
c.RouteTemplate = "api-docs/{documentName}/swagger.json";
122+
});
123+
app.UseSwaggerUI(c =>
124+
{
125+
c.SwaggerEndpoint("/api-docs/v1/swagger.json", "My API V1");
126+
});
115127
}
116128
}
117129
}

‎GroongaSample/src/WebApiSample/WebApiSample.csproj

Lines changed: 24 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,45 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp1.0</TargetFramework>
4+
<TargetFramework>netcoreapp1.1</TargetFramework>
55
<PreserveCompilationContext>true</PreserveCompilationContext>
66
<AssemblyName>WebApiSample</AssemblyName>
77
<OutputType>Exe</OutputType>
88
<PackageId>WebApiSample</PackageId>
9-
<RuntimeFrameworkVersion>1.0.4</RuntimeFrameworkVersion>
9+
<RuntimeFrameworkVersion>1.1.2</RuntimeFrameworkVersion>
1010
<PackageTargetFallback>$(PackageTargetFallback);dotnet5.6;portable-net45+win8</PackageTargetFallback>
1111
</PropertyGroup>
1212

1313
<ItemGroup>
14-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.0.3" />
15-
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.0.3" />
16-
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.0.2" />
17-
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.0.4" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.0.2" />
19-
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.0.2" />
20-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.0.2" />
21-
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.0.2" />
22-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.0.2" />
23-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.0.2" />
24-
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.0.2" />
25-
<PackageReference Include="Swashbuckle" Version="6.0.0-beta902" />
26-
<PackageReference Include="Swashbuckle.Swagger" Version="6.0.0-beta902" />
27-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="1.0.3" />
28-
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.0.3">
14+
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="1.1.3" />
15+
<PackageReference Include="Microsoft.AspNetCore.Routing" Version="1.1.2" />
16+
<PackageReference Include="Microsoft.AspNetCore.Server.IISIntegration" Version="1.1.2" />
17+
<PackageReference Include="Microsoft.AspNetCore.Server.Kestrel" Version="1.1.2" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration.EnvironmentVariables" Version="1.1.2" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="1.1.2" />
20+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="1.1.2" />
21+
<PackageReference Include="Microsoft.Extensions.Logging" Version="1.1.2" />
22+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="1.1.2" />
23+
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="1.1.2" />
24+
<PackageReference Include="Microsoft.Extensions.Options.ConfigurationExtensions" Version="1.1.2" />
25+
<PackageReference Include="Swashbuckle.AspNetCore" Version="1.0.0" />
26+
27+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="1.1.2" />
28+
<PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite.Design" Version="1.1.2">
2929
<PrivateAssets>All</PrivateAssets>
3030
</PackageReference>
31-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.0.3" />
32-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.0.3" />
33-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="1.0.2" />
34-
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.0.2" />
35-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="1.0.3" />
36-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.0.3">
31+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="1.1.2" />
32+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.Design" Version="1.1.2" />
33+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL" Version="1.1.1" />
34+
<PackageReference Include="Npgsql.EntityFrameworkCore.PostgreSQL.Design" Version="1.1.1" />
35+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="1.1.2" />
36+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="1.1.2">
3737
<PrivateAssets>All</PrivateAssets>
3838
</PackageReference>
3939
</ItemGroup>
4040

4141
<ItemGroup>
42-
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.0" />
42+
<DotNetCliToolReference Include="Microsoft.EntityFrameworkCore.Tools.DotNet" Version="1.0.1" />
4343
</ItemGroup>
4444

4545
</Project>

0 commit comments

Comments
 (0)