Skip to content

Commit 42b88c1

Browse files
SteveSandersonMSSteveSandersonMS
committed
Make all templates as consistent as possible with stock MVC Core 2.0 one
1 parent 3ee16a5 commit 42b88c1

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

64 files changed

+513
-367
lines changed

‎templates/AngularSpa/AngularSpa.csproj‎

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
1-
<Project ToolsVersion="15.0" Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
2+
23
<PropertyGroup>
34
<TargetFramework>netcoreapp2.0</TargetFramework>
45
<TypeScriptCompileBlocked>true</TypeScriptCompileBlocked>
5-
<IsPackable>false</IsPackable>
6+
<PackageTargetFallback>$(PackageTargetFallback);portable-net45+win8+wp8+wpa81;</PackageTargetFallback>
67
</PropertyGroup>
8+
79
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore" Version="2.0.0-*" />
9-
<PackageReference Include="Microsoft.AspNetCore.Mvc" Version="2.0.0-*" />
10+
<PackageReference Include="Microsoft.AspNetCore.All" Version="2.0.0-*" />
1011
<PackageReference Include="Microsoft.AspNetCore.SpaServices" Version="1.1.1" />
11-
<PackageReference Include="Microsoft.AspNetCore.StaticFiles" Version="2.0.0-*" />
12-
<PackageReference Include="Microsoft.Extensions.Logging.Debug" Version="2.0.0-*" />
1312
</ItemGroup>
13+
1414
<ItemGroup>
15-
<!-- Files not to show in IDE -->
16-
<None Remove="yarn.lock" />
15+
<DotNetCliToolReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Tools" Version="2.0.0-*" />
16+
</ItemGroup>
1717

18+
<ItemGroup>
1819
<!-- Files not to publish (note that the 'dist' subfolders are re-added below) -->
1920
<Content Remove="ClientApp\**" />
2021
</ItemGroup>
22+
2123
<Target Name="RunWebpack" AfterTargets="ComputeFilesToPublish">
2224
<!-- As part of publishing, ensure the JS resources are freshly built in production mode -->
2325
<Exec Command="npm install" />
@@ -33,4 +35,5 @@
3335
</ResolvedFileToPublish>
3436
</ItemGroup>
3537
</Target>
38+
3639
</Project>

‎templates/AngularSpa/Controllers/HomeController.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Collections.Generic;
3+
using System.Diagnostics;
34
using System.Linq;
45
using System.Threading.Tasks;
56
using Microsoft.AspNetCore.Mvc;
@@ -15,6 +16,7 @@ public IActionResult Index()
1516

1617
public IActionResult Error()
1718
{
19+
ViewData["RequestId"] = Activity.Current?.Id ?? HttpContext.TraceIdentifier;
1820
return View();
1921
}
2022
}

‎templates/AngularSpa/Program.cs‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -3,22 +3,23 @@
33
using System.IO;
44
using System.Linq;
55
using System.Threading.Tasks;
6+
using Microsoft.AspNetCore;
67
using Microsoft.AspNetCore.Hosting;
8+
using Microsoft.Extensions.Configuration;
9+
using Microsoft.Extensions.Logging;
710

811
namespace WebApplicationBasic
912
{
1013
public class Program
1114
{
1215
public static void Main(string[] args)
1316
{
14-
var host = new WebHostBuilder()
15-
.UseKestrel()
16-
.UseContentRoot(Directory.GetCurrentDirectory())
17-
.UseIISIntegration()
17+
BuildWebHost(args).Run();
18+
}
19+
20+
public static IWebHost BuildWebHost(string[] args) =>
21+
WebHost.CreateDefaultBuilder(args)
1822
.UseStartup<Startup>()
1923
.Build();
20-
21-
host.Run();
22-
}
2324
}
2425
}

‎templates/AngularSpa/Startup.cs‎

Lines changed: 6 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -7,41 +7,32 @@
77
using Microsoft.AspNetCore.SpaServices.Webpack;
88
using Microsoft.Extensions.Configuration;
99
using Microsoft.Extensions.DependencyInjection;
10-
using Microsoft.Extensions.Logging;
1110

