Skip to content

Commit d133e5f

Browse files
NikolayITNikolayIT
committed
Simplifications in AspNetCoreTemplate.Web
1 parent 9e3452e commit d133e5f

File tree

4 files changed

+14
-40
lines changed

4 files changed

+14
-40
lines changed

‎ASP.NET Core/Web/AspNetCoreTemplate.Web.Infrastructure/AspNetCoreTemplate.Web.Infrastructure.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netstandard2.0</TargetFramework>
4+
<TargetFramework>netstandard2.1</TargetFramework>
55
<LangVersion>latest</LangVersion>
66
</PropertyGroup>
77

‎ASP.NET Core/Web/AspNetCoreTemplate.Web/AspNetCoreTemplate.Web.csproj

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,9 @@
33
<PropertyGroup>
44
<TargetFramework>netcoreapp3.1</TargetFramework>
55
<UserSecretsId>aspnet-AspNetCoreTemplate-BBB373B5-EF3F-4DBB-B8AA-7152CEC275BF</UserSecretsId>
6-
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
76
<LangVersion>latest</LangVersion>
87
</PropertyGroup>
98

10-
<PropertyGroup>
11-
<AssetTargetFallback>$(AssetTargetFallback);portable-net45+win8+wp8+wpa81;</AssetTargetFallback>
12-
</PropertyGroup>
13-
149
<PropertyGroup>
1510
<CodeAnalysisRuleSet>..\..\Rules.ruleset</CodeAnalysisRuleSet>
1611
</PropertyGroup>

‎ASP.NET Core/Web/AspNetCoreTemplate.Web/Startup.cs

Lines changed: 6 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ public void ConfigureServices(IServiceCollection services)
4747
options.MinimumSameSitePolicy = SameSiteMode.None;
4848
});
4949

50-
services.AddControllersWithViews(options =>
51-
{
52-
options.Filters.Add(new AutoValidateAntiforgeryTokenAttribute());
53-
});
54-
50+
services.AddControllersWithViews(
51+
options =>
52+
{
53+
options.Filters.Add(new AutoValidateAntiforgeryTokenAttribute());
54+
});
5555
services.AddRazorPages();
5656

5757
services.AddSingleton(this.configuration);
@@ -75,12 +75,7 @@ public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
7575
using (var serviceScope = app.ApplicationServices.CreateScope())
7676
{
7777
var dbContext = serviceScope.ServiceProvider.GetRequiredService<ApplicationDbContext>();
78-
79-
if (env.IsDevelopment())
80-
{
81-
dbContext.Database.Migrate();
82-
}
83-
78+
dbContext.Database.Migrate();
8479
new ApplicationDbContextSeeder().SeedAsync(dbContext, serviceScope.ServiceProvider).GetAwaiter().GetResult();
8580
}
8681

‎ASP.NET Core/Web/AspNetCoreTemplate.Web/Views/Shared/_Layout.cshtml

Lines changed: 7 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -6,14 +6,8 @@
66
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
77
<title>@this.ViewData["Title"] - @GlobalConstants.SystemName</title>
88

9-
<environment names="Development">
10-
<link href="~/lib/bootstrap/dist/css/bootstrap.css" rel="stylesheet" asp-append-version="true" />
11-
<link href="~/css/site.css" rel="stylesheet" asp-append-version="true" />
12-
</environment>
13-
<environment names="Staging,Production">
14-
<link href="~/lib/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" asp-append-version="true" />
15-
<link href="~/css/site.min.css" rel="stylesheet" asp-append-version="true" />
16-
</environment>
9+
<link href="~/lib/bootstrap/dist/css/bootstrap.min.css" rel="stylesheet" asp-append-version="true" />
10+
<link href="~/css/site.min.css" rel="stylesheet" asp-append-version="true" />
1711
</head>
1812
<body>
1913
<header>
@@ -55,21 +49,11 @@
5549
</div>
5650
</footer>
5751

58-
<environment names="Development">
59-
<script src="~/lib/jquery/dist/jquery.js" asp-append-version="true"></script>
60-
<script src="~/lib/jquery-validation/dist/jquery.validate.js" asp-append-version="true"></script>
61-
<script src="~/lib/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.js" asp-append-version="true"></script>
62-
<script src="~/lib/bootstrap/dist/js/bootstrap.js" asp-append-version="true"></script>
63-
<script src="~/js/site.js" asp-append-version="true"></script>
64-
</environment>
65-
<environment names="Staging,Production">
66-
<script src="~/lib/jquery/dist/jquery.min.js" asp-append-version="true"></script>
67-
<script src="~/lib/jquery-validation/dist/jquery.validate.min.js" asp-append-version="true"></script>
68-
<script src="~/lib/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.js" asp-append-version="true"></script>
69-
<script src="~/lib/bootstrap/dist/js/bootstrap.min.js" asp-append-version="true"></script>
70-
<script src="~/js/site.min.js" asp-append-version="true"></script>
71-
</environment>
72-
52+
<script src="~/lib/jquery/dist/jquery.min.js" asp-append-version="true"></script>
53+
<script src="~/lib/jquery-validation/dist/jquery.validate.min.js" asp-append-version="true"></script>
54+
<script src="~/lib/jquery-validation-unobtrusive/dist/jquery.validate.unobtrusive.js" asp-append-version="true"></script>
55+
<script src="~/lib/bootstrap/dist/js/bootstrap.min.js" asp-append-version="true"></script>
56+
<script src="~/js/site.min.js" asp-append-version="true"></script>
7357
@this.RenderSection("Scripts", required: false)
7458
</body>
7559
</html>

0 commit comments

Comments
 (0)