From 4b7e4d1faafd184f0d07acbcf770e7c548201788 Mon Sep 17 00:00:00 2001
From: AnnaLioness <annalyovushkina@yandex.ru>
Date: Fri, 1 Dec 2023 15:43:06 +0400
Subject: [PATCH] =?UTF-8?q?=D0=BA=D0=BE=D0=BC=D0=BC=D0=B8=D1=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Lab1ContainersShip/Lab1ContainersShip.sln     |   4 +-
 .../Lab1ContainersShip.csproj                 | 129 ++----------------
 .../Properties/AssemblyInfo.cs                |  36 -----
 3 files changed, 10 insertions(+), 159 deletions(-)
 delete mode 100644 Lab1ContainersShip/Lab1ContainersShip/Properties/AssemblyInfo.cs

diff --git a/Lab1ContainersShip/Lab1ContainersShip.sln b/Lab1ContainersShip/Lab1ContainersShip.sln
index 80adb21..6bbc4cb 100644
--- a/Lab1ContainersShip/Lab1ContainersShip.sln
+++ b/Lab1ContainersShip/Lab1ContainersShip.sln
@@ -1,9 +1,9 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.4.33122.133
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Lab1ContainersShip", "Lab1ContainersShip\Lab1ContainersShip.csproj", "{AFA56719-1551-4DFA-9EC2-1FD7AB801A5E}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Lab1ContainersShip", "Lab1ContainersShip\Lab1ContainersShip.csproj", "{AFA56719-1551-4DFA-9EC2-1FD7AB801A5E}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
diff --git a/Lab1ContainersShip/Lab1ContainersShip/Lab1ContainersShip.csproj b/Lab1ContainersShip/Lab1ContainersShip/Lab1ContainersShip.csproj
index d7e5d07..43d2678 100644
--- a/Lab1ContainersShip/Lab1ContainersShip/Lab1ContainersShip.csproj
+++ b/Lab1ContainersShip/Lab1ContainersShip/Lab1ContainersShip.csproj
@@ -1,129 +1,16 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{AFA56719-1551-4DFA-9EC2-1FD7AB801A5E}</ProjectGuid>
+    <TargetFramework>net7.0-windows</TargetFramework>
     <OutputType>WinExe</OutputType>
-    <RootNamespace>Lab1ContainersShip</RootNamespace>
-    <AssemblyName>Lab1ContainersShip</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <UseWindowsForms>true</UseWindowsForms>
+    <ImportWindowsDesktopTargets>true</ImportWindowsDesktopTargets>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
+    <PackageReference Include="Microsoft.CSharp" Version="4.7.0" />
+    <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="AbstractStrategy.cs" />
-    <Compile Include="FormShipCollection.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FormShipCollection.Designer.cs">
-      <DependentUpon>FormShipCollection.cs</DependentUpon>
-    </Compile>
-    <Compile Include="FormShipConfig.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FormShipConfig.Designer.cs">
-      <DependentUpon>FormShipConfig.cs</DependentUpon>
-    </Compile>
-    <Compile Include="ShipGenericCollection.cs" />
-    <Compile Include="Direction.cs" />
-    <Compile Include="DrawingContainerShip.cs" />
-    <Compile Include="DrawingShip.cs" />
-    <Compile Include="DrawningObjectShip.cs" />
-    <Compile Include="EntityContainerShip.cs" />
-    <Compile Include="EntityShip.cs" />
-    <Compile Include="FormContainerShip.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="FormContainerShip.Designer.cs">
-      <DependentUpon>FormContainerShip.cs</DependentUpon>
-    </Compile>
-    <Compile Include="IMoveableObject.cs" />
-    <Compile Include="MoveToBorder.cs" />
-    <Compile Include="MoveToCenter.cs" />
-    <Compile Include="ObjectParameters.cs" />
-    <Compile Include="Program.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="SetGeneric.cs" />
-    <Compile Include="ShipGenericStorage.cs" />
-    <Compile Include="Status.cs" />
-    <EmbeddedResource Include="FormContainerShip.resx">
-      <DependentUpon>FormContainerShip.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FormShipCollection.resx">
-      <DependentUpon>FormShipCollection.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="FormShipConfig.resx">
-      <DependentUpon>FormShipConfig.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="Properties\Resources.resx">
-      <Generator>ResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-    <Compile Include="Properties\Resources.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Resources.resx</DependentUpon>
-      <DesignTime>True</DesignTime>
-    </Compile>
-    <None Include="Properties\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
-    </None>
-    <Compile Include="Properties\Settings.Designer.cs">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
+    <EmbeddedResource Remove="ShipCollection.resx" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\photo.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\photo1.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\photo2.png" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="Resources\photo3.png" />
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/Lab1ContainersShip/Lab1ContainersShip/Properties/AssemblyInfo.cs b/Lab1ContainersShip/Lab1ContainersShip/Properties/AssemblyInfo.cs
deleted file mode 100644
index 70bb622..0000000
--- a/Lab1ContainersShip/Lab1ContainersShip/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// Общие сведения об этой сборке предоставляются следующим набором
-// набора атрибутов. Измените значения этих атрибутов для изменения сведений,
-// связанных со сборкой.
-[assembly: AssemblyTitle("Lab1ContainersShip")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("Lab1ContainersShip")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Установка значения False для параметра ComVisible делает типы в этой сборке невидимыми
-// для компонентов COM. Если необходимо обратиться к типу в этой сборке через
-// COM, следует установить атрибут ComVisible в TRUE для этого типа.
-[assembly: ComVisible(false)]
-
-// Следующий GUID служит для идентификации библиотеки типов, если этот проект будет видимым для COM
-[assembly: Guid("afa56719-1551-4dfa-9ec2-1fd7ab801a5e")]
-
-// Сведения о версии сборки состоят из указанных ниже четырех значений:
-//
-//      Основной номер версии
-//      Дополнительный номер версии
-//      Номер сборки
-//      Редакция
-//
-// Можно задать все значения или принять номера сборки и редакции по умолчанию 
-// используя "*", как показано ниже:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]