1211
namespace WebApplicationBasic
1312
{
1413
public class Startup
1514
{
16-
public Startup(IHostingEnvironment env)
15+
public Startup(IConfiguration configuration)
1716
{
18-
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();
23-
Configuration = builder.Build();
17+
Configuration = configuration;
2418
}
2519

26-
public IConfigurationRoot Configuration { get; }
20+
public IConfiguration Configuration { get; }
2721

2822
// This method gets called by the runtime. Use this method to add services to the container.
2923
public void ConfigureServices(IServiceCollection services)
3024
{
31-
// Add framework services.
3225
services.AddMvc();
3326
}
3427

3528
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
36-
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
29+
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
3730
{
38-
loggerFactory.AddConsole(Configuration.GetSection("Logging"));
39-
loggerFactory.AddDebug();
40-
4131
if (env.IsDevelopment())
4232
{
4333
app.UseDeveloperExceptionPage();
44-
app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions {
34+
app.UseWebpackDevMiddleware(new WebpackDevMiddlewareOptions
35+
{
4536
HotModuleReplacement = true
4637
});
4738
}

‎templates/AngularSpa/Views/Shared/Error.cshtml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,3 +4,18 @@
44

55
<h1 class="text-danger">Error.</h1>
66
<h2 class="text-danger">An error occurred while processing your request.</h2>
7+
8+
@if (!string.IsNullOrEmpty((string)ViewData["RequestId"]))
9+
{
10+
<p>
11+
<strong>Request ID:</strong> <code>@ViewData["RequestId"]</code>
12+
</p>
13+
}
14+
15+
<h3>Development Mode</h3>
16+
<p>
17+
Swapping to <strong>Development</strong> environment will display more detailed information about the error that occurred.
18+
</p>
19+
<p>
20+
<strong>Development environment should not be enabled in deployed applications</strong>, as it can result in sensitive information from exceptions being displayed to end users. For local debugging, development environment can be enabled by setting the <strong>ASPNETCORE_ENVIRONMENT</strong> environment variable to <strong>Development</strong>, and restarting the application.
21+
</p>

‎templates/AngularSpa/Views/Shared/_Layout.cshtml‎

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<meta charset="utf-8" />
5-
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6-
<title>@ViewData["Title"] - WebApplicationBasic</title>
7-
<base href="/" />
8-
<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />
9-
</head>
10-
<body>
11-
@RenderBody()
3+
<head>
4+
<meta charset="utf-8" />
5+
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
6+
<title>@ViewData["Title"] - WebApplicationBasic</title>
7+
<base href="~/" />
128

13-
@RenderSection("scripts", required: false)
14-
</body>
9+
<link rel="stylesheet" href="~/dist/vendor.css" asp-append-version="true" />
10+
</head>
11+
<body>
12+
@RenderBody()
13+
14+
@RenderSection("scripts", required: false)
15+
</body>
1516
</html>

‎templates/AngularSpa/Views/_ViewImports.cshtml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
@using WebApplicationBasic
2-
@addTagHelper "*, Microsoft.AspNetCore.Mvc.TagHelpers"
3-
@addTagHelper "*, Microsoft.AspNetCore.SpaServices"
2+
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
3+
@addTagHelper *, Microsoft.AspNetCore.SpaServices

‎templates/AngularSpa/appsettings.Development.json‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
{
2+
"Logging": {
3+
"IncludeScopes": false,
4+
"Debug": {
5+
"LogLevel": {
6+
"Default": "Debug",
7+
"System": "Information",
8+
"Microsoft": "Information"
9+
}
10+
},
11+
"Console": {
12+
"LogLevel": {
13+
"Default": "Debug",
14+
"System": "Information",
15+
"Microsoft": "Information"
16+
}
17+
}
18+
}
19+
}

‎templates/AngularSpa/appsettings.json‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
{
22
"Logging": {
33
"IncludeScopes": false,
4-
"LogLevel": {
5-
"Default": "Debug",
6-
"System": "Information",
7-
"Microsoft": "Information"
4+
"Debug": {
5+
"LogLevel": {
6+
"Default": "Warning"
7+
}
8+
},
9+
"Console": {
10+
"LogLevel": {
11+
"Default": "Warning"
12+
}
813
}
914
}
1015
}

‎templates/AngularSpa/web.config‎

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

0 commit comments

Comments
 (0)