Skip to content

Commit 00b17e5

Browse files
mo-esmpmo-esmp
committed
Fix merge conflict.
2 parents 8f49b23 + dd7407e commit 00b17e5

File tree

139 files changed

+11086
-27450
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

139 files changed

+11086
-27450
lines changed

‎DynamicRoleBasedAuthorization.sln‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore3.x", "netcore3.x",
1515
EndProject
1616
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleMvcWebApp", "samples\netcore3.x\SampleMvcWebApp\SampleMvcWebApp.csproj", "{0833E296-398F-42A4-9531-D125483AB019}"
1717
EndProject
18-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore2.2", "netcore2.2", "{11B88EB7-66BE-402A-A4E0-144220EBD8B9}"
19-
EndProject
20-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleMvc2WebApp", "samples\netcore2.2\SampleMvc2WebApp\SampleMvc2WebApp.csproj", "{A3124728-6766-48A3-BA1A-5CB119924395}"
21-
EndProject
2218
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DF22D7D8-4CE9-4A0E-9D9B-FB5D6D637089}"
2319
EndProject
2420
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicRoleBasedAuthorization.Tests", "test\DynamicRoleBasedAuthorization.Tests\DynamicRoleBasedAuthorization.Tests.csproj", "{0FC61895-DE38-4526-96EE-C6CB6AA92A3B}"
@@ -31,7 +27,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "net5", "net5", "{85C709D5-7
3127
EndProject
3228
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleMvcWebWithUi", "samples\net5\SampleMvcWebWithUi\SampleMvcWebWithUi.csproj", "{8CEDCB64-13BF-4AD1-B7F4-01A8BB42AB07}"
3329
EndProject
34-
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DynamicAuthorization.Mvc.MsSqlServerStore", "src\DynamicAuthorization.Mvc.MsSqlServerStore\DynamicAuthorization.Mvc.MsSqlServerStore.csproj", "{2CAEFC83-24BF-4C92-B6F1-B3C6714220F2}"
30+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicAuthorization.Mvc.MsSqlServerStore", "src\DynamicAuthorization.Mvc.MsSqlServerStore\DynamicAuthorization.Mvc.MsSqlServerStore.csproj", "{2CAEFC83-24BF-4C92-B6F1-B3C6714220F2}"
31+
EndProject
32+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore2.1", "netcore2.1", "{42149EE2-E873-4CBB-BAC0-791132031F46}"
33+
EndProject
34+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleMvc2WebApp", "samples\netcore2.1\SampleMvc2WebApp\SampleMvc2WebApp.csproj", "{BB7818FD-9200-4FD7-83F7-90EB0034D2F9}"
3535
EndProject
3636
Global
3737
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -51,10 +51,6 @@ Global
5151
{0833E296-398F-42A4-9531-D125483AB019}.Debug|Any CPU.Build.0 = Debug|Any CPU
5252
{0833E296-398F-42A4-9531-D125483AB019}.Release|Any CPU.ActiveCfg = Release|Any CPU
5353
{0833E296-398F-42A4-9531-D125483AB019}.Release|Any CPU.Build.0 = Release|Any CPU
54-
{A3124728-6766-48A3-BA1A-5CB119924395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
55-
{A3124728-6766-48A3-BA1A-5CB119924395}.Debug|Any CPU.Build.0 = Debug|Any CPU
56-
{A3124728-6766-48A3-BA1A-5CB119924395}.Release|Any CPU.ActiveCfg = Release|Any CPU
57-
{A3124728-6766-48A3-BA1A-5CB119924395}.Release|Any CPU.Build.0 = Release|Any CPU
5854
{0FC61895-DE38-4526-96EE-C6CB6AA92A3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
5955
{0FC61895-DE38-4526-96EE-C6CB6AA92A3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
6056
{0FC61895-DE38-4526-96EE-C6CB6AA92A3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -75,6 +71,10 @@ Global
7571
{2CAEFC83-24BF-4C92-B6F1-B3C6714220F2}.Debug|Any CPU.Build.0 = Debug|Any CPU
7672
{2CAEFC83-24BF-4C92-B6F1-B3C6714220F2}.Release|Any CPU.ActiveCfg = Release|Any CPU
7773
{2CAEFC83-24BF-4C92-B6F1-B3C6714220F2}.Release|Any CPU.Build.0 = Release|Any CPU
74+
{BB7818FD-9200-4FD7-83F7-90EB0034D2F9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
75+
{BB7818FD-9200-4FD7-83F7-90EB0034D2F9}.Debug|Any CPU.Build.0 = Debug|Any CPU
76+
{BB7818FD-9200-4FD7-83F7-90EB0034D2F9}.Release|Any CPU.ActiveCfg = Release|Any CPU
77+
{BB7818FD-9200-4FD7-83F7-90EB0034D2F9}.Release|Any CPU.Build.0 = Release|Any CPU
7878
EndGlobalSection
7979
GlobalSection(SolutionProperties) = preSolution
8080
HideSolutionNode = FALSE
@@ -84,14 +84,14 @@ Global
8484
{3E397C28-EDC7-4DCC-896F-476A9EE74E76} = {A7EEBB7E-C64D-4475-93D0-872E080A4E03}
8585
{5FEB9007-1EFA-4814-BC15-DB0370B84E22} = {BAAF9837-1DB5-4032-AB2A-2901E6EE6EF8}
8686
{0833E296-398F-42A4-9531-D125483AB019} = {5FEB9007-1EFA-4814-BC15-DB0370B84E22}
87-
{11B88EB7-66BE-402A-A4E0-144220EBD8B9} = {BAAF9837-1DB5-4032-AB2A-2901E6EE6EF8}
88-
{A3124728-6766-48A3-BA1A-5CB119924395} = {11B88EB7-66BE-402A-A4E0-144220EBD8B9}
8987
{0FC61895-DE38-4526-96EE-C6CB6AA92A3B} = {DF22D7D8-4CE9-4A0E-9D9B-FB5D6D637089}
9088
{4D5C1490-63F8-434A-A730-380AA6441CE9} = {A7EEBB7E-C64D-4475-93D0-872E080A4E03}
9189
{803E1492-22FA-4F63-9687-A30902682C15} = {5FEB9007-1EFA-4814-BC15-DB0370B84E22}
9290
{85C709D5-793A-4068-9937-4749BCF34267} = {BAAF9837-1DB5-4032-AB2A-2901E6EE6EF8}
9391
{8CEDCB64-13BF-4AD1-B7F4-01A8BB42AB07} = {85C709D5-793A-4068-9937-4749BCF34267}
9492
{2CAEFC83-24BF-4C92-B6F1-B3C6714220F2} = {A7EEBB7E-C64D-4475-93D0-872E080A4E03}
93+
{42149EE2-E873-4CBB-BAC0-791132031F46} = {BAAF9837-1DB5-4032-AB2A-2901E6EE6EF8}
94+
{BB7818FD-9200-4FD7-83F7-90EB0034D2F9} = {42149EE2-E873-4CBB-BAC0-791132031F46}
9595
EndGlobalSection
9696
GlobalSection(ExtensibilityGlobals) = postSolution
9797
SolutionGuid = {18C80710-C9E9-488B-9100-1E4BF8B18038}

‎README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Dynamic Role-Based Authorization in ASP.NET Core MVC 2.2, 3.x and 5.0 [![NuGet](http://img.shields.io/nuget/v/DynamicAuthorization.Mvc.Core.svg?style=flat)](https://www.nuget.org/packages/DynamicAuthorization.Mvc.Core)
1+
# 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)
22

33
You already know how role-based authorization works in ASP.NET Core.
44

‎samples/netcore2.2/SampleMvc2WebApp/Areas/Identity/Pages/_ViewStart.cshtml‎ renamed to ‎samples/netcore2.1/SampleMvc2WebApp/Areas/Identity/Pages/_ViewStart.cshtml‎

File renamed without changes.

‎samples/netcore2.2/SampleMvc2WebApp/Controllers/HomeController.cs‎ renamed to ‎samples/netcore2.1/SampleMvc2WebApp/Controllers/HomeController.cs‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
1-
using System;
1+
using Microsoft.AspNetCore.Mvc;
2+
using SampleMvc2WebApp.Models;
3+
using System;
24
using System.Collections.Generic;
35
using System.Diagnostics;
46
using System.Linq;
57
using System.Threading.Tasks;
6-
using Microsoft.AspNetCore.Mvc;
7-
using SampleMvc2WebApp.Models;
88

99
namespace SampleMvc2WebApp.Controllers
1010
{
@@ -15,6 +15,20 @@ public IActionResult Index()
1515
return View();
1616
}
1717

18+
public IActionResult About()
19+
{
20+
ViewData["Message"] = "Your application description page.";
21+
22+
return View();
23+
}
24+
25+
public IActionResult Contact()
26+
{
27+
ViewData["Message"] = "Your contact page.";
28+
29+
return View();
30+
}
31+
1832
public IActionResult Privacy()
1933
{
2034
return View();

‎samples/netcore2.2/SampleMvc2WebApp/Data/ApplicationDbContext.cs‎ renamed to ‎samples/netcore2.1/SampleMvc2WebApp/Data/ApplicationDbContext.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
using System;
1+
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
2+
using Microsoft.EntityFrameworkCore;
3+
using System;
24
using System.Collections.Generic;
35
using System.Text;
4-
using Microsoft.AspNetCore.Identity.EntityFrameworkCore;
5-
using Microsoft.EntityFrameworkCore;
66

77
namespace SampleMvc2WebApp.Data
88
{

‎samples/netcore2.2/SampleMvc2WebApp/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs‎ renamed to ‎samples/netcore2.1/SampleMvc2WebApp/Data/Migrations/00000000000000_CreateIdentitySchema.Designer.cs‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎samples/netcore2.2/SampleMvc2WebApp/Data/Migrations/00000000000000_CreateIdentitySchema.cs‎ renamed to ‎samples/netcore2.1/SampleMvc2WebApp/Data/Migrations/00000000000000_CreateIdentitySchema.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
using System;
2-
using Microsoft.EntityFrameworkCore.Metadata;
1+
using Microsoft.EntityFrameworkCore.Metadata;
32
using Microsoft.EntityFrameworkCore.Migrations;
3+
using System;
44

55
namespace SampleMvc2WebApp.Data.Migrations
66
{

‎samples/netcore2.2/SampleMvc2WebApp/Data/Migrations/ApplicationDbContextModelSnapshot.cs‎ renamed to ‎samples/netcore2.1/SampleMvc2WebApp/Data/Migrations/ApplicationDbContextModelSnapshot.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
// <auto-generated />
2-
using System;
3-
using SampleMvc2WebApp.Data;
42
using Microsoft.EntityFrameworkCore;
53
using Microsoft.EntityFrameworkCore.Infrastructure;
64
using Microsoft.EntityFrameworkCore.Metadata;
75
using Microsoft.EntityFrameworkCore.Storage.ValueConversion;
6+
using SampleMvc2WebApp.Data;
7+
using System;
88

99
namespace SampleMvc2WebApp.Data.Migrations
1010
{
@@ -15,7 +15,7 @@ protected override void BuildModel(ModelBuilder modelBuilder)
1515
{
1616
#pragma warning disable 612, 618
1717
modelBuilder
18-
.HasAnnotation("ProductVersion", "2.2.0-preview1")
18+
.HasAnnotation("ProductVersion", "2.1.0")
1919
.HasAnnotation("Relational:MaxIdentifierLength", 128)
2020
.HasAnnotation("SqlServer:ValueGenerationStrategy", SqlServerValueGenerationStrategy.IdentityColumn);
2121

‎samples/netcore2.2/SampleMvc2WebApp/Models/ErrorViewModel.cs‎ renamed to ‎samples/netcore2.1/SampleMvc2WebApp/Models/ErrorViewModel.cs‎

File renamed without changes.

‎samples/netcore2.2/SampleMvc2WebApp/Program.cs‎ renamed to ‎samples/netcore2.1/SampleMvc2WebApp/Program.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
using System;
1+
using Microsoft.AspNetCore;
2+
using Microsoft.AspNetCore.Hosting;
3+
using Microsoft.Extensions.Configuration;
4+
using Microsoft.Extensions.Logging;
5+
using System;
26
using System.Collections.Generic;
37
using System.IO;
48
using System.Linq;
59
using System.Threading.Tasks;
6-
using Microsoft.AspNetCore;
7-
using Microsoft.AspNetCore.Hosting;
8-
using Microsoft.Extensions.Configuration;
9-
using Microsoft.Extensions.Logging;
1010

1111
namespace SampleMvc2WebApp
1212
{

0 commit comments

Comments
 (0)