Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit26193a4

Browse files
Updated to ASP.NET Core 3.0
1 parentcbce7b4 commit26193a4

File tree

10 files changed

+79
-167
lines changed

10 files changed

+79
-167
lines changed

‎SampleWebApiAspNetCore.Test/ControllerTests/v1/FoodsControllerTests.cs‎

Lines changed: 0 additions & 71 deletions
This file was deleted.

‎SampleWebApiAspNetCore.Test/SampleWebApiAspNetCore.Test.csproj‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

‎SampleWebApiAspNetCore.Test/TestClientProvider.cs‎

Lines changed: 0 additions & 21 deletions
This file was deleted.

‎SampleWebApiAspNetCore.sln‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
3-
# Visual Studio15
4-
VisualStudioVersion =15.0.27703.2026
3+
# Visual StudioVersion 16
4+
VisualStudioVersion =16.0.29318.209
55
MinimumVisualStudioVersion =10.0.40219.1
66
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") ="SampleWebApiAspNetCore","SampleWebApiAspNetCore\SampleWebApiAspNetCore.csproj","{62E0EE7C-8CF6-4E04-B3A1-49A19DE3FC75}"
77
EndProject
8-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") ="SampleWebApiAspNetCore.Test","SampleWebApiAspNetCore.Test\SampleWebApiAspNetCore.Test.csproj","{34867F50-D123-4211-82F1-9561725F7833}"
9-
EndProject
108
Global
119
GlobalSection(SolutionConfigurationPlatforms) =preSolution
1210
Debug|Any CPU=Debug|Any CPU
@@ -17,10 +15,6 @@ Global
1715
{62E0EE7C-8CF6-4E04-B3A1-49A19DE3FC75}.Debug|Any CPU.Build.0=Debug|Any CPU
1816
{62E0EE7C-8CF6-4E04-B3A1-49A19DE3FC75}.Release|Any CPU.ActiveCfg=Release|Any CPU
1917
{62E0EE7C-8CF6-4E04-B3A1-49A19DE3FC75}.Release|Any CPU.Build.0=Release|Any CPU
20-
{34867F50-D123-4211-82F1-9561725F7833}.Debug|Any CPU.ActiveCfg=Debug|Any CPU
21-
{34867F50-D123-4211-82F1-9561725F7833}.Debug|Any CPU.Build.0=Debug|Any CPU
22-
{34867F50-D123-4211-82F1-9561725F7833}.Release|Any CPU.ActiveCfg=Release|Any CPU
23-
{34867F50-D123-4211-82F1-9561725F7833}.Release|Any CPU.Build.0=Release|Any CPU
2418
EndGlobalSection
2519
GlobalSection(SolutionProperties) =preSolution
2620
HideSolutionNode =FALSE

‎SampleWebApiAspNetCore/Controllers/v1/FoodsController.cs‎

Lines changed: 16 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,15 @@ public class FoodsController : ControllerBase
2020
{
2121
privatereadonlyIFoodRepository_foodRepository;
2222
privatereadonlyIUrlHelper_urlHelper;
23+
privatereadonlyIMapper_mapper;
2324

24-
publicFoodsController(IUrlHelperurlHelper,IFoodRepositoryfoodRepository)
25+
publicFoodsController(
26+
IUrlHelperurlHelper,
27+
IFoodRepositoryfoodRepository,
28+
IMappermapper)
2529
{
2630
_foodRepository=foodRepository;
31+
_mapper=mapper;
2732
_urlHelper=urlHelper;
2833
}
2934

@@ -78,7 +83,7 @@ public ActionResult<FoodItemDto> AddFood([FromBody] FoodCreateDto foodCreateDto)
7883
returnBadRequest();
7984
}
8085

81-
FoodItemtoAdd=Mapper.Map<FoodItem>(foodCreateDto);
86+
FoodItemtoAdd=_mapper.Map<FoodItem>(foodCreateDto);
8287

8388
_foodRepository.Add(toAdd);
8489

@@ -90,7 +95,7 @@ public ActionResult<FoodItemDto> AddFood([FromBody] FoodCreateDto foodCreateDto)
9095
FoodItemnewFoodItem=_foodRepository.GetSingle(toAdd.Id);
9196

9297
returnCreatedAtRoute(nameof(GetSingleFood),new{id=newFoodItem.Id},
93-
Mapper.Map<FoodItemDto>(newFoodItem));
98+
_mapper.Map<FoodItemDto>(newFoodItem));
9499
}
95100

