Skip to content

Commit b96d180

Browse files
FabianGosebrinkFabianGosebrink
FabianGosebrink
authored and
FabianGosebrink
committed
Updated to RC1 and added readme.md
1 parent 5980da0 commit b96d180

File tree

6 files changed

+79
-59
lines changed

6 files changed

+79
-59
lines changed

‎Readme.md

Whitespace-only changes.

‎global.json

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
2-
"projects": [ "src", "test" ],
3-
"sdk": {
4-
"version": "1.0.0-preview1-002702"
5-
}
2+
"projects": [ "src", "test" ],
3+
"sdk": {
4+
"version": "1.0.0-preview2-003121"
5+
}
66
}

‎src/SampleWebApiAspNetCore/Controllers/HouseController.cs

Lines changed: 23 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
using System;
22
using System.Linq;
33
using System.Net;
4-
using Microsoft.AspNet.Mvc;
5-
using SampleWebApiMVC6.Models;
6-
using SampleWebApiMVC6.Services;
7-
using Microsoft.AspNet.JsonPatch;
4+
using Microsoft.AspNetCore.JsonPatch;
5+
using Microsoft.AspNetCore.Mvc;
6+
using SampleWebApiAspNetCore.Models;
87
using SampleWebApiAspNetCore.Repositories;
8+
using SampleWebApiAspNetCore.Services;
99

1010
namespace SampleWebApiMVC6.Controllers
1111
{
@@ -31,7 +31,7 @@ public IActionResult Get()
3131
catch (Exception exception)
3232
{
3333
//logg exception or do anything with it
34-
return new HttpStatusCodeResult((int) HttpStatusCode.InternalServerError);
34+
return StatusCode((int) HttpStatusCode.InternalServerError);
3535
}
3636
}
3737

@@ -44,15 +44,15 @@ public IActionResult GetSingle(int id)
4444

4545
if (houseEntity == null)
4646
{
47-
return new HttpNotFoundResult();
47+
return NotFound();
4848
}
4949

5050
return Ok(_houseMapper.MapToDto(houseEntity));
5151
}
5252
catch (Exception exception)
5353
{
5454
//logg exception or do anything with it
55-
return new HttpStatusCodeResult((int) HttpStatusCode.InternalServerError);
55+
return StatusCode((int)HttpStatusCode.InternalServerError);
5656
}
5757
}
5858

@@ -63,23 +63,28 @@ public IActionResult Patch(int id, [FromBody] JsonPatchDocument<HouseDto> houseP
6363
{
6464
if (housePatchDocument == null)
6565
{
66-
return HttpBadRequest();
66+
return BadRequest();
6767
}
6868

6969
if (!ModelState.IsValid)
7070
{
71-
return HttpBadRequest(ModelState);
71+
return BadRequest(ModelState);
7272
}
7373

7474
HouseEntity houseEntity = _houseRepository.GetSingle(id);
7575

76+
if (houseEntity == null)
77+
{
78+
return NotFound();
79+
}
80+
7681
HouseDto existingHouse = _houseMapper.MapToDto(houseEntity);
7782

7883
housePatchDocument.ApplyTo(existingHouse, ModelState);
7984

8085
if (!ModelState.IsValid)
8186
{
82-
return HttpBadRequest(ModelState);
87+
return BadRequest(ModelState);
8388
}
8489

8590
_houseRepository.Update(_houseMapper.MapToEntity(existingHouse));
@@ -89,7 +94,7 @@ public IActionResult Patch(int id, [FromBody] JsonPatchDocument<HouseDto> houseP
8994
catch (Exception exception)
9095
{
9196
//logg exception or do anything with it
92-
return new HttpStatusCodeResult((int) HttpStatusCode.InternalServerError);
97+
return StatusCode((int)HttpStatusCode.InternalServerError);
9398
}
9499
}
95100

@@ -105,7 +110,7 @@ public IActionResult Create([FromBody] HouseDto houseDto)
105110

106111
if (!ModelState.IsValid)
107112
{
108-
return HttpBadRequest(ModelState);
113+
return BadRequest(ModelState);
109114
}
110115

111116
HouseEntity houseEntity = _houseMapper.MapToEntity(houseDto);
@@ -117,7 +122,7 @@ public IActionResult Create([FromBody] HouseDto houseDto)
117122
catch (Exception exception)
118123
{
119124
//logg exception or do anything with it
120-
return new HttpStatusCodeResult((int) HttpStatusCode.InternalServerError);
125+
return StatusCode((int)HttpStatusCode.InternalServerError);
121126
}
122127
}
123128

@@ -133,14 +138,14 @@ public IActionResult Update(int id, [FromBody] HouseDto houseDto)
133138

134139
if (!ModelState.IsValid)
135140
{
136-
return HttpBadRequest(ModelState);
141+
return BadRequest(ModelState);
137142
}
138143

139144
HouseEntity houseEntityToUpdate = _houseRepository.GetSingle(id);
140145

141146
if (houseEntityToUpdate == null)
142147
{
143-
return new HttpNotFoundResult();
148+
return NotFound();
144149
}
145150

146151
houseEntityToUpdate.ZipCode = houseDto.ZipCode;
@@ -154,7 +159,7 @@ public IActionResult Update(int id, [FromBody] HouseDto houseDto)
154159
catch (Exception exception)
155160
{
156161
//logg exception or do anything with it
157-
return new HttpStatusCodeResult((int) HttpStatusCode.InternalServerError);
162+
return StatusCode((int)HttpStatusCode.InternalServerError);
158163
}
159164
}
160165

