|
|
|
@ -1,10 +1,6 @@ |
|
|
|
Microsoft Visual Studio Solution File, Format Version 12.00 |
|
|
|
# Visual Studio Version 17 |
|
|
|
<<<<<<< HEAD |
|
|
|
VisualStudioVersion = 17.5.33516.290 |
|
|
|
======= |
|
|
|
VisualStudioVersion = 17.6.33815.320 |
|
|
|
>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 |
|
|
|
MinimumVisualStudioVersion = 10.0.40219.1 |
|
|
|
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Gateways", "Gateways", "{593B8559-1521-4E54-A7DF-7F58E5F6EA86}" |
|
|
|
EndProject |
|
|
|
@ -68,11 +64,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseService.HttpApi", "Modu |
|
|
|
EndProject |
|
|
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BaseService.HttpApi.Client", "Modules\BaseService\BaseService.HttpApi.Client\BaseService.HttpApi.Client.csproj", "{1913786D-E64D-48E4-98A7-42C3BCA9C282}" |
|
|
|
EndProject |
|
|
|
<<<<<<< HEAD |
|
|
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthServer.Host", "AuthServer\AuthServer.Host\AuthServer.Host.csproj", "{C94F578D-C331-4A9D-B001-93DAECB51447}" |
|
|
|
======= |
|
|
|
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AuthServer.Host", "AuthServer\AuthServer.Host\AuthServer.Host.csproj", "{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}" |
|
|
|
>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 |
|
|
|
EndProject |
|
|
|
Global |
|
|
|
GlobalSection(SolutionConfigurationPlatforms) = preSolution |
|
|
|
@ -164,17 +156,10 @@ Global |
|
|
|
{1913786D-E64D-48E4-98A7-42C3BCA9C282}.Debug|Any CPU.Build.0 = Debug|Any CPU |
|
|
|
{1913786D-E64D-48E4-98A7-42C3BCA9C282}.Release|Any CPU.ActiveCfg = Release|Any CPU |
|
|
|
{1913786D-E64D-48E4-98A7-42C3BCA9C282}.Release|Any CPU.Build.0 = Release|Any CPU |
|
|
|
<<<<<<< HEAD |
|
|
|
{C94F578D-C331-4A9D-B001-93DAECB51447}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
|
|
|
{C94F578D-C331-4A9D-B001-93DAECB51447}.Debug|Any CPU.Build.0 = Debug|Any CPU |
|
|
|
{C94F578D-C331-4A9D-B001-93DAECB51447}.Release|Any CPU.ActiveCfg = Release|Any CPU |
|
|
|
{C94F578D-C331-4A9D-B001-93DAECB51447}.Release|Any CPU.Build.0 = Release|Any CPU |
|
|
|
======= |
|
|
|
{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU |
|
|
|
{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Debug|Any CPU.Build.0 = Debug|Any CPU |
|
|
|
{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Release|Any CPU.ActiveCfg = Release|Any CPU |
|
|
|
{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7}.Release|Any CPU.Build.0 = Release|Any CPU |
|
|
|
>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 |
|
|
|
EndGlobalSection |
|
|
|
GlobalSection(SolutionProperties) = preSolution |
|
|
|
HideSolutionNode = FALSE |
|
|
|
@ -205,11 +190,7 @@ Global |
|
|
|
{56B50817-0F64-4CD8-814D-CA3827F40FFB} = {B55F5923-5FDE-4BEB-9E81-BE270D5909A1} |
|
|
|
{65DEB438-557B-4268-8EC6-25A9A2ED6FE1} = {B55F5923-5FDE-4BEB-9E81-BE270D5909A1} |
|
|
|
{1913786D-E64D-48E4-98A7-42C3BCA9C282} = {B55F5923-5FDE-4BEB-9E81-BE270D5909A1} |
|
|
|
<<<<<<< HEAD |
|
|
|
{C94F578D-C331-4A9D-B001-93DAECB51447} = {BD0465F1-50F8-4913-8B01-7C2E44CEED27} |
|
|
|
======= |
|
|
|
{4C7A0E8B-2DBC-4E76-8F68-0DD200CE88E7} = {BD0465F1-50F8-4913-8B01-7C2E44CEED27} |
|
|
|
>>>>>>> 1c2946500765850db29fa7d216f5e55e2e4de888 |
|
|
|
EndGlobalSection |
|
|
|
GlobalSection(ExtensibilityGlobals) = postSolution |
|
|
|
SolutionGuid = {CAAF5A4A-B83D-4CCD-BF50-58035AD87837} |
|
|
|
|