96101
[HttpPatch("{id:int}",Name=nameof(PartiallyUpdateFood))]
@@ -108,8 +113,8 @@ public ActionResult<FoodItemDto> PartiallyUpdateFood(int id, [FromBody] JsonPatc
108113
returnNotFound();
109114
}
110115

111-
FoodUpdateDtofoodUpdateDto=Mapper.Map<FoodUpdateDto>(existingEntity);
112-
patchDoc.ApplyTo(foodUpdateDto,ModelState);
116+
FoodUpdateDtofoodUpdateDto=_mapper.Map<FoodUpdateDto>(existingEntity);
117+
patchDoc.ApplyTo(foodUpdateDto);
113118

114119
TryValidateModel(foodUpdateDto);
115120

@@ -118,15 +123,15 @@ public ActionResult<FoodItemDto> PartiallyUpdateFood(int id, [FromBody] JsonPatc
118123
returnBadRequest(ModelState);
119124
}
120125

121-
Mapper.Map(foodUpdateDto,existingEntity);
126+
_mapper.Map(foodUpdateDto,existingEntity);
122127
FoodItemupdated=_foodRepository.Update(id,existingEntity);
123128

124129
if(!_foodRepository.Save())
125130
{
126131
thrownewException("Updating a fooditem failed on save.");
127132
}
128133

129-
returnOk(Mapper.Map<FoodItemDto>(updated));
134+
returnOk(_mapper.Map<FoodItemDto>(updated));
130135
}
131136

132137
[HttpDelete]
@@ -166,7 +171,7 @@ public ActionResult<FoodItemDto> UpdateFood(int id, [FromBody]FoodUpdateDto food
166171
returnNotFound();
167172
}
168173

169-
Mapper.Map(foodUpdateDto,existingFoodItem);
174+
_mapper.Map(foodUpdateDto,existingFoodItem);
170175

171176
_foodRepository.Update(id,existingFoodItem);
172177

@@ -175,7 +180,7 @@ public ActionResult<FoodItemDto> UpdateFood(int id, [FromBody]FoodUpdateDto food
175180
thrownewException("Updating a fooditem failed on save.");
176181
}
177182

178-
returnOk(Mapper.Map<FoodItemDto>(existingFoodItem));
183+
returnOk(_mapper.Map<FoodItemDto>(existingFoodItem));
179184
}
180185

181186
[HttpGet("GetRandomMeal",Name=nameof(GetRandomMeal))]
@@ -184,7 +189,7 @@ public ActionResult GetRandomMeal()
184189
ICollection<FoodItem>foodItems=_foodRepository.GetRandomMeal();
185190

186191
IEnumerable<FoodItemDto>dtos=foodItems
187-
.Select(x=>Mapper.Map<FoodItemDto>(x));
192+
.Select(x=>_mapper.Map<FoodItemDto>(x));
188193

189194
varlinks=newList<LinkDto>();
190195