@@ -167,7 +172,7 @@ public IActionResult Delete(int id)
167172

168173
if (houseEntityToDelete == null)
169174
{
170-
return new HttpNotFoundResult();
175+
return NotFound();
171176
}
172177

173178
_houseRepository.Delete(id);
@@ -177,7 +182,7 @@ public IActionResult Delete(int id)
177182
catch (Exception exception)
178183
{
179184
//logg exception or do anything with it
180-
return new HttpStatusCodeResult((int) HttpStatusCode.InternalServerError);
185+
return StatusCode((int)HttpStatusCode.InternalServerError);
181186
}
182187
}
183188
}

‎src/SampleWebApiAspNetCore/Program.cs

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
using System;
2+
using System.Collections.Generic;
3+
using System.IO;
4+
using System.Linq;
5+
using System.Threading.Tasks;
6+
using Microsoft.AspNetCore.Hosting;
7+
8+
namespace SampleWebApiAspNetCore
9+
{
10+
public class Program
11+
{
12+
public static void Main(string[] args)
13+
{
14+
var host = new WebHostBuilder()
15+
.UseKestrel()
16+
.UseContentRoot(Directory.GetCurrentDirectory())
17+
.UseIISIntegration()
18+
.UseStartup<Startup>()
19+
.Build();
20+
21+
host.Run();
22+
}
23+
}
24+
}

‎src/SampleWebApiAspNetCore/Startup.cs

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,11 @@ public class Startup
1616
public Startup(IHostingEnvironment env)
1717
{
1818
var builder = new ConfigurationBuilder()
19-
.SetBasePath(env.ContentRootPath)
20-
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
21-
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true)
22-
.AddEnvironmentVariables();
19+
.SetBasePath(env.ContentRootPath)
20+
.AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
21+
.AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true);
2322

23+
builder.AddEnvironmentVariables();
2424
Configuration = builder.Build();
2525
}
2626

@@ -48,23 +48,13 @@ public void ConfigureServices(IServiceCollection services)
4848
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
4949
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
5050
{
51-
loggerFactory.AddConsole();
51+
loggerFactory.AddConsole(Configuration.GetSection("Logging"));
5252
loggerFactory.AddDebug();
5353

5454
app.UseDefaultFiles();
5555
app.UseStaticFiles();
5656

5757
app.UseMvc();
5858
}
59-
60-
//// Entry point for the application.
61-
public static void Main(string[] args)
62-
{
63-
var host = WebHostBuilderIISExtensions.UseIISIntegration(WebHostBuilderExtensions.UseContentRoot(WebHostBuilderKestrelExtensions.UseKestrel(new WebHostBuilder()), Directory.GetCurrentDirectory()))
64-
.UseStartup<Startup>()
65-
.Build();
66-
67-
WebHostExtensions.Run(host);
68-
}
6959
}
7060
}

