diff --git a/AbstractShopDataModels/AbstractShopDataModels.sln b/AbstractShopDataModels/AbstractShopDataModels.sln deleted file mode 100644 index 01b71de..0000000 --- a/AbstractShopDataModels/AbstractShopDataModels.sln +++ /dev/null @@ -1,25 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio Version 17 -VisualStudioVersion = 17.4.33103.184 -MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AbstractShopDataModels", "AbstractShopDataModels\AbstractShopDataModels.csproj", "{7388459F-91DB-40D9-8999-500015301160}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Release|Any CPU = Release|Any CPU - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {7388459F-91DB-40D9-8999-500015301160}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {7388459F-91DB-40D9-8999-500015301160}.Debug|Any CPU.Build.0 = Debug|Any CPU - {7388459F-91DB-40D9-8999-500015301160}.Release|Any CPU.ActiveCfg = Release|Any CPU - {7388459F-91DB-40D9-8999-500015301160}.Release|Any CPU.Build.0 = Release|Any CPU - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ExtensibilityGlobals) = postSolution - SolutionGuid = {60688C9E-4871-4357-A48F-63718AD0FA65} - EndGlobalSection -EndGlobal diff --git a/BlacksmithWorkshop/BlacksmithWorkshop.sln b/BlacksmithWorkshop/BlacksmithWorkshop.sln index 6d9e398..496ab40 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop.sln +++ b/BlacksmithWorkshop/BlacksmithWorkshop.sln @@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.4.33103.184 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshop", "BlacksmithWorkshop\BlacksmithWorkshop.csproj", "{FEF2DC94-D11E-4D77-9F59-5B89A09D0996}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshop", "BlacksmithWorkshop\BlacksmithWorkshop.csproj", "{FEF2DC94-D11E-4D77-9F59-5B89A09D0996}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopDataModels", "BlacksmithWorkshopDataModels\BlacksmithWorkshopDataModels.csproj", "{842406BF-3B58-4F5C-A4EB-AAB84F66ABEC}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,6 +17,10 @@ Global {FEF2DC94-D11E-4D77-9F59-5B89A09D0996}.Debug|Any CPU.Build.0 = Debug|Any CPU {FEF2DC94-D11E-4D77-9F59-5B89A09D0996}.Release|Any CPU.ActiveCfg = Release|Any CPU {FEF2DC94-D11E-4D77-9F59-5B89A09D0996}.Release|Any CPU.Build.0 = Release|Any CPU + {842406BF-3B58-4F5C-A4EB-AAB84F66ABEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {842406BF-3B58-4F5C-A4EB-AAB84F66ABEC}.Debug|Any CPU.Build.0 = Debug|Any CPU + {842406BF-3B58-4F5C-A4EB-AAB84F66ABEC}.Release|Any CPU.ActiveCfg = Release|Any CPU + {842406BF-3B58-4F5C-A4EB-AAB84F66ABEC}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/AbstractShopDataModels/AbstractShopDataModels/AbstractShopDataModels.csproj b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/BlacksmithWorkshopDataModels.csproj similarity index 100% rename from AbstractShopDataModels/AbstractShopDataModels/AbstractShopDataModels.csproj rename to BlacksmithWorkshop/BlacksmithWorkshopDataModels/BlacksmithWorkshopDataModels.csproj diff --git a/AbstractShopDataModels/AbstractShopDataModels/IComponentModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IComponentModel.cs similarity index 69% rename from AbstractShopDataModels/AbstractShopDataModels/IComponentModel.cs rename to BlacksmithWorkshop/BlacksmithWorkshopDataModels/IComponentModel.cs index 163b553..ab386fb 100644 --- a/AbstractShopDataModels/AbstractShopDataModels/IComponentModel.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IComponentModel.cs @@ -1,4 +1,10 @@ -namespace AbstractShopDataModels +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BlacksmithWorkshopDataModels { //интерфейс, отвечающий за компоненты internal interface IComponentModel : IId diff --git a/AbstractShopDataModels/AbstractShopDataModels/IId.cs b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IId.cs similarity index 52% rename from AbstractShopDataModels/AbstractShopDataModels/IId.cs rename to BlacksmithWorkshop/BlacksmithWorkshopDataModels/IId.cs index 3107c32..b6ba8b7 100644 --- a/AbstractShopDataModels/AbstractShopDataModels/IId.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IId.cs @@ -1,8 +1,14 @@ -namespace AbstractShopDataModels +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BlacksmithWorkshopDataModels { //интерфейс, отвечающий за id у компонентов, продуктов и чеков internal interface IId { int Id { get; } } -} +} \ No newline at end of file diff --git a/AbstractShopDataModels/AbstractShopDataModels/IOrderModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IOrderModel.cs similarity index 76% rename from AbstractShopDataModels/AbstractShopDataModels/IOrderModel.cs rename to BlacksmithWorkshop/BlacksmithWorkshopDataModels/IOrderModel.cs index 96b2fb4..5a9adb0 100644 --- a/AbstractShopDataModels/AbstractShopDataModels/IOrderModel.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IOrderModel.cs @@ -1,6 +1,11 @@ -using AbstractShopDataModels.Enums; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using BlacksmithWorkshopDataModels.Enums; -namespace AbstractShopDataModels +namespace BlacksmithWorkshopDataModels { //интерфейс, отвечающий за чек internal interface IOrderModel : IId diff --git a/AbstractShopDataModels/AbstractShopDataModels/IProductModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IProductModel.cs similarity index 93% rename from AbstractShopDataModels/AbstractShopDataModels/IProductModel.cs rename to BlacksmithWorkshop/BlacksmithWorkshopDataModels/IProductModel.cs index dfd51f8..93cf815 100644 --- a/AbstractShopDataModels/AbstractShopDataModels/IProductModel.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IProductModel.cs @@ -4,7 +4,7 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace AbstractShopDataModels +namespace BlacksmithWorkshopDataModels { //интерфейс, отвечающий за продукт internal interface IProductModel : IId diff --git a/AbstractShopDataModels/AbstractShopDataModels/OrderStatus.cs b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/OrderStatus.cs similarity index 57% rename from AbstractShopDataModels/AbstractShopDataModels/OrderStatus.cs rename to BlacksmithWorkshop/BlacksmithWorkshopDataModels/OrderStatus.cs index 863259d..293d304 100644 --- a/AbstractShopDataModels/AbstractShopDataModels/OrderStatus.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/OrderStatus.cs @@ -1,4 +1,10 @@ -namespace AbstractShopDataModels.Enums +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace BlacksmithWorkshopDataModels.Enums { //статус заказа public enum OrderStatus