@@ -255,7 +260,7 @@ private List<LinkDto> CreateLinksForCollection(QueryParameters queryParameters,
255260
privatedynamicExpandSingleFoodItem(FoodItemfoodItem)
256261
{
257262
varlinks=GetLinks(foodItem.Id);
258-
FoodItemDtoitem=Mapper.Map<FoodItemDto>(foodItem);
263+
FoodItemDtoitem=_mapper.Map<FoodItemDto>(foodItem);
259264

260265
varresourceToReturn=item.ToDynamic()asIDictionary<string,object>;
261266
resourceToReturn.Add("links",links);
Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
usingAutoMapper;
2+
usingSampleWebApiAspNetCore.Dtos;
3+
usingSampleWebApiAspNetCore.Entities;
4+
5+
namespaceSampleWebApiAspNetCore.MappingProfiles
6+
{
7+
publicclassFoodMappings:Profile
8+
{
9+
publicFoodMappings()
10+
{
11+
CreateMap<FoodItem,FoodItemDto>().ReverseMap();
12+
CreateMap<FoodItem,FoodUpdateDto>().ReverseMap();
13+
CreateMap<FoodItem,FoodCreateDto>().ReverseMap();
14+
}
15+
}
16+
}

‎SampleWebApiAspNetCore/Program.cs‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
usingMicrosoft.AspNetCore;
22
usingMicrosoft.AspNetCore.Hosting;
33
usingMicrosoft.Extensions.DependencyInjection;
4+
usingMicrosoft.Extensions.Hosting;
45
usingMicrosoft.Extensions.Logging;
56
usingSampleWebApiAspNetCore.Repositories;
67
usingSampleWebApiAspNetCore.Services;
@@ -12,7 +13,7 @@ public class Program
1213
{
1314
publicstaticvoidMain(string[]args)
1415
{
15-
varhost=CreateWebHostBuilder(args).Build();
16+
varhost=CreateHostBuilder(args).Build();
1617

1718
// Initializes db.
1819
using(varscope=host.Services.CreateScope())
@@ -34,8 +35,11 @@ public static void Main(string[] args)
3435
host.Run();
3536
}
3637

37-
publicstaticIWebHostBuilderCreateWebHostBuilder(string[]args)=>
38-
WebHost.CreateDefaultBuilder(args)
39-
.UseStartup<Startup>();
38+
publicstaticIHostBuilderCreateHostBuilder(string[]args)=>
39+
Host.CreateDefaultBuilder(args)
40+
.ConfigureWebHostDefaults(webBuilder=>
41+
{
42+
webBuilder.UseStartup<Startup>();
43+
});
4044
}
4145
}
Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<ProjectSdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
</PropertyGroup>
77

@@ -10,12 +10,19 @@
1010
</ItemGroup>
1111

1212
<ItemGroup>
13-
<PackageReferenceInclude="AutoMapper"Version="8.1.0" />
14-
<PackageReferenceInclude="Microsoft.AspNetCore.App" />
15-
<PackageReferenceInclude="Microsoft.AspNetCore.Mvc.Versioning"Version="3.1.2" />
16-
<PackageReferenceInclude="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer"Version="3.2.0" />
17-
<PackageReferenceInclude="Swashbuckle.AspNetCore"Version="4.0.1" />
18-
<PackageReferenceInclude="System.Linq.Dynamic.Core"Version="1.0.14" />
13+
<PackageReferenceInclude="AutoMapper"Version="9.0.0" />
14+
<PackageReferenceInclude="AutoMapper.Extensions.Microsoft.DependencyInjection"Version="7.0.0" />
15+
<PackageReferenceInclude="Microsoft.AspNetCore.Mvc.NewtonsoftJson"Version="3.0.0" />
16+
<PackageReferenceInclude="Microsoft.AspNetCore.Mvc.Versioning"Version="4.0.0-preview8.19405.7" />
17+
<PackageReferenceInclude="Microsoft.AspNetCore.Mvc.Versioning.ApiExplorer"Version="4.0.0-preview8.19405.7" />
18+
<PackageReferenceInclude="Microsoft.EntityFrameworkCore.InMemory"Version="3.0.0" />
19+
<PackageReferenceInclude="Microsoft.EntityFrameworkCore.SqlServer"Version="3.0.0" />
20+
<PackageReferenceInclude="Microsoft.EntityFrameworkCore.Tools"Version="3.0.0">
21+
<PrivateAssets>all</PrivateAssets>
22+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
23+
</PackageReference>
24+
<PackageReferenceInclude="Swashbuckle.AspNetCore"Version="5.0.0-rc3" />
25+
<PackageReferenceInclude="System.Linq.Dynamic.Core"Version="1.0.19" />
1926
</ItemGroup>
2027

2128
</Project>

‎SampleWebApiAspNetCore/Services/SeedDataService.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,10 @@ public class SeedDataService : ISeedDataService
99
{
1010
publicasyncTaskInitialize(FoodDbContextcontext)
1111
{
12-
context.FoodItems.Add(newFoodItem(){Calories=1000,Name="Lasagne",Created=DateTime.Now});
13-
context.FoodItems.Add(newFoodItem(){Calories=1100,Name="Hamburger",Created=DateTime.Now});
14-
context.FoodItems.Add(newFoodItem(){Calories=1200,Name="Spaghetti",Created=DateTime.Now});
15-
context.FoodItems.Add(newFoodItem(){Calories=1300,Name="Pizza",Created=DateTime.Now});
12+
context.FoodItems.Add(newFoodItem(){Calories=1000,Type="Starter",Name="Lasagne",Created=DateTime.Now});
13+
context.FoodItems.Add(newFoodItem(){Calories=1100,Type="Main",Name="Hamburger",Created=DateTime.Now});
14+
context.FoodItems.Add(newFoodItem(){Calories=1200,Type="Dessert",Name="Spaghetti",Created=DateTime.Now});
15+
context.FoodItems.Add(newFoodItem(){Calories=1300,Type="Starter",Name="Pizza",Created=DateTime.Now});
1616

1717
awaitcontext.SaveChangesAsync();
1818
}

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp