huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use OSS package versions consistent with aspnet/benchmarks and Microsoft.AspNetcore.All 2.1.2 

- update our own NuGet packages to align lower-level dependencies
- add metadata to BasicApi controllers
  - avoids analyzer failures when building with Microsoft.AspNetCore.All e.g. in benchmark runs
  - especially important in `PetController` because it's associated with `[ApiContoller]`
- use pooled `DbContext`s for MySql too
This commit is contained in:
Doug Bunting 2018-07-05 12:03:04 -07:00
parent 814a803ed8
commit c34830f9de
No known key found for this signature in database
GPG Key ID: 888B4EB7822B32E9
5 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
benchmarkapps/BasicApi/Controllers/PetController.cs
View File

@ -25,6 +25,9 @@ namespace BasicApi.Controllers
public BasicApiContext DbContext { get; } public BasicApiContext DbContext { get; }
[HttpGet("{id}", Name = "FindPetById")] [HttpGet("{id}", Name = "FindPetById")]
[ProducesResponseType(typeof(Pet), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult<Pet>> FindById(int id) public async Task<ActionResult<Pet>> FindById(int id)
{ {
var pet = await DbContext.Pets var pet = await DbContext.Pets
@ -42,6 +45,8 @@ namespace BasicApi.Controllers
[AllowAnonymous] [AllowAnonymous]
[HttpGet("anonymous/{id}")] [HttpGet("anonymous/{id}")]
[ProducesResponseType(typeof(Pet), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult<Pet>> FindByIdWithoutToken(int id) public async Task<ActionResult<Pet>> FindByIdWithoutToken(int id)
{ {
var pet = await DbContext.Pets var pet = await DbContext.Pets
@ -58,6 +63,9 @@ namespace BasicApi.Controllers
} }
[HttpGet("findByCategory/{categoryId}")] [HttpGet("findByCategory/{categoryId}")]
[ProducesResponseType(typeof(Pet), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult<Pet>> FindByCategory(int categoryId) public async Task<ActionResult<Pet>> FindByCategory(int categoryId)
{ {
var pet = await DbContext.Pets var pet = await DbContext.Pets
@ -74,6 +82,9 @@ namespace BasicApi.Controllers
} }
[HttpGet("findByStatus")] [HttpGet("findByStatus")]
[ProducesResponseType(typeof(Pet), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult<Pet>> FindByStatus(string status) public async Task<ActionResult<Pet>> FindByStatus(string status)
{ {
var pet = await DbContext.Pets var pet = await DbContext.Pets
@ -90,6 +101,9 @@ namespace BasicApi.Controllers
} }
[HttpGet("findByTags")] [HttpGet("findByTags")]
[ProducesResponseType(typeof(Pet), StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status404NotFound)]
public async Task<ActionResult<Pet>> FindByTags(string[] tags) public async Task<ActionResult<Pet>> FindByTags(string[] tags)
{ {
var pet = await DbContext.Pets var pet = await DbContext.Pets
@ -107,6 +121,9 @@ namespace BasicApi.Controllers
[Authorize("pet-store-writer")] [Authorize("pet-store-writer")]
[HttpPost] [HttpPost]
[ProducesResponseType(StatusCodes.Status201Created)]
[ProducesResponseType(StatusCodes.Status401Unauthorized)]
[ProducesResponseType(StatusCodes.Status403Forbidden)]
public async Task<IActionResult> AddPet([FromBody] Pet pet) public async Task<IActionResult> AddPet([FromBody] Pet pet)
{ {
DbContext.Pets.Add(pet); DbContext.Pets.Add(pet);

5
benchmarkapps/BasicApi/Controllers/TokenController.cs
View File

@ -7,6 +7,7 @@ using System.IdentityModel.Tokens.Jwt;
using System.Linq; using System.Linq;
using System.Security.Claims; using System.Security.Claims;
using Microsoft.AspNetCore.Authentication.JwtBearer; using Microsoft.AspNetCore.Authentication.JwtBearer;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc; using Microsoft.AspNetCore.Mvc;
using Microsoft.Extensions.Options; using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Tokens; using Microsoft.IdentityModel.Tokens;
@ -45,11 +46,13 @@ namespace BasicApi.Controllers
} }
[HttpGet("/token")] [HttpGet("/token")]
[ProducesResponseType(StatusCodes.Status200OK)]
[ProducesResponseType(StatusCodes.Status403Forbidden)]
public IActionResult GetToken(string username) public IActionResult GetToken(string username)
{ {
if (username == null || !_identities.TryGetValue(username, out var identity)) if (username == null || !_identities.TryGetValue(username, out var identity))
{ {
return new StatusCodeResult(403); return new StatusCodeResult(StatusCodes.Status403Forbidden);
} }
var handler = _options.SecurityTokenValidators.OfType<JwtSecurityTokenHandler>().First(); var handler = _options.SecurityTokenValidators.OfType<JwtSecurityTokenHandler>().First();

2
benchmarkapps/BasicApi/Startup.cs
View File

@ -68,7 +68,7 @@ namespace BasicApi
case "MYSQL": case "MYSQL":
services services
.AddEntityFrameworkMySql() .AddEntityFrameworkMySql()
.AddDbContext<BasicApiContext>(options => options.UseMySql(connectionString)); .AddDbContextPool<BasicApiContext>(options => options.UseMySql(connectionString));
break; break;
#endif #endif

2
benchmarkapps/BasicViews/Startup.cs
View File

@ -49,7 +49,7 @@ namespace BasicViews
case "MYSQL": case "MYSQL":
services services
.AddEntityFrameworkMySql() .AddEntityFrameworkMySql()
.AddDbContext<BasicViewsContext>(options => options.UseMySql(connectionString)); .AddDbContextPool<BasicViewsContext>(options => options.UseMySql(connectionString));
break; break;
#endif #endif

12
build/dependencies.props
View File

@ -10,12 +10,12 @@
<AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion> <AngleSharpPackageVersion>0.9.9</AngleSharpPackageVersion>
<BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion> <BenchmarkDotNetPackageVersion>0.10.13</BenchmarkDotNetPackageVersion>
<BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>2.1.0</BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion> <BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreDesignPackageVersion>
<BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.0</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion> <BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlitePackageVersion>
<BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.0</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion> <BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion>2.1.1</BenchmarksOnlyMicrosoftEntityFrameworkCoreSqlServerPackageVersion>
<BenchmarksOnlyMySqlConnectorPackageVersion>0.42.1</BenchmarksOnlyMySqlConnectorPackageVersion> <BenchmarksOnlyMySqlConnectorPackageVersion>0.43.0</BenchmarksOnlyMySqlConnectorPackageVersion>
<BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion>2.1.0</BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion> <BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion>2.1.1.1</BenchmarksOnlyNpgsqlEntityFrameworkCorePostgreSQLPackageVersion>
<BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion>2.1.0-rc1-final</BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion> <BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion>2.1.1</BenchmarksOnlyPomeloEntityFrameworkCoreMySqlPackageVersion>
<InternalAspNetCoreAnalyzersPackageVersion>2.2.0-preview1-34823</InternalAspNetCoreAnalyzersPackageVersion> <InternalAspNetCoreAnalyzersPackageVersion>2.2.0-preview1-34823</InternalAspNetCoreAnalyzersPackageVersion>
<InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17102</InternalAspNetCoreSdkPackageVersion> <InternalAspNetCoreSdkPackageVersion>2.2.0-preview1-17102</InternalAspNetCoreSdkPackageVersion>
<MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-34823</MicrosoftAspNetCoreAllPackageVersion> <MicrosoftAspNetCoreAllPackageVersion>2.2.0-preview1-34823</MicrosoftAspNetCoreAllPackageVersion>