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

Commit 369f888

Browse files
upgrade to asp.net core 3.0
1 parent 3e88f59 commit 369f888

File tree

9 files changed

+57
-48
lines changed

9 files changed

+57
-48
lines changed

‎src/AspnetRun.Application/AspnetRun.Application.csproj

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

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

77
<ItemGroup>
Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

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

77
</Project>

‎src/AspnetRun.Infrastructure/AspnetRun.Infrastructure.csproj

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,18 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

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

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="2.2.0" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="2.2.0" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="2.2.0" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="2.2.0">
8+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.0.0" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.0.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.0.0">
1213
<PrivateAssets>all</PrivateAssets>
1314
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
14-
</PackageReference>
15+
</PackageReference>
1516
</ItemGroup>
1617

1718
<ItemGroup>

‎src/AspnetRun.Web/AspnetRun.Web.csproj

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,14 @@
1-
<Project Sdk="Microsoft.NET.Sdk.Web">
1+
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
5-
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
65
</PropertyGroup>
76

8-
9-
<ItemGroup>
7+
<ItemGroup>
108
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.0.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.App" />
12-
<PackageReference Include="Microsoft.AspNetCore.Razor.Design" Version="2.2.0" PrivateAssets="All" />
13-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.0" />
9+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.0.0" />
1410
</ItemGroup>
1511

16-
1712
<ItemGroup>
1813
<ProjectReference Include="..\AspnetRun.Application\AspnetRun.Application.csproj" />
1914
<ProjectReference Include="..\AspnetRun.Infrastructure\AspnetRun.Infrastructure.csproj" />

‎src/AspnetRun.Web/Startup.cs

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,11 @@
1212
using Microsoft.AspNetCore.Builder;
1313
using Microsoft.AspNetCore.Hosting;
1414
using Microsoft.AspNetCore.Http;
15-
usingMicrosoft.AspNetCore.Mvc;
15+
1616
using Microsoft.EntityFrameworkCore;
1717
using Microsoft.Extensions.Configuration;
1818
using Microsoft.Extensions.DependencyInjection;
19+
using Microsoft.Extensions.Hosting;
1920
using AspnetRun.Core.Repositories;
2021
using AspnetRun.Core.Repositories.Base;
2122
using AspnetRun.Core.Configuration;
@@ -45,12 +46,11 @@ public void ConfigureServices(IServiceCollection services)
4546
options.MinimumSameSitePolicy = SameSiteMode.None;
4647
});
4748

48-
49-
services.AddMvc().SetCompatibilityVersion(CompatibilityVersion.Version_2_2);
49+
services.AddRazorPages();
5050
}
5151

5252
// This method gets called by the runtime. Use this method to configure the HTTP request pipeline.
53-
public void Configure(IApplicationBuilder app, IHostingEnvironment env)
53+
public void Configure(IApplicationBuilder app, IWebHostEnvironment env)
5454
{
5555
if (env.IsDevelopment())
5656
{
@@ -66,8 +66,13 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env)
6666
app.UseHttpsRedirection();
6767
app.UseStaticFiles();
6868
app.UseCookiePolicy();
69+
app.UseRouting();
70+
app.UseAuthorization();
6971

70-
app.UseMvc();
72+
app.UseEndpoints(endpoints =>
73+
{
74+
endpoints.MapRazorPages();
75+
});
7176
}
7277

7378
private void ConfigureAspnetRunServices(IServiceCollection services)

‎test/AspnetRun.Application.Tests/AspnetRun.Application.Tests.csproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
11-
<PackageReference Include="Moq" Version="4.10.1" />
12-
<PackageReference Include="xunit" Version="2.4.0" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
11+
<PackageReference Include="Moq" Version="4.13.1" />
12+
<PackageReference Include="xunit" Version="2.4.1" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1417
</ItemGroup>
1518

1619
<ItemGroup>

‎test/AspnetRun.Core.Tests/AspnetRun.Core.Tests.csproj

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,18 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
11-
<PackageReference Include="xunit" Version="2.4.0" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
11+
<PackageReference Include="xunit" Version="2.4.1" />
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
13+
<PrivateAssets>all</PrivateAssets>
14+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
15+
</PackageReference>
1316
</ItemGroup>
1417

1518
<ItemGroup>

‎test/AspnetRun.Infrastructure.Tests/AspnetRun.Infrastructure.Tests.csproj

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

9-
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.0" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.0" />
12-
<PackageReference Include="xunit" Version="2.4.0" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.0" />
9+
<ItemGroup>
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
12+
<PackageReference Include="xunit" Version="2.4.1" />
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
14+
<PrivateAssets>all</PrivateAssets>
15+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
16+
</PackageReference>
1417
</ItemGroup>
1518

1619
<ItemGroup>

‎test/AspnetRun.Web.Tests/AspnetRun.Web.Tests.csproj

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,15 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.2</TargetFramework>
4+
<TargetFramework>netcoreapp3.0</TargetFramework>
55

66
<IsPackable>false</IsPackable>
77
</PropertyGroup>
88

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.App" Version="2.2.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="2.2.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="2.2.0" />
13-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.0.1" />
10+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.0.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.3.0" />
1413
<PackageReference Include="xunit" Version="2.4.1" />
1514
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
1615
<PrivateAssets>all</PrivateAssets>

0 commit comments

Comments
(0)

AltStyle によって変換されたページ (->オリジナル) /