Skip to content

Commit 02f1430

Browse files
committed
Fix merge conflicts.
2 parents a565385 + 9130fc9 commit 02f1430

File tree

1,219 files changed

+126428
-118183
lines changed

Some content is hidden

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

1,219 files changed

+126428
-118183
lines changed

DynamicRoleBasedAuthorization.sln

Lines changed: 57 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,80 @@
11

22
Microsoft Visual Studio Solution File, Format Version 12.00
33
# Visual Studio Version 16
4-
VisualStudioVersion = 16.0.29709.97
4+
VisualStudioVersion = 16.0.29613.14
55
MinimumVisualStudioVersion = 10.0.40219.1
6-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{598AB890-98C2-4DAE-B079-61BBEC8E22E4}"
6+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicAuthorization.Mvc.Core", "src\DynamicAuthorization.Mvc.Core\DynamicAuthorization.Mvc.Core.csproj", "{89E57FDC-5AF7-4AAF-A40B-FBA91D41ECF4}"
77
EndProject
8-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore2.0", "netcore2.0", "{2459B1ED-9F9A-4472-BCD2-1595ED65E1A5}"
8+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicAuthorization.Mvc.JsonStore", "src\DynamicAuthorization.Mvc.JsonStore\DynamicAuthorization.Mvc.JsonStore.csproj", "{3E397C28-EDC7-4DCC-896F-476A9EE74E76}"
99
EndProject
10-
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore3.0", "netcore3.0", "{8179B3B2-DD82-4F8C-B42F-B8D2B19D9577}"
10+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{A7EEBB7E-C64D-4475-93D0-872E080A4E03}"
1111
EndProject
12-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicRoleBasedAuthorization", "samples\netcore2.0\DynamicRoleBasedAuthorization\DynamicRoleBasedAuthorization.csproj", "{2FBC237E-F3B4-444A-AF25-83111218E21B}"
12+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "samples", "samples", "{BAAF9837-1DB5-4032-AB2A-2901E6EE6EF8}"
1313
EndProject
14-
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicRoleBasedAuthorization", "samples\netcore3.0\DynamicRoleBasedAuthorization\DynamicRoleBasedAuthorization.csproj", "{7A33E6EB-DC22-4D4C-B581-50F642C32540}"
14+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "netcore3.x", "netcore3.x", "{5FEB9007-1EFA-4814-BC15-DB0370B84E22}"
15+
EndProject
16+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleMvcWebApp", "samples\netcore3.x\SampleMvcWebApp\SampleMvcWebApp.csproj", "{0833E296-398F-42A4-9531-D125483AB019}"
17+
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
22+
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{DF22D7D8-4CE9-4A0E-9D9B-FB5D6D637089}"
23+
EndProject
24+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicRoleBasedAuthorization.Tests", "test\DynamicRoleBasedAuthorization.Tests\DynamicRoleBasedAuthorization.Tests.csproj", "{0FC61895-DE38-4526-96EE-C6CB6AA92A3B}"
25+
EndProject
26+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DynamicAuthorization.Mvc.Ui", "src\DynamicAuthorization.Mvc.Ui\DynamicAuthorization.Mvc.Ui.csproj", "{4D5C1490-63F8-434A-A730-380AA6441CE9}"
27+
EndProject
28+
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "SampleMvcWebAppWithUi", "samples\netcore3.x\SampleMvcWebAppWithUi\SampleMvcWebAppWithUi.csproj", "{803E1492-22FA-4F63-9687-A30902682C15}"
1529
EndProject
1630
Global
1731
GlobalSection(SolutionConfigurationPlatforms) = preSolution
1832
Debug|Any CPU = Debug|Any CPU
1933
Release|Any CPU = Release|Any CPU
2034
EndGlobalSection
2135
GlobalSection(ProjectConfigurationPlatforms) = postSolution
22-
{2FBC237E-F3B4-444A-AF25-83111218E21B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
23-
{2FBC237E-F3B4-444A-AF25-83111218E21B}.Debug|Any CPU.Build.0 = Debug|Any CPU
24-
{2FBC237E-F3B4-444A-AF25-83111218E21B}.Release|Any CPU.ActiveCfg = Release|Any CPU
25-
{2FBC237E-F3B4-444A-AF25-83111218E21B}.Release|Any CPU.Build.0 = Release|Any CPU
26-
{7A33E6EB-DC22-4D4C-B581-50F642C32540}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
27-
{7A33E6EB-DC22-4D4C-B581-50F642C32540}.Debug|Any CPU.Build.0 = Debug|Any CPU
28-
{7A33E6EB-DC22-4D4C-B581-50F642C32540}.Release|Any CPU.ActiveCfg = Release|Any CPU
29-
{7A33E6EB-DC22-4D4C-B581-50F642C32540}.Release|Any CPU.Build.0 = Release|Any CPU
36+
{89E57FDC-5AF7-4AAF-A40B-FBA91D41ECF4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
37+
{89E57FDC-5AF7-4AAF-A40B-FBA91D41ECF4}.Debug|Any CPU.Build.0 = Debug|Any CPU
38+
{89E57FDC-5AF7-4AAF-A40B-FBA91D41ECF4}.Release|Any CPU.ActiveCfg = Release|Any CPU
39+
{89E57FDC-5AF7-4AAF-A40B-FBA91D41ECF4}.Release|Any CPU.Build.0 = Release|Any CPU
40+
{3E397C28-EDC7-4DCC-896F-476A9EE74E76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
41+
{3E397C28-EDC7-4DCC-896F-476A9EE74E76}.Debug|Any CPU.Build.0 = Debug|Any CPU
42+
{3E397C28-EDC7-4DCC-896F-476A9EE74E76}.Release|Any CPU.ActiveCfg = Release|Any CPU
43+
{3E397C28-EDC7-4DCC-896F-476A9EE74E76}.Release|Any CPU.Build.0 = Release|Any CPU
44+
{0833E296-398F-42A4-9531-D125483AB019}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
45+
{0833E296-398F-42A4-9531-D125483AB019}.Debug|Any CPU.Build.0 = Debug|Any CPU
46+
{0833E296-398F-42A4-9531-D125483AB019}.Release|Any CPU.ActiveCfg = Release|Any CPU
47+
{0833E296-398F-42A4-9531-D125483AB019}.Release|Any CPU.Build.0 = Release|Any CPU
48+
{A3124728-6766-48A3-BA1A-5CB119924395}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
49+
{A3124728-6766-48A3-BA1A-5CB119924395}.Debug|Any CPU.Build.0 = Debug|Any CPU
50+
{A3124728-6766-48A3-BA1A-5CB119924395}.Release|Any CPU.ActiveCfg = Release|Any CPU
51+
{A3124728-6766-48A3-BA1A-5CB119924395}.Release|Any CPU.Build.0 = Release|Any CPU
52+
{0FC61895-DE38-4526-96EE-C6CB6AA92A3B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
53+
{0FC61895-DE38-4526-96EE-C6CB6AA92A3B}.Debug|Any CPU.Build.0 = Debug|Any CPU
54+
{0FC61895-DE38-4526-96EE-C6CB6AA92A3B}.Release|Any CPU.ActiveCfg = Release|Any CPU
55+
{0FC61895-DE38-4526-96EE-C6CB6AA92A3B}.Release|Any CPU.Build.0 = Release|Any CPU
56+
{4D5C1490-63F8-434A-A730-380AA6441CE9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
57+
{4D5C1490-63F8-434A-A730-380AA6441CE9}.Debug|Any CPU.Build.0 = Debug|Any CPU
58+
{4D5C1490-63F8-434A-A730-380AA6441CE9}.Release|Any CPU.ActiveCfg = Release|Any CPU
59+
{4D5C1490-63F8-434A-A730-380AA6441CE9}.Release|Any CPU.Build.0 = Release|Any CPU
60+
{803E1492-22FA-4F63-9687-A30902682C15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
61+
{803E1492-22FA-4F63-9687-A30902682C15}.Debug|Any CPU.Build.0 = Debug|Any CPU
62+
{803E1492-22FA-4F63-9687-A30902682C15}.Release|Any CPU.ActiveCfg = Release|Any CPU
63+
{803E1492-22FA-4F63-9687-A30902682C15}.Release|Any CPU.Build.0 = Release|Any CPU
3064
EndGlobalSection
3165
GlobalSection(SolutionProperties) = preSolution
3266
HideSolutionNode = FALSE
3367
EndGlobalSection
3468
GlobalSection(NestedProjects) = preSolution
35-
{2459B1ED-9F9A-4472-BCD2-1595ED65E1A5} = {598AB890-98C2-4DAE-B079-61BBEC8E22E4}
36-
{8179B3B2-DD82-4F8C-B42F-B8D2B19D9577} = {598AB890-98C2-4DAE-B079-61BBEC8E22E4}
37-
{2FBC237E-F3B4-444A-AF25-83111218E21B} = {2459B1ED-9F9A-4472-BCD2-1595ED65E1A5}
38-
{7A33E6EB-DC22-4D4C-B581-50F642C32540} = {8179B3B2-DD82-4F8C-B42F-B8D2B19D9577}
69+
{89E57FDC-5AF7-4AAF-A40B-FBA91D41ECF4} = {A7EEBB7E-C64D-4475-93D0-872E080A4E03}
70+
{3E397C28-EDC7-4DCC-896F-476A9EE74E76} = {A7EEBB7E-C64D-4475-93D0-872E080A4E03}
71+
{5FEB9007-1EFA-4814-BC15-DB0370B84E22} = {BAAF9837-1DB5-4032-AB2A-2901E6EE6EF8}
72+
{0833E296-398F-42A4-9531-D125483AB019} = {5FEB9007-1EFA-4814-BC15-DB0370B84E22}
73+
{11B88EB7-66BE-402A-A4E0-144220EBD8B9} = {BAAF9837-1DB5-4032-AB2A-2901E6EE6EF8}
74+
{A3124728-6766-48A3-BA1A-5CB119924395} = {11B88EB7-66BE-402A-A4E0-144220EBD8B9}
75+
{0FC61895-DE38-4526-96EE-C6CB6AA92A3B} = {DF22D7D8-4CE9-4A0E-9D9B-FB5D6D637089}
76+
{4D5C1490-63F8-434A-A730-380AA6441CE9} = {A7EEBB7E-C64D-4475-93D0-872E080A4E03}
77+
{803E1492-22FA-4F63-9687-A30902682C15} = {5FEB9007-1EFA-4814-BC15-DB0370B84E22}
3978
EndGlobalSection
4079
GlobalSection(ExtensibilityGlobals) = postSolution
4180
SolutionGuid = {18C80710-C9E9-488B-9100-1E4BF8B18038}

0 commit comments

Comments
 (0)