Merge pull request #28 from KAJOOSH/master

Upgrade to .NET 6

Author: mo-esmp

DynamicRoleBasedAuthorization.sln

@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29613.14
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.32014.148
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicAuthorization.Mvc.Core", "src\DynamicAuthorization.Mvc.Core\DynamicAuthorization.Mvc.Core.csproj", "{89E57FDC-5AF7-4AAF-A40B-FBA91D41ECF4}"
 EndProject
@@ -33,6 +33,10 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore2.1", "netcore2.1",
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleMvc2WebApp", "samples\netcore2.1\SampleMvc2WebApp\SampleMvc2WebApp.csproj", "{BB7818FD-9200-4FD7-83F7-90EB0034D2F9}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net6", "net6", "{316BAD5C-847E-4BD5-AA4C-E272DD109D31}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleMvcWebWithUi", "samples\net6\SampleMvcWebWithUi\SampleMvcWebWithUi.csproj", "{09B590EC-D887-4517-A386-EBE88D3DB591}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -75,6 +79,10 @@ Global
 		{BB7818FD-9200-4FD7-83F7-90EB0034D2F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{BB7818FD-9200-4FD7-83F7-90EB0034D2F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{BB7818FD-9200-4FD7-83F7-90EB0034D2F9}.Release|Any CPU.Build.0 = Release|Any CPU
+		{09B590EC-D887-4517-A386-EBE88D3DB591}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{09B590EC-D887-4517-A386-EBE88D3DB591}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{09B590EC-D887-4517-A386-EBE88D3DB591}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{09B590EC-D887-4517-A386-EBE88D3DB591}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -92,6 +100,8 @@ Global
 		{2CAEFC83-24BF-4C92-B6F1-B3C6714220F2} = {A7EEBB7E-C64D-4475-93D0-872E080A4E03}
 		{42149EE2-E873-4CBB-BAC0-791132031F46} = {BAAF9837-1DB5-4032-AB2A-2901E6EE6EF8}
 		{BB7818FD-9200-4FD7-83F7-90EB0034D2F9} = {42149EE2-E873-4CBB-BAC0-791132031F46}
+		{316BAD5C-847E-4BD5-AA4C-E272DD109D31} = {BAAF9837-1DB5-4032-AB2A-2901E6EE6EF8}
+		{09B590EC-D887-4517-A386-EBE88D3DB591} = {316BAD5C-847E-4BD5-AA4C-E272DD109D31}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {18C80710-C9E9-488B-9100-1E4BF8B18038}

README.md

@@ -1,4 +1,4 @@
-# Dynamic Role-Based Authorization in ASP.NET Core MVC 2.1, 3.1 and 5.0  [![NuGet](http://img.shields.io/nuget/v/DynamicAuthorization.Mvc.Core.svg?style=flat)](https://www.nuget.org/packages/DynamicAuthorization.Mvc.Core) 
+# Dynamic Role-Based Authorization in ASP.NET Core MVC 2.1, 3.1, 5.0 and 6.0 [![NuGet](http://img.shields.io/nuget/v/DynamicAuthorization.Mvc.Core.svg?style=flat)](https://www.nuget.org/packages/DynamicAuthorization.Mvc.Core) 
 
 You already know how role-based authorization works in ASP.NET Core.
 

samples/net6/SampleMvcWebWithUi/Areas/Identity/Pages/_ViewStart.cshtml

@@ -0,0 +1,3 @@
+@{
+    Layout = "/Views/Shared/_Layout.cshtml";
+}

samples/net6/SampleMvcWebWithUi/Controllers/HomeController.cs

@@ -0,0 +1,40 @@
+using Microsoft.AspNetCore.Identity;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Logging;
+using SampleMvcWebWithUi.Models;
+using System.Diagnostics;
+using System.Threading.Tasks;
+
+namespace SampleMvcWebWithUi.Controllers
+{
+    public class HomeController : Controller
+    {
+        private readonly ILogger<HomeController> _logger;
+        private readonly RoleManager<ApplicationRole> _roleManager;
+
+        public HomeController(ILogger<HomeController> logger, RoleManager<ApplicationRole> roleManager)
+        {
+            _logger = logger;
+            _roleManager = roleManager;
+        }
+
+        public async Task<IActionResult> Index()
+        {
+            //var role = new ApplicationRole { Name = "Test1" };
+            //var result = await _roleManager.CreateAsync(role);
+
+            return View();
+        }
+
+        public IActionResult Privacy()
+        {
+            return View();
+        }
+
+        [ResponseCache(Duration = 0, Location = ResponseCacheLocation.None, NoStore = true)]
+        public IActionResult Error()
+        {
+            return View(new ErrorViewModel { RequestId = Activity.Current?.Id ?? HttpContext.TraceIdentifier });
+        }
+    }
+}

samples/net6/SampleMvcWebWithUi/Data/ApplicationDbContext.cs

@@ -0,0 +1,62 @@
+using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore;
+using SampleMvcWebWithUi.Models;
+
+namespace SampleMvcWebWithUi.Data
+{
+    public class ApplicationDbContext : IdentityDbContext<ApplicationUser, ApplicationRole, int,
+        ApplicationUserClaim, ApplicationUserRole, ApplicationUserLogin, ApplicationRoleClaim, ApplicationUserToken>
+    {
+        public ApplicationDbContext(DbContextOptions<ApplicationDbContext> options)
+            : base(options)
+        {
+        }
+
+        protected override void OnModelCreating(ModelBuilder modelBuilder)
+        {
+            base.OnModelCreating(modelBuilder);
+
+            modelBuilder.Entity<ApplicationUser>(b =>
+            {
+                // Each User can have many UserClaims
+                b.HasMany(e => e.Claims)
+                    .WithOne(e => e.User)
+                    .HasForeignKey(uc => uc.UserId)
+                    .IsRequired();
+
+                // Each User can have many UserLogins
+                b.HasMany(e => e.Logins)
+                    .WithOne(e => e.User)
+                    .HasForeignKey(ul => ul.UserId)
+                    .IsRequired();
+
+                // Each User can have many UserTokens
+                b.HasMany(e => e.Tokens)
+                    .WithOne(e => e.User)
+                    .HasForeignKey(ut => ut.UserId)
+                    .IsRequired();
+
+                // Each User can have many entries in the UserRole join table
+                b.HasMany(e => e.UserRoles)
+                    .WithOne(e => e.User)
+                    .HasForeignKey(ur => ur.UserId)
+                    .IsRequired();
+            });
+
+            modelBuilder.Entity<ApplicationRole>(b =>
+            {
+                // Each Role can have many entries in the UserRole join table
+                b.HasMany(e => e.UserRoles)
+                    .WithOne(e => e.Role)
+                    .HasForeignKey(ur => ur.RoleId)
+                    .IsRequired();
+
+                // Each Role can have many associated RoleClaims
+                b.HasMany(e => e.RoleClaims)
+                    .WithOne(e => e.Role)
+                    .HasForeignKey(rc => rc.RoleId)
+                    .IsRequired();
+            });
+        }
+    }
+}