From 60f0b8f1061f336c623ff3e68ca43a302aa48e62 Mon Sep 17 00:00:00 2001 From: SAliulov <146759803+SAliulov@users.noreply.github.com> Date: Mon, 17 Jun 2024 17:14:31 +0300 Subject: [PATCH] =?UTF-8?q?net8.0,=20=20=D0=B2=20StorageCollection=20?= =?UTF-8?q?=D0=B1=D0=B0=D0=B7=D0=BE=D0=B2=D1=8B=D0=B9=20=D0=BE=D0=B1=D1=8A?= =?UTF-8?q?=D0=B5=D0=BA=D1=82,=20=D0=B2=20=D0=BA=D0=BB=D0=B0=D1=81=D1=81?= =?UTF-8?q?=D0=B5=20=D0=A1=D0=BE=D0=B7=D0=B4=D0=B0=D0=BD=D0=B8=D0=B8=20?= =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BF=D0=B0=D0=BD=D0=B8=D0=B8=20"=D0=90?= =?UTF-8?q?=D0=BD=D0=B3=D0=B0=D1=80"=20=D0=B7=D0=B0=D0=BC=D0=B5=D0=BD?= =?UTF-8?q?=D0=B8=D0=BB=20=D0=BD=D0=B0=20"=D0=A5=D1=80=D0=B0=D0=BD=D0=B8?= =?UTF-8?q?=D0=BB=D0=B8=D1=89=D0=B5"?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../CollectionGenericObjects/StorageCollection.cs | 2 +- ProjectAirBomber/ProjectAirBomber/FormBomberCollection.cs | 4 ++-- ProjectAirBomber/ProjectAirBomber/ProjectAirBomber.csproj | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/StorageCollection.cs b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/StorageCollection.cs index 468f73b..47b74c8 100644 --- a/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/StorageCollection.cs +++ b/ProjectAirBomber/ProjectAirBomber/CollectionGenericObjects/StorageCollection.cs @@ -10,7 +10,7 @@ namespace ProjectAirBomber.CollectionGenericObjects; /// /// public class StorageCollection - where T : DrawningAirBomber + where T : DrawningBomber { /// /// Словарь (хранилище) с коллекциями diff --git a/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.cs b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.cs index 32855ce..94252e1 100644 --- a/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.cs +++ b/ProjectAirBomber/ProjectAirBomber/FormBomberCollection.cs @@ -166,7 +166,7 @@ public partial class FormBomberCollection : Form } catch (ObjectNotFoundException) { - _logger.LogError("Ошибка при передаче объекта на FormAirFighter"); + _logger.LogError("Ошибка при передаче объекта на FormAirBomber"); } } @@ -276,7 +276,7 @@ public partial class FormBomberCollection : Form switch (comboBoxSelectorCompany.Text) { - case "Ангар": + case "Хранилище": _company = new BomberHungarService(pictureBox.Width, pictureBox.Height, collection); break; } diff --git a/ProjectAirBomber/ProjectAirBomber/ProjectAirBomber.csproj b/ProjectAirBomber/ProjectAirBomber/ProjectAirBomber.csproj index 228b2c7..36a7753 100644 --- a/ProjectAirBomber/ProjectAirBomber/ProjectAirBomber.csproj +++ b/ProjectAirBomber/ProjectAirBomber/ProjectAirBomber.csproj @@ -2,7 +2,7 @@ WinExe - net7.0-windows + net8.0-windows7.0 enable true enable