Skip to content

Commit bec08e6

Browse files
thisisnachothisisnacho
authored
Updated to Panner2.*, netcore3.1 & net5.0 (#3)
1 parent 5926680 commit bec08e6

40 files changed

Lines changed: 343 additions & 217 deletions

‎Panner.AspNetCore.sln‎

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -5,28 +5,20 @@ VisualStudioVersion = 16.0.29409.12
55
MinimumVisualStudioVersion = 10.0.40219.1
66
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{D40300B7-1803-48CB-8F7D-6A96AB75F666}"
77
EndProject
8-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore2_2", "samples\AspNetCore2_2\AspNetCore2_2.csproj", "{E37688C1-EA48-4699-B26A-23378DF6F48C}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Panner.AspNetCore", "src\Panner.AspNetCore.csproj", "{C6C4138D-3AF0-4A51-A7C0-1742BA0D6442}"
99
EndProject
10-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore3_0", "samples\AspNetCore3_0\AspNetCore3_0.csproj", "{91BDC246-99A7-46F1-9813-11F7C50A61D1}"
10+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Panner.AspNetCore.Tests", "tests\Panner.AspNetCore.Tests\Panner.AspNetCore.Tests.csproj", "{2FA57751-5D7A-430D-89F8-CB06B75937FA}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Panner.AspNetCore", "src\Panner.AspNetCore.csproj", "{C6C4138D-3AF0-4A51-A7C0-1742BA0D6442}"
12+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNetCore3_1", "samples\AspNetCore3_1\AspNetCore3_1.csproj", "{FC10AD84-66D7-4C98-9A3B-620D6ACC1357}"
1313
EndProject
14-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Panner.AspNetCore.Tests", "tests\Panner.AspNetCore.Tests\Panner.AspNetCore.Tests.csproj", "{2FA57751-5D7A-430D-89F8-CB06B75937FA}"
14+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AspNet5_0", "samples\AspNet5_0\AspNet5_0.csproj", "{00CBFE9C-C93E-4DC9-BDE5-87A10E170CF5}"
1515
EndProject
1616
Global
1717
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1818
Debug|Any CPU = Debug|Any CPU
1919
Release|Any CPU = Release|Any CPU
2020
EndGlobalSection
2121
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22-
{E37688C1-EA48-4699-B26A-23378DF6F48C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23-
{E37688C1-EA48-4699-B26A-23378DF6F48C}.Debug|Any CPU.Build.0 = Debug|Any CPU
24-
{E37688C1-EA48-4699-B26A-23378DF6F48C}.Release|Any CPU.ActiveCfg = Release|Any CPU
25-
{E37688C1-EA48-4699-B26A-23378DF6F48C}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{91BDC246-99A7-46F1-9813-11F7C50A61D1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{91BDC246-99A7-46F1-9813-11F7C50A61D1}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{91BDC246-99A7-46F1-9813-11F7C50A61D1}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{91BDC246-99A7-46F1-9813-11F7C50A61D1}.Release|Any CPU.Build.0 = Release|Any CPU
3022
{C6C4138D-3AF0-4A51-A7C0-1742BA0D6442}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
3123
{C6C4138D-3AF0-4A51-A7C0-1742BA0D6442}.Debug|Any CPU.Build.0 = Debug|Any CPU
3224
{C6C4138D-3AF0-4A51-A7C0-1742BA0D6442}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -35,13 +27,21 @@ Global
3527
{2FA57751-5D7A-430D-89F8-CB06B75937FA}.Debug|Any CPU.Build.0 = Debug|Any CPU
3628
{2FA57751-5D7A-430D-89F8-CB06B75937FA}.Release|Any CPU.ActiveCfg = Release|Any CPU
3729
{2FA57751-5D7A-430D-89F8-CB06B75937FA}.Release|Any CPU.Build.0 = Release|Any CPU
30+
{FC10AD84-66D7-4C98-9A3B-620D6ACC1357}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
31+
{FC10AD84-66D7-4C98-9A3B-620D6ACC1357}.Debug|Any CPU.Build.0 = Debug|Any CPU
32+
{FC10AD84-66D7-4C98-9A3B-620D6ACC1357}.Release|Any CPU.ActiveCfg = Release|Any CPU
33+
{FC10AD84-66D7-4C98-9A3B-620D6ACC1357}.Release|Any CPU.Build.0 = Release|Any CPU
34+
{00CBFE9C-C93E-4DC9-BDE5-87A10E170CF5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
35+
{00CBFE9C-C93E-4DC9-BDE5-87A10E170CF5}.Debug|Any CPU.Build.0 = Debug|Any CPU
36+
{00CBFE9C-C93E-4DC9-BDE5-87A10E170CF5}.Release|Any CPU.ActiveCfg = Release|Any CPU
37+
{00CBFE9C-C93E-4DC9-BDE5-87A10E170CF5}.Release|Any CPU.Build.0 = Release|Any CPU
3838
EndGlobalSection
3939
GlobalSection(SolutionProperties) = preSolution
4040
HideSolutionNode = FALSE
4141
EndGlobalSection
4242
GlobalSection(NestedProjects) = preSolution
43-
{E37688C1-EA48-4699-B26A-23378DF6F48C} = {D40300B7-1803-48CB-8F7D-6A96AB75F666}
44-
{91BDC246-99A7-46F1-9813-11F7C50A61D1} = {D40300B7-1803-48CB-8F7D-6A96AB75F666}
43+
{FC10AD84-66D7-4C98-9A3B-620D6ACC1357} = {D40300B7-1803-48CB-8F7D-6A96AB75F666}
44+
{00CBFE9C-C93E-4DC9-BDE5-87A10E170CF5} = {D40300B7-1803-48CB-8F7D-6A96AB75F666}
4545
EndGlobalSection
4646
GlobalSection(ExtensibilityGlobals) = postSolution
4747
SolutionGuid = {D12812E7-06E1-4FFB-A601-D656FE2A0075}

samples/AspNetCore3_0/AspNetCore3_0.csproj renamed to samples/AspNet5_0/AspNet5_0.csproj

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

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp3.0</TargetFramework>
5-
<AssemblyName>Panner.AspNetCore.Samples.AspNetCore3</AssemblyName>
6-
<RootNamespace>Panner.AspNetCore.Samples.AspNetCore3</RootNamespace>
4+
<TargetFramework>net5.0</TargetFramework>
5+
<AssemblyName>Panner.AspNetCore.Samples.AspNetCore5_0</AssemblyName>
6+
<RootNamespace>Panner.AspNetCore.Samples.AspNetCore5_0</RootNamespace>
77
<IsPackable>false</IsPackable>
8-
<LangVersion>8.0</LangVersion>
98
</PropertyGroup>
109

1110
<ItemGroup>
12-
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="3.0.0" />
13-
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="3.0.0" />
11+
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="5.0.10" />
12+
<PackageReference Include="Microsoft.EntityFrameworkCore.InMemory" Version="5.0.10" />
1413
</ItemGroup>
1514

1615
<ItemGroup>

samples/AspNetCore2_2/Controllers/PostsController.cs renamed to samples/AspNet5_0/Controllers/PostsController.cs

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,24 @@
1-
namespace Panner.AspNetCore.Samples.AspNetCore2_2.Controllers
1+
namespace Panner.AspNetCore.Samples.AspNet5_0.Controllers
22
{
33
using Microsoft.AspNetCore.Mvc;
44
using Microsoft.EntityFrameworkCore;
5-
using Panner.AspNetCore.Samples.AspNetCore2_2.EFModel;
5+
using Microsoft.Extensions.Logging;
6+
using Panner.AspNetCore.Samples.AspNet5_0.EFModel;
67
using System.Collections.Generic;
78
using System.Linq;
89
using System.Threading.Tasks;
910

10-
[Route("api/[controller]")]
1111
[ApiController]
12+
[Route("[controller]")]
1213
public class PostsController : ControllerBase
1314
{
15+
private readonly ILogger<PostsController> _logger;
16+
17+
public PostsController(ILogger<PostsController> logger)
18+
{
19+
_logger = logger;
20+
}
21+
1422
[HttpGet]
1523
public async Task<IActionResult> GetAllPosts(
1624
[FromServices] BlogContext blogContext,

samples/AspNetCore3_0/EFModel/BlogContext.cs renamed to samples/AspNet5_0/EFModel/BlogContext.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Panner.AspNetCore.Samples.AspNetCore3_0.EFModel
1+
namespace Panner.AspNetCore.Samples.AspNet5_0.EFModel
22
{
33
using Microsoft.EntityFrameworkCore;
44
using System;

samples/AspNetCore3_0/EFModel/Post.cs renamed to samples/AspNet5_0/EFModel/Post.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace Panner.AspNetCore.Samples.AspNetCore3_0.EFModel
1+
namespace Panner.AspNetCore.Samples.AspNet5_0.EFModel
22
{
33
using System;
44

‎samples/AspNet5_0/Models/ErrorViewModel.cs‎

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
using System;
2+
3+
namespace Panner.AspNetCore.Samples.AspNet5_0.Models
4+
{
5+
public class ErrorViewModel
6+
{
7+
public string RequestId { get; set; }
8+
9+
public bool ShowRequestId => !string.IsNullOrEmpty(RequestId);
10+
}
11+
}

‎samples/AspNet5_0/PannerExtensions/PEntityBuilder.Post.IsSortableByPopularity.cs‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
namespace Panner.AspNetCore.Samples.AspNet5_0.PannerExtensions
2+
{
3+
using global::Panner.AspNetCore.Samples.AspNet5_0.EFModel;
4+
using global::Panner.Builders;
5+
6+
public static partial class PEntityBuilderExtensions
7+
{
8+
/// <summary>Marks the entity as sortable by popularity.</summary>
9+
public static PEntityBuilder<Post> IsSortableByPopularity(this PEntityBuilder<Post> builder)
10+
{
11+
builder.GetOrCreateGenerator<ISortParticle<Post>, SortPostsByPopularityParticleGenerator>();
12+
return builder;
13+
}
14+
}
15+
}

‎samples/AspNet5_0/PannerExtensions/SortPostByPopularityParticle.cs‎

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
namespace Panner.AspNetCore.Samples.AspNet5_0.PannerExtensions
2+
{
3+
using global::Panner.AspNetCore.Samples.AspNet5_0.EFModel;
4+
using System.Linq;
5+
6+
public class SortPostByPopularityParticle : ISortParticle<Post>
7+
{
8+
readonly bool Descending;
9+
10+
public SortPostByPopularityParticle(bool descending)
11+
{
12+
this.Descending = descending;
13+
}
14+
15+
public IOrderedQueryable<Post> ApplyTo(IOrderedQueryable<Post> source)
16+
{
17+
if (this.Descending)
18+
return source
19+
.ThenByDescending(x => x.AmtLikes)
20+
.ThenByDescending(x => x.AmtComments);
21+
else
22+
return source
23+
.ThenBy(x => x.AmtLikes)
24+
.ThenBy(x => x.AmtComments);
25+
}
26+
}
27+
}

samples/AspNetCore3_0/PannerExtensions/SortPostsByPopularityParticleGenerator.cs renamed to samples/AspNet5_0/PannerExtensions/SortPostsByPopularityParticleGenerator.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using Panner.AspNetCore.Samples.AspNetCore3_0.EFModel;
1+
using Panner.AspNetCore.Samples.AspNet5_0.EFModel;
22

3-
namespace Panner.AspNetCore.Samples.AspNetCore3.PannerExtensions
3+
namespace Panner.AspNetCore.Samples.AspNet5_0.PannerExtensions
44
{
55
public class SortPostsByPopularityParticleGenerator : ISortParticleGenerator<Post>
66
{

samples/AspNetCore3_0/Program.cs renamed to samples/AspNet5_0/Program.cs

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,14 @@
1-
namespace Panner.AspNetCore.Samples.AspNetCore3_0
2-
{
3-
using Microsoft.AspNetCore.Hosting;
4-
using Microsoft.Extensions.Hosting;
1+
using Microsoft.AspNetCore.Hosting;
2+
using Microsoft.Extensions.Configuration;
3+
using Microsoft.Extensions.Hosting;
4+
using Microsoft.Extensions.Logging;
5+
using System;
6+
using System.Collections.Generic;
7+
using System.Linq;
8+
using System.Threading.Tasks;
59

10+
namespace Panner.AspNetCore.Samples.AspNet5_0
11+
{
612
public class Program
713
{
814
public static void Main(string[] args)

0 commit comments

Comments
 (0)