Skip to content

Commit 0fb3941

Browse files
committed
Upgrade to .net 5
1 parent b28d6ac commit 0fb3941

File tree

10 files changed

+53
-50
lines changed

10 files changed

+53
-50
lines changed

src/AspnetRun.Application/AspnetRun.Application.csproj

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="AutoMapper" Version="8.0.0" />
8+
<PackageReference Include="AutoMapper" Version="10.1.1" />
99
</ItemGroup>
1010

1111
<ItemGroup>
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,38 @@
11
using AspnetRun.Application.Models;
22
using AspnetRun.Core.Entities;
33
using AutoMapper;
4+
using System;
45

56
namespace AspnetRun.Application.Mapper
67
{
78
// The best implementation of AutoMapper for class libraries - https://stackoverflow.com/questions/26458731/how-to-configure-auto-mapper-in-class-library-project
89
public class ObjectMapper
910
{
10-
public static IMapper Mapper
11+
private static readonly Lazy<IMapper> Lazy = new Lazy<IMapper>(() =>
1112
{
12-
get
13+
var config = new MapperConfiguration(cfg =>
1314
{
14-
return AutoMapper.Mapper.Instance;
15-
}
16-
}
17-
static ObjectMapper()
18-
{
19-
CreateMap();
20-
}
21-
22-
private static void CreateMap()
15+
// This line ensures that internal properties are also mapped over.
16+
cfg.ShouldMapProperty = p => p.GetMethod.IsPublic || p.GetMethod.IsAssembly;
17+
cfg.AddProfile<AspnetRunDtoMapper>();
18+
});
19+
var mapper = config.CreateMapper();
20+
return mapper;
21+
});
22+
public static IMapper Mapper => Lazy.Value;
23+
24+
public class AspnetRunDtoMapper : Profile
2325
{
24-
AutoMapper.Mapper.Initialize(cfg =>
26+
public AspnetRunDtoMapper()
2527
{
26-
cfg.CreateMap<Product, ProductModel>()
28+
CreateMap<Product, ProductModel>()
2729
.ForMember(dest => dest.Name, opt => opt.MapFrom(src => src.Name)).ReverseMap();
28-
cfg.CreateMap<Category, CategoryModel>().ReverseMap();
29-
cfg.CreateMap<Wishlist, WishlistModel>().ReverseMap();
30-
cfg.CreateMap<Compare, CompareModel>().ReverseMap();
31-
cfg.CreateMap<Order, OrderModel>().ReverseMap();
32-
});
30+
31+
CreateMap<Category, CategoryModel>().ReverseMap();
32+
CreateMap<Wishlist, WishlistModel>().ReverseMap();
33+
CreateMap<Compare, CompareModel>().ReverseMap();
34+
CreateMap<Order, OrderModel>().ReverseMap();
35+
}
3336
}
3437
}
3538
}
+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
</Project>

src/AspnetRun.Infrastructure/AspnetRun.Infrastructure.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,18 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="3.1.0" />
9-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.1.0" />
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
8+
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="5.0.0" />
9+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.0" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
1111
<PrivateAssets>all</PrivateAssets>
1212
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1313
</PackageReference>
14-
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="3.1.0" />
15-
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="3.1.0">
14+
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="5.0.0" />
15+
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="5.0.0">
1616
<PrivateAssets>all</PrivateAssets>
1717
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1818
</PackageReference>

src/AspnetRun.Web/AspnetRun.Web.csproj

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55
<AspNetCoreHostingModel>InProcess</AspNetCoreHostingModel>
66
</PropertyGroup>
77

88

99
<ItemGroup>
10-
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="6.0.0" />
11-
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="3.1.0" />
12-
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="3.1.0">
10+
<PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="8.1.0" />
11+
<PackageReference Include="Microsoft.AspNetCore.Identity.UI" Version="5.0.0" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="5.0.0">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>
16-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
17-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="3.1.0" />
16+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
17+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="5.0.0" />
1818
</ItemGroup>
1919

2020

src/AspnetRun.Web/Startup.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private void ConfigureAspnetRunServices(IServiceCollection services)
107107
services.AddScoped<IOrderService, OrderService>();
108108

109109
// Add Web Layer
110-
services.AddAutoMapper(); // Add AutoMapper
110+
services.AddAutoMapper(typeof(Startup)); // Add AutoMapper
111111
services.AddScoped<IIndexPageService, IndexPageService>();
112112
services.AddScoped<IProductPageService, ProductPageService>();
113113
services.AddScoped<ICategoryPageService, CategoryPageService>();

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
11-
<PackageReference Include="Moq" Version="4.13.1" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
11+
<PackageReference Include="Moq" Version="4.15.1" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
10+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1111
<PackageReference Include="xunit" Version="2.4.1" />
12-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
12+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1313
<PrivateAssets>all</PrivateAssets>
1414
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1515
</PackageReference>

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
11-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
10+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
11+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1212
<PackageReference Include="xunit" Version="2.4.1" />
13-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
13+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1414
<PrivateAssets>all</PrivateAssets>
1515
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
1616
</PackageReference>

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,17 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.1</TargetFramework>
4+
<TargetFramework>net5.0</TargetFramework>
55

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

99
<ItemGroup>
10-
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="3.1.0" />
11-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.1.0" />
12-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.4.0" />
10+
<PackageReference Include="Microsoft.AspNetCore.Mvc.Testing" Version="5.0.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.0" />
12+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.8.0" />
1313
<PackageReference Include="xunit" Version="2.4.1" />
14-
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.1">
14+
<PackageReference Include="xunit.runner.visualstudio" Version="2.4.3">
1515
<PrivateAssets>all</PrivateAssets>
1616
<IncludeAssets>runtime; build; native; contentfiles; analyzers</IncludeAssets>
1717
</PackageReference>

0 commit comments

Comments
 (0)