@@ -63,10 +63,15 @@ EndProject
6363Project ("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" ) = "eShopOnContainers.TestRunner.Windows" , "src\Mobile\eShopOnContainers\eShopOnContainers.TestRunner.Windows\eShopOnContainers.TestRunner.Windows.csproj" , "{02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F}"
6464EndProject
6565Project ("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}" ) = "eShopOnContainers.TestRunner.iOS" , "src\Mobile\eShopOnContainers\eShopOnContainers.TestRunner.iOS\eShopOnContainers.TestRunner.iOS.csproj" , "{B68C2B56-7581-46AE-B55D-D25DDFD3BFE3}"
66+ EndProject
6667Project ("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}" ) = "Ordering.Application" , "src\Services\Ordering\Ordering.Application\Ordering.Application.xproj" , "{4193CAA3-A1C3-4818-A06F-A2D85FDE77E7}"
6768EndProject
6869Project ("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}" ) = "Ordering.Infrastructure" , "src\Services\Ordering\Ordering.Infrastructure\Ordering.Infrastructure.xproj" , "{95F1F07C-4D92-4742-BD07-E5B805AAB651}"
6970EndProject
71+ Project ("{2150E333-8FDC-42A3-9474-1A3956D46DE8}" ) = "Identity" , "Identity" , "{02DF7FEE-C302-433D-A6CD-237A2569F236}"
72+ EndProject
73+ Project ("{8BB2217D-0F2D-49D1-97BC-3654ED321F3B}" ) = "eShopOnContainers.Identity" , "src\Services\Identity\eShopOnContainers.Identity\eShopOnContainers.Identity.xproj" , "{A579E108-5445-403D-A407-339AC4D1611B}"
74+ EndProject
7075Global
7176 GlobalSection (SolutionConfigurationPlatforms ) = preSolution
7277 Ad -Hoc| Any CPU = Ad -Hoc| Any CPU
@@ -513,7 +518,6 @@ Global
513518 {9842DB3A-1391-48C7-A49C-2FABD0A18AC2} .Release| x64 .Build .0 = Release| Any CPU
514519 {9842DB3A-1391-48C7-A49C-2FABD0A18AC2} .Release| x86 .ActiveCfg = Release| Any CPU
515520 {9842DB3A-1391-48C7-A49C-2FABD0A18AC2} .Release| x86 .Build .0 = Release| Any CPU
516- <<<<<<< HEAD
517521 {F7B6A162-BC4D-4924-B16A-713F9B0344E7} .Ad -Hoc| Any CPU .ActiveCfg = Release| Any CPU
518522 {F7B6A162-BC4D-4924-B16A-713F9B0344E7} .Ad -Hoc| Any CPU .Build .0 = Release| Any CPU
519523 {F7B6A162-BC4D-4924-B16A-713F9B0344E7} .Ad -Hoc| ARM .ActiveCfg = Release| Any CPU
@@ -728,7 +732,6 @@ Global
728732 {B68C2B56-7581-46AE-B55D-D25DDFD3BFE3} .Release| iPhoneSimulator .Build .0 = Release| iPhoneSimulator
729733 {B68C2B56-7581-46AE-B55D-D25DDFD3BFE3} .Release| x64 .ActiveCfg = Release| iPhone
730734 {B68C2B56-7581-46AE-B55D-D25DDFD3BFE3} .Release| x86 .ActiveCfg = Release| iPhone
731- =======
732735 {4193CAA3-A1C3-4818-A06F-A2D85FDE77E7} .Ad -Hoc| Any CPU .ActiveCfg = Debug| Any CPU
733736 {4193CAA3-A1C3-4818-A06F-A2D85FDE77E7} .Ad -Hoc| Any CPU .Build .0 = Debug| Any CPU
734737 {4193CAA3-A1C3-4818-A06F-A2D85FDE77E7} .Ad -Hoc| ARM .ActiveCfg = Debug| Any CPU
@@ -825,7 +828,54 @@ Global
825828 {95F1F07C-4D92-4742-BD07-E5B805AAB651} .Release| x64 .Build .0 = Release| Any CPU
826829 {95F1F07C-4D92-4742-BD07-E5B805AAB651} .Release| x86 .ActiveCfg = Release| Any CPU
827830 {95F1F07C-4D92-4742-BD07-E5B805AAB651} .Release| x86 .Build .0 = Release| Any CPU
828- >>>>>>> OrderingRefactoring
831+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| Any CPU .ActiveCfg = Debug| Any CPU
832+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| Any CPU .Build .0 = Debug| Any CPU
833+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| ARM .ActiveCfg = Debug| Any CPU
834+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| ARM .Build .0 = Debug| Any CPU
835+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| iPhone .ActiveCfg = Debug| Any CPU
836+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| iPhone .Build .0 = Debug| Any CPU
837+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| iPhoneSimulator .ActiveCfg = Debug| Any CPU
838+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| iPhoneSimulator .Build .0 = Debug| Any CPU
839+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| x64 .ActiveCfg = Debug| Any CPU
840+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| x64 .Build .0 = Debug| Any CPU
841+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| x86 .ActiveCfg = Debug| Any CPU
842+ {A579E108-5445-403D-A407-339AC4D1611B} .Ad -Hoc| x86 .Build .0 = Debug| Any CPU
843+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| Any CPU .ActiveCfg = Debug| Any CPU
844+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| Any CPU .Build .0 = Debug| Any CPU
845+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| ARM .ActiveCfg = Debug| Any CPU
846+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| ARM .Build .0 = Debug| Any CPU
847+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| iPhone .ActiveCfg = Debug| Any CPU
848+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| iPhone .Build .0 = Debug| Any CPU
849+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| iPhoneSimulator .ActiveCfg = Debug| Any CPU
850+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| iPhoneSimulator .Build .0 = Debug| Any CPU
851+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| x64 .ActiveCfg = Debug| Any CPU
852+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| x64 .Build .0 = Debug| Any CPU
853+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| x86 .ActiveCfg = Debug| Any CPU
854+ {A579E108-5445-403D-A407-339AC4D1611B} .AppStore| x86 .Build .0 = Debug| Any CPU
855+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| Any CPU .ActiveCfg = Debug| Any CPU
856+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| Any CPU .Build .0 = Debug| Any CPU
857+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| ARM .ActiveCfg = Debug| Any CPU
858+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| ARM .Build .0 = Debug| Any CPU
859+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| iPhone .ActiveCfg = Debug| Any CPU
860+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| iPhone .Build .0 = Debug| Any CPU
861+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| iPhoneSimulator .ActiveCfg = Debug| Any CPU
862+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| iPhoneSimulator .Build .0 = Debug| Any CPU
863+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| x64 .ActiveCfg = Debug| Any CPU
864+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| x64 .Build .0 = Debug| Any CPU
865+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| x86 .ActiveCfg = Debug| Any CPU
866+ {A579E108-5445-403D-A407-339AC4D1611B} .Debug| x86 .Build .0 = Debug| Any CPU
867+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| Any CPU .ActiveCfg = Release| Any CPU
868+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| Any CPU .Build .0 = Release| Any CPU
869+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| ARM .ActiveCfg = Release| Any CPU
870+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| ARM .Build .0 = Release| Any CPU
871+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| iPhone .ActiveCfg = Release| Any CPU
872+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| iPhone .Build .0 = Release| Any CPU
873+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| iPhoneSimulator .ActiveCfg = Release| Any CPU
874+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| iPhoneSimulator .Build .0 = Release| Any CPU
875+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| x64 .ActiveCfg = Release| Any CPU
876+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| x64 .Build .0 = Release| Any CPU
877+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| x86 .ActiveCfg = Release| Any CPU
878+ {A579E108-5445-403D-A407-339AC4D1611B} .Release| x86 .Build .0 = Release| Any CPU
829879 EndGlobalSection
830880 GlobalSection (SolutionProperties ) = preSolution
831881 HideSolutionNode = FALSE
@@ -851,15 +901,14 @@ Global
851901 {778289CA-31F7-4464-8C2A-612EE846F8A7} = {F61357CE-1CC2-410E-8776-B16EEBC98EB8}
852902 {9CC7814B-72A6-465B-A61C-57B512DEE303} = {F61357CE-1CC2-410E-8776-B16EEBC98EB8}
853903 {9842DB3A-1391-48C7-A49C-2FABD0A18AC2} = {E279BF0F-7F66-4F3A-A3AB-2CDA66C1CD04}
854- <<<<<<< HEAD
855904 {B7B1D395-4E06-4036-BE86-C216756B9367} = {A857AD10-40FF-4303-BEC2-FF1C58D5735E}
856905 {F7B6A162-BC4D-4924-B16A-713F9B0344E7} = {B7B1D395-4E06-4036-BE86-C216756B9367}
857906 {A289A7F0-ACD8-42AE-87B6-AB1AFD310BF1} = {B7B1D395-4E06-4036-BE86-C216756B9367}
858907 {02680C26-CA1D-4D9D-A7E3-D66AF5BE6F2F} = {B7B1D395-4E06-4036-BE86-C216756B9367}
859908 {B68C2B56-7581-46AE-B55D-D25DDFD3BFE3} = {B7B1D395-4E06-4036-BE86-C216756B9367}
860- =======
861909 {4193CAA3-A1C3-4818-A06F-A2D85FDE77E7} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
862910 {95F1F07C-4D92-4742-BD07-E5B805AAB651} = {0BD0DB92-2D98-44D9-9AC0-C59186D59B0B}
863- >>>>>>> OrderingRefactoring
911+ {02DF7FEE-C302-433D-A6CD-237A2569F236} = {91CF7717-08AB-4E65-B10E-0B426F01E2E8}
912+ {A579E108-5445-403D-A407-339AC4D1611B} = {02DF7FEE-C302-433D-A6CD-237A2569F236}
864913 EndGlobalSection
865914EndGlobal
0 commit comments