From bbc58f74820c672e5e43139db593e2ef8d73b60c Mon Sep 17 00:00:00 2001 From: Programmist73 Date: Sun, 5 Feb 2023 21:00:26 +0400 Subject: [PATCH] =?UTF-8?q?=D0=9D=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B9?= =?UTF-8?q?=D0=BA=D0=B0=20=D0=BF=D0=B0=D0=BF=D0=BE=D0=BA=20=D0=BF=D1=80?= =?UTF-8?q?=D0=BE=D0=B5=D0=BA=D1=82=D0=B0.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- BlacksmithWorkshop/BlacksmithWorkshop.sln | 6 ++++++ .../BindingModels/ComponentBindingModel.cs | 13 +++++++++++++ .../BlacksmithWorkshopContracts.csproj | 9 +++++++++ .../{ => Enums}/OrderStatus.cs | 0 .../BlacksmithWorkshopDataModels/IId.cs | 2 +- .../{ => Models}/IComponentModel.cs | 4 ++-- .../{ => Models}/IOrderModel.cs | 4 ++-- .../{ => Models}/IProductModel.cs | 4 ++-- 8 files changed, 35 insertions(+), 7 deletions(-) create mode 100644 BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ComponentBindingModel.cs create mode 100644 BlacksmithWorkshop/BlacksmithWorkshopContracts/BlacksmithWorkshopContracts.csproj rename BlacksmithWorkshop/BlacksmithWorkshopDataModels/{ => Enums}/OrderStatus.cs (100%) rename BlacksmithWorkshop/BlacksmithWorkshopDataModels/{ => Models}/IComponentModel.cs (83%) rename BlacksmithWorkshop/BlacksmithWorkshopDataModels/{ => Models}/IOrderModel.cs (90%) rename BlacksmithWorkshop/BlacksmithWorkshopDataModels/{ => Models}/IProductModel.cs (85%) diff --git a/BlacksmithWorkshop/BlacksmithWorkshop.sln b/BlacksmithWorkshop/BlacksmithWorkshop.sln index 496ab40..feccacf 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshop.sln +++ b/BlacksmithWorkshop/BlacksmithWorkshop.sln @@ -7,6 +7,8 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BlacksmithWorkshop", "Black EndProject Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopDataModels", "BlacksmithWorkshopDataModels\BlacksmithWorkshopDataModels.csproj", "{842406BF-3B58-4F5C-A4EB-AAB84F66ABEC}" EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BlacksmithWorkshopContracts", "BlacksmithWorkshopContracts\BlacksmithWorkshopContracts.csproj", "{EBDA1A18-346F-4427-BC86-ED41C062A75B}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -21,6 +23,10 @@ Global {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 + {EBDA1A18-346F-4427-BC86-ED41C062A75B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {EBDA1A18-346F-4427-BC86-ED41C062A75B}.Debug|Any CPU.Build.0 = Debug|Any CPU + {EBDA1A18-346F-4427-BC86-ED41C062A75B}.Release|Any CPU.ActiveCfg = Release|Any CPU + {EBDA1A18-346F-4427-BC86-ED41C062A75B}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ComponentBindingModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ComponentBindingModel.cs new file mode 100644 index 0000000..d972681 --- /dev/null +++ b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BindingModels/ComponentBindingModel.cs @@ -0,0 +1,13 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using BlacksmithWorkshopDataModels; + +namespace BlacksmithWorkshopContracts.BindingModels +{ + internal class ComponentBindingModel : IComponentModel + { + } +} diff --git a/BlacksmithWorkshop/BlacksmithWorkshopContracts/BlacksmithWorkshopContracts.csproj b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BlacksmithWorkshopContracts.csproj new file mode 100644 index 0000000..132c02c --- /dev/null +++ b/BlacksmithWorkshop/BlacksmithWorkshopContracts/BlacksmithWorkshopContracts.csproj @@ -0,0 +1,9 @@ + + + + net6.0 + enable + enable + + + diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDataModels/OrderStatus.cs b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/Enums/OrderStatus.cs similarity index 100% rename from BlacksmithWorkshop/BlacksmithWorkshopDataModels/OrderStatus.cs rename to BlacksmithWorkshop/BlacksmithWorkshopDataModels/Enums/OrderStatus.cs diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IId.cs b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IId.cs index b6ba8b7..1804a4a 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IId.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IId.cs @@ -7,7 +7,7 @@ using System.Threading.Tasks; namespace BlacksmithWorkshopDataModels { //интерфейс, отвечающий за id у компонентов, продуктов и чеков - internal interface IId + public interface IId { int Id { get; } } diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IComponentModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IComponentModel.cs similarity index 83% rename from BlacksmithWorkshop/BlacksmithWorkshopDataModels/IComponentModel.cs rename to BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IComponentModel.cs index ab386fb..01c03ce 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IComponentModel.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IComponentModel.cs @@ -4,10 +4,10 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BlacksmithWorkshopDataModels +namespace BlacksmithWorkshopDataModels.Models { //интерфейс, отвечающий за компоненты - internal interface IComponentModel : IId + public interface IComponentModel : IId { //название составляющей (изделие состоит из составляющих) string ComponentName { get; } diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IOrderModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IOrderModel.cs similarity index 90% rename from BlacksmithWorkshop/BlacksmithWorkshopDataModels/IOrderModel.cs rename to BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IOrderModel.cs index 5a9adb0..df8dd03 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IOrderModel.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IOrderModel.cs @@ -5,10 +5,10 @@ using System.Text; using System.Threading.Tasks; using BlacksmithWorkshopDataModels.Enums; -namespace BlacksmithWorkshopDataModels +namespace BlacksmithWorkshopDataModels.Models { //интерфейс, отвечающий за чек - internal interface IOrderModel : IId + public interface IOrderModel : IId { //id продукта int ProductId { get; } diff --git a/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IProductModel.cs b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IProductModel.cs similarity index 85% rename from BlacksmithWorkshop/BlacksmithWorkshopDataModels/IProductModel.cs rename to BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IProductModel.cs index 93cf815..f1d79df 100644 --- a/BlacksmithWorkshop/BlacksmithWorkshopDataModels/IProductModel.cs +++ b/BlacksmithWorkshop/BlacksmithWorkshopDataModels/Models/IProductModel.cs @@ -4,10 +4,10 @@ using System.Linq; using System.Text; using System.Threading.Tasks; -namespace BlacksmithWorkshopDataModels +namespace BlacksmithWorkshopDataModels.Models { //интерфейс, отвечающий за продукт - internal interface IProductModel : IId + public interface IProductModel : IId { //наименование изделия string ProductName { get; }