Skip to content

Commit 7b12fb8

Browse files
committed
Merge branch 'dev'
2 parents 2ff883d + d4a8bb2 commit 7b12fb8

5 files changed

Lines changed: 14 additions & 20 deletions

File tree

README.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@ https://damienbod.com/2015/12/05/asp-net-5-mvc-6-file-upload-with-ms-sql-server-
44

55
## History
66

7+
2018-12-05 Updated to .NET Core 2.2
8+
79
2018-11-22 Updated bootstrap 4, nuget packages, ui build
810

911
2018-06-07 Updated to ASP.NET Core 2.1

src/AspNetCoreFileUploadFileTable/AspNetCoreFileUploadFileTable.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.1</TargetFramework>
3+
<TargetFramework>netcoreapp2.2</TargetFramework>
44
</PropertyGroup>
55

66
<ItemGroup>
77
<ProjectReference Include="..\DataAccess\DataAccess.csproj" />
88
</ItemGroup>
99

1010
<ItemGroup>
11+
<PackageReference Include="Microsoft.AspNetCore.App" />
1112
<PackageReference Include="BuildBundlerMinifier" Version="2.8.391" />
12-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.6" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.4" />
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.4">
13+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0" />
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.0">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1717
</PackageReference>

src/AspNetCoreFileUploadFileTable/Startup.cs

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,11 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Linq;
4-
using System.Threading.Tasks;
5-
using AspNet5FileUploadFileTable.Controllers;
1+
using AspNet5FileUploadFileTable.Controllers;
62
using DataAccess;
73
using Microsoft.AspNetCore.Builder;
84
using Microsoft.AspNetCore.Hosting;
95
using Microsoft.AspNetCore.Mvc;
106
using Microsoft.EntityFrameworkCore;
117
using Microsoft.Extensions.Configuration;
128
using Microsoft.Extensions.DependencyInjection;
13-
using Microsoft.Extensions.Logging;
149

1510
namespace AspNet5FileUploadFileTable
1611
{
@@ -46,18 +41,15 @@ public void ConfigureServices(IServiceCollection services)
4641
)
4742
);
4843

49-
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_1);
44+
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
5045

5146
services.AddScoped<IFileRepository, FileRepository>();
5247
services.AddScoped<ValidateMimeMultipartContentFilter>();
5348
}
5449

5550
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
56-
public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerFactory loggerFactory)
51+
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
5752
{
58-
loggerFactory.AddConsole(Configuration.GetSection("Logging"));
59-
loggerFactory.AddDebug();
60-
6153
if (env.IsDevelopment())
6254
{
6355
app.UseDeveloperExceptionPage();

src/AspNetCoreFileUploadFileTable/web.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
-->
66
<system.webServer>
77
<handlers>
8-
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModule" resourceType="Unspecified" />
8+
<add name="aspNetCore" path="*" verb="*" modules="AspNetCoreModuleV2" resourceType="Unspecified" />
99
</handlers>
1010
<aspNetCore processPath="%LAUNCHER_PATH%" arguments="%LAUNCHER_ARGS%" stdoutLogEnabled="false" stdoutLogFile=".\logs\stdout" forwardWindowsAuthToken="false" startupTimeLimit="3600" requestTimeout="23:00:00">
1111
<environmentVariables />

src/DataAccess/DataAccess.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFramework>netcoreapp2.1</TargetFramework>
3+
<TargetFramework>netcoreapp2.2</TargetFramework>
44
</PropertyGroup>
55
<ItemGroup>
66
<PackageReference Include="NETStandard.Library" Version="2.0.3" />
7-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.6" />
8-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.1.4" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.1.4">
7+
<PackageReference Include="Microsoft.AspNetCore.App" />
8+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.0">
1010
<PrivateAssets>all</PrivateAssets>
1111
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1212
</PackageReference>

0 commit comments

Comments
 (0)