‎src/SampleWebApiAspNetCore/project.json

Lines changed: 23 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,31 @@
11
{
22
"dependencies": {
33
"Microsoft.NETCore.App": {
4-
"version": "1.0.0-rc2-3002702",
4+
"version": "1.0.0",
55
"type": "platform"
66
},
7-
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0-rc2-final",
8-
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0-rc2-final",
9-
"Microsoft.Extensions.Configuration.FileExtensions": "1.0.0-rc2-final",
10-
"Microsoft.Extensions.Configuration.Json": "1.0.0-rc2-final",
11-
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0-rc2-final",
12-
"Microsoft.AspNetCore.Mvc": "1.0.0-rc2-final",
13-
"Microsoft.Extensions.Logging.Console": "1.0.0-rc2-final",
14-
"Microsoft.Extensions.Logging.Debug": "1.0.0-rc2-final",
15-
"Microsoft.AspNet.IISPlatformHandler": "1.0.0-rc1-final",
16-
"Microsoft.AspNetCore.StaticFiles": "1.0.0-rc2-final",
17-
"Microsoft.AspNet.StaticFiles": "1.0.0-rc1-final",
18-
"System.Linq": "4.1.0-rc2-24027"
7+
"Microsoft.ApplicationInsights.AspNetCore": "1.0.0",
8+
"Microsoft.AspNetCore.Mvc": "1.0.0",
9+
"Microsoft.AspNetCore.Server.IISIntegration": "1.0.0",
10+
"Microsoft.AspNetCore.Server.Kestrel": "1.0.0",
11+
"Microsoft.Extensions.Configuration.EnvironmentVariables": "1.0.0",
12+
"Microsoft.Extensions.Configuration.FileExtensions": "1.0.0",
13+
"Microsoft.Extensions.Configuration.Json": "1.0.0",
14+
"Microsoft.Extensions.Logging": "1.0.0",
15+
"Microsoft.Extensions.Logging.Console": "1.0.0",
16+
"Microsoft.Extensions.Logging.Debug": "1.0.0",
17+
"Microsoft.Extensions.Options.ConfigurationExtensions": "1.0.0",
18+
"Microsoft.AspNetCore.StaticFiles": "1.0.0"
1919
},
2020

2121
"tools": {
22-
"Microsoft.AspNetCore.Server.IISIntegration.Tools": {
23-
"version": "1.0.0-preview1-final",
24-
"imports": "portable-net45+win8+dnxcore50"
25-
}
22+
"Microsoft.AspNetCore.Server.IISIntegration.Tools": "1.0.0-preview2-final"
2623
},
2724

2825
"frameworks": {
2926
"netcoreapp1.0": {
3027
"imports": [
3128
"dotnet5.6",
32-
"dnxcore50",
3329
"portable-net45+win8"
3430
]
3531
}
@@ -41,17 +37,22 @@
4137
},
4238

4339
"runtimeOptions": {
44-
"gcServer": true
40+
"configProperties": {
41+
"System.GC.Server": true
42+
}
4543
},
4644

4745
"publishOptions": {
4846
"include": [
4947
"wwwroot",
48+
"Views",
49+
"Areas/**/Views",
50+
"appsettings.json",
5051
"web.config"
5152
]
5253
},
5354

54-
"scripts": {
55-
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
56-
}
55+
"scripts": {
56+
"postpublish": [ "dotnet publish-iis --publish-folder %publish:OutputPath% --framework %publish:FullTargetFramework%" ]
57+
}
5758
}

0 commit comments

Comments
 (0)