diff --git a/PokerHandSorterConsoleApp/GameFramework/GameFramework.csproj b/PokerHandSorterConsoleApp/GameFramework/GameFramework.csproj index 74b8030..8ba03d4 100644 --- a/PokerHandSorterConsoleApp/GameFramework/GameFramework.csproj +++ b/PokerHandSorterConsoleApp/GameFramework/GameFramework.csproj @@ -5,7 +5,8 @@ - + + diff --git a/PokerHandSorterConsoleApp/GameFramework/Services/IGameService.cs b/PokerHandSorterConsoleApp/GameFramework/Services/IGameService.cs index a5edebe..595a729 100644 --- a/PokerHandSorterConsoleApp/GameFramework/Services/IGameService.cs +++ b/PokerHandSorterConsoleApp/GameFramework/Services/IGameService.cs @@ -1,6 +1,4 @@ -using System; -using System.Collections.Generic; -using System.Text; +using System.Collections.Generic; using PokerHandDomainModels; diff --git a/PokerHandSorterConsoleApp/PokerHandDomain/CardModel.cs b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/CardModel.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandDomain/CardModel.cs rename to PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/CardModel.cs diff --git a/PokerHandSorterConsoleApp/PokerHandDomain/CardModelVariants/FullHouseModel.cs b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/CardModelVariants/FullHouseModel.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandDomain/CardModelVariants/FullHouseModel.cs rename to PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/CardModelVariants/FullHouseModel.cs diff --git a/PokerHandSorterConsoleApp/PokerHandDomain/ConsolidatedWonHandsReportModel.cs b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/ConsolidatedWonHandsReportModel.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandDomain/ConsolidatedWonHandsReportModel.cs rename to PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/ConsolidatedWonHandsReportModel.cs diff --git a/PokerHandSorterConsoleApp/PokerHandDomain/Enums/SpecialCardEnum.cs b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/Enums/SpecialCardEnum.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandDomain/Enums/SpecialCardEnum.cs rename to PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/Enums/SpecialCardEnum.cs diff --git a/PokerHandSorterConsoleApp/PokerHandDomain/GameModel.cs b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/GameModel.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandDomain/GameModel.cs rename to PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/GameModel.cs diff --git a/PokerHandSorterConsoleApp/PokerHandDomain/GameWonModel.cs b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/GameWonModel.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandDomain/GameWonModel.cs rename to PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/GameWonModel.cs diff --git a/PokerHandSorterConsoleApp/PokerHandDomain/PlayerModel.cs b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/PlayerModel.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandDomain/PlayerModel.cs rename to PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/PlayerModel.cs diff --git a/PokerHandSorterConsoleApp/PokerHandDomain/PokerHandDomainModels.csproj b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/PokerHandDomainModels.csproj similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandDomain/PokerHandDomainModels.csproj rename to PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomain/PokerHandDomainModels.csproj diff --git a/PokerHandSorterConsoleApp/PokerHandDomainModels.Extensions/PlayerModelExtension.cs b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PlayerModelExtension.cs similarity index 100% rename from PokerHandSorterConsoleApp/PokerHandDomainModels.Extensions/PlayerModelExtension.cs rename to PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PlayerModelExtension.cs diff --git a/PokerHandSorterConsoleApp/PokerHandDomainModels.Extensions/PokerHandDomainModels.Extensions.csproj b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PokerHandDomainModels.Extensions.csproj similarity index 66% rename from PokerHandSorterConsoleApp/PokerHandDomainModels.Extensions/PokerHandDomainModels.Extensions.csproj rename to PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PokerHandDomainModels.Extensions.csproj index 1583ddc..b2abefb 100644 --- a/PokerHandSorterConsoleApp/PokerHandDomainModels.Extensions/PokerHandDomainModels.Extensions.csproj +++ b/PokerHandSorterConsoleApp/GameModels/PokerHands/PokerHandDomainModels.Extensions/PokerHandDomainModels.Extensions.csproj @@ -5,8 +5,8 @@ + - - + diff --git a/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln b/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln index a50d9e8..92e85dc 100644 --- a/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln +++ b/PokerHandSorterConsoleApp/PokerHandConsoleSolution.sln @@ -5,14 +5,10 @@ VisualStudioVersion = 16.0.30804.86 MinimumVisualStudioVersion = 10.0.40219.1 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "GameServices", "PokerHanderSorterService\GameServices.csproj", "{F69F2713-5791-42A6-B850-F40CE612738C}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandDomainModels", "PokerHandDomain\PokerHandDomainModels.csproj", "{0C1F6175-BC7D-43A4-8295-50B7355F92AF}" -EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandLogicRuleHandlers", "PokerHandLogicHandler\PokerHandLogicRuleHandlers.csproj", "{ADE26051-852B-44EC-AAD3-9F7F689E0220}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{F1697E6C-9248-4530-8CD6-97963E74A3B4}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandDomainModels.Extensions", "PokerHandDomainModels.Extensions\PokerHandDomainModels.Extensions.csproj", "{9AA5813D-9FDC-4157-9FCB-224DBCD8E7C4}" -EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Interfaces", "Interfaces", "{28B1A074-245B-4D37-B269-88BCA51C84DF}" EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Implementations", "Implementations", "{F19BAA81-46CD-4736-8AE3-2E62B93C723E}" @@ -35,6 +31,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandLogicHandlersTests EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandSorterServiceTests", "Tests\PokerHandSorterServiceTests\PokerHandSorterServiceTests.csproj", "{3F6A6023-D23A-4081-8FF3-FF1E2211046C}" EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandDomainModels", "GameModels\PokerHands\PokerHandDomain\PokerHandDomainModels.csproj", "{861A40F5-6AE7-44FE-87F2-999E78020F76}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PokerHandDomainModels.Extensions", "GameModels\PokerHands\PokerHandDomainModels.Extensions\PokerHandDomainModels.Extensions.csproj", "{6621CC38-90A6-459A-99A9-00AD20A261A0}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -45,18 +45,10 @@ Global {F69F2713-5791-42A6-B850-F40CE612738C}.Debug|Any CPU.Build.0 = Debug|Any CPU {F69F2713-5791-42A6-B850-F40CE612738C}.Release|Any CPU.ActiveCfg = Release|Any CPU {F69F2713-5791-42A6-B850-F40CE612738C}.Release|Any CPU.Build.0 = Release|Any CPU - {0C1F6175-BC7D-43A4-8295-50B7355F92AF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {0C1F6175-BC7D-43A4-8295-50B7355F92AF}.Debug|Any CPU.Build.0 = Debug|Any CPU - {0C1F6175-BC7D-43A4-8295-50B7355F92AF}.Release|Any CPU.ActiveCfg = Release|Any CPU - {0C1F6175-BC7D-43A4-8295-50B7355F92AF}.Release|Any CPU.Build.0 = Release|Any CPU {ADE26051-852B-44EC-AAD3-9F7F689E0220}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {ADE26051-852B-44EC-AAD3-9F7F689E0220}.Debug|Any CPU.Build.0 = Debug|Any CPU {ADE26051-852B-44EC-AAD3-9F7F689E0220}.Release|Any CPU.ActiveCfg = Release|Any CPU {ADE26051-852B-44EC-AAD3-9F7F689E0220}.Release|Any CPU.Build.0 = Release|Any CPU - {9AA5813D-9FDC-4157-9FCB-224DBCD8E7C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9AA5813D-9FDC-4157-9FCB-224DBCD8E7C4}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9AA5813D-9FDC-4157-9FCB-224DBCD8E7C4}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9AA5813D-9FDC-4157-9FCB-224DBCD8E7C4}.Release|Any CPU.Build.0 = Release|Any CPU {FCFBE5D4-8ADC-4498-AEB6-454FE4EE3B0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {FCFBE5D4-8ADC-4498-AEB6-454FE4EE3B0E}.Debug|Any CPU.Build.0 = Debug|Any CPU {FCFBE5D4-8ADC-4498-AEB6-454FE4EE3B0E}.Release|Any CPU.ActiveCfg = Release|Any CPU @@ -73,21 +65,29 @@ Global {3F6A6023-D23A-4081-8FF3-FF1E2211046C}.Debug|Any CPU.Build.0 = Debug|Any CPU {3F6A6023-D23A-4081-8FF3-FF1E2211046C}.Release|Any CPU.ActiveCfg = Release|Any CPU {3F6A6023-D23A-4081-8FF3-FF1E2211046C}.Release|Any CPU.Build.0 = Release|Any CPU + {861A40F5-6AE7-44FE-87F2-999E78020F76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {861A40F5-6AE7-44FE-87F2-999E78020F76}.Debug|Any CPU.Build.0 = Debug|Any CPU + {861A40F5-6AE7-44FE-87F2-999E78020F76}.Release|Any CPU.ActiveCfg = Release|Any CPU + {861A40F5-6AE7-44FE-87F2-999E78020F76}.Release|Any CPU.Build.0 = Release|Any CPU + {6621CC38-90A6-459A-99A9-00AD20A261A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {6621CC38-90A6-459A-99A9-00AD20A261A0}.Debug|Any CPU.Build.0 = Debug|Any CPU + {6621CC38-90A6-459A-99A9-00AD20A261A0}.Release|Any CPU.ActiveCfg = Release|Any CPU + {6621CC38-90A6-459A-99A9-00AD20A261A0}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE EndGlobalSection GlobalSection(NestedProjects) = preSolution {F69F2713-5791-42A6-B850-F40CE612738C} = {F19BAA81-46CD-4736-8AE3-2E62B93C723E} - {0C1F6175-BC7D-43A4-8295-50B7355F92AF} = {BA5E61AE-7917-4AF8-9F56-505EBD8A44EF} {ADE26051-852B-44EC-AAD3-9F7F689E0220} = {2240E6A7-3D12-45AD-9262-B2BA7AD8DEEE} - {9AA5813D-9FDC-4157-9FCB-224DBCD8E7C4} = {BA5E61AE-7917-4AF8-9F56-505EBD8A44EF} {BA5E61AE-7917-4AF8-9F56-505EBD8A44EF} = {D4555EBA-DE48-4BC2-A173-01F92CC09079} {B14EF8D3-E4CF-4296-B462-1B21B64DF1C6} = {F1697E6C-9248-4530-8CD6-97963E74A3B4} {2240E6A7-3D12-45AD-9262-B2BA7AD8DEEE} = {EABBA59C-09F4-48D1-9C37-8F20E0C93992} {FCFBE5D4-8ADC-4498-AEB6-454FE4EE3B0E} = {28B1A074-245B-4D37-B269-88BCA51C84DF} {E42C5890-2CEF-40FE-9C23-DC34CB9E9E48} = {B14EF8D3-E4CF-4296-B462-1B21B64DF1C6} {3F6A6023-D23A-4081-8FF3-FF1E2211046C} = {B14EF8D3-E4CF-4296-B462-1B21B64DF1C6} + {861A40F5-6AE7-44FE-87F2-999E78020F76} = {BA5E61AE-7917-4AF8-9F56-505EBD8A44EF} + {6621CC38-90A6-459A-99A9-00AD20A261A0} = {BA5E61AE-7917-4AF8-9F56-505EBD8A44EF} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1DDA806A-1A88-432B-84BD-03C8200EF17C} diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/CardsLookupBuilder.cs b/PokerHandSorterConsoleApp/PokerHandLogicHandler/CardsLookupBuilder.cs index f15d621..3f4bf99 100644 --- a/PokerHandSorterConsoleApp/PokerHandLogicHandler/CardsLookupBuilder.cs +++ b/PokerHandSorterConsoleApp/PokerHandLogicHandler/CardsLookupBuilder.cs @@ -1,4 +1,5 @@ using System.Collections.Generic; + using PokerHandDomainModels; namespace PokerHandLogicHandlers diff --git a/PokerHandSorterConsoleApp/PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj b/PokerHandSorterConsoleApp/PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj index 74b8030..204489f 100644 --- a/PokerHandSorterConsoleApp/PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj +++ b/PokerHandSorterConsoleApp/PokerHandLogicHandler/PokerHandLogicRuleHandlers.csproj @@ -5,7 +5,7 @@ - + diff --git a/PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj b/PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj index ca5c678..5527c0f 100644 --- a/PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj +++ b/PokerHandSorterConsoleApp/PokerHanderSorterService/GameServices.csproj @@ -6,8 +6,6 @@ - - diff --git a/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj index 715d311..f893f4d 100644 --- a/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj +++ b/PokerHandSorterConsoleApp/Tests/PokerHandLogicHandlerTests/PokerHandLogicHandlersTests.csproj @@ -20,8 +20,6 @@ - - diff --git a/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj index 3877d28..225ca4a 100644 --- a/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj +++ b/PokerHandSorterConsoleApp/Tests/PokerHandSorterServiceTests/PokerHandSorterServiceTests.csproj @@ -37,8 +37,6 @@ - -