merge project

timatet · timatet · commit 3a93a7598442 · 2022-03-30T19:03:09.000+03:00
diff --git a/AlgorithmsLibrary/AlgorithmsLibrary.csproj b/AlgorithmsLibrary/AlgorithmsLibrary.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>AlgorithmsLibrary</RootNamespace>
     <AssemblyName>AlgorithmsLibrary</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/AlgorithmsLibrary/FourierDescAlgm/FourierDescAlgm.cs b/AlgorithmsLibrary/FourierDescAlgm/FourierDescAlgm.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using System.Collections.Generic;
 
 namespace AlgorithmsLibrary
 {
diff --git a/AlgorithmsLibrary/FourierDescAlgm/FourierDescClass.cs b/AlgorithmsLibrary/FourierDescAlgm/FourierDescClass.cs
@@ -1,8 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AlgorithmsLibrary
 {
diff --git a/AlgorithmsLibrary/FourierDescAlgm/FourierNotClosedDescClass.cs b/AlgorithmsLibrary/FourierDescAlgm/FourierNotClosedDescClass.cs
@@ -1,8 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AlgorithmsLibrary
 {
diff --git a/AlgorithmsLibrary/FourierDescAlgm/LineSegmentClass.cs b/AlgorithmsLibrary/FourierDescAlgm/LineSegmentClass.cs
@@ -1,10 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-
-namespace AlgorithmsLibrary 
+﻿namespace AlgorithmsLibrary 
 {
     /// <summary>
     /// Фрагмент полилинии
diff --git a/AlgorithmsLibrary/FourierDescAlgm/PolygonClass.cs b/AlgorithmsLibrary/FourierDescAlgm/PolygonClass.cs
@@ -1,8 +1,4 @@
-﻿using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+﻿using System.Collections.Generic;
 
 namespace AlgorithmsLibrary
 {
diff --git a/AlgorithmsLibrary/FourierDescAlgm/ShapeAnalysysClass.cs b/AlgorithmsLibrary/FourierDescAlgm/ShapeAnalysysClass.cs
@@ -1,8 +1,5 @@
 ﻿using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace AlgorithmsLibrary
 {
diff --git a/AlgorithmsLibrary/Properties/AssemblyInfo.cs b/AlgorithmsLibrary/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/MainForm/App.config b/MainForm/App.config
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
diff --git a/MainForm/MainForm.csproj b/MainForm/MainForm.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>MainForm</RootNamespace>
     <AssemblyName>MainForm</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <TargetFrameworkProfile />
diff --git a/MainForm/Properties/AssemblyInfo.cs b/MainForm/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/MainForm/Properties/Resources.Designer.cs b/MainForm/Properties/Resources.Designer.cs
diff --git a/MainForm/Properties/Settings.Designer.cs b/MainForm/Properties/Settings.Designer.cs
diff --git a/SupportLib/Properties/AssemblyInfo.cs b/SupportLib/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following
diff --git a/SupportLib/SupportMapLibrary.csproj b/SupportLib/SupportMapLibrary.csproj
@@ -9,7 +9,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>SupportMapLibrary</RootNamespace>
     <AssemblyName>SupportMapLibrary</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <TargetFrameworkProfile />
   </PropertyGroup>
diff --git a/UnitTestProject1/DouglasPeuckerUnitTest.cs b/UnitTestProject1/DouglasPeuckerUnitTest.cs
@@ -1,9 +1,6 @@
-﻿using System;
-using System.Collections.Generic;
+﻿using System.Collections.Generic;
 using AlgorithmsLibrary;
-using DotSpatial.Data;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using SupportMapLibrary;
 
 namespace UnitTestProject1
 {
diff --git a/UnitTestProject1/FourierAlgmUnitTest.cs b/UnitTestProject1/FourierAlgmUnitTest.cs
@@ -1,10 +1,6 @@
 ﻿using AlgorithmsLibrary;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System;
 using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace UnitTestProject1
 {
diff --git a/UnitTestProject1/GaussFilterUnitTest.cs b/UnitTestProject1/GaussFilterUnitTest.cs
@@ -1,5 +1,4 @@
 ﻿using Microsoft.VisualStudio.TestTools.UnitTesting;
-using AlgorithmsLibrary.Features;
 
 namespace UnitTestProject1
 {
diff --git a/UnitTestProject1/MainUnitTest.cs b/UnitTestProject1/MainUnitTest.cs
@@ -1,8 +1,4 @@
-﻿using AlgorithmsLibrary;
-using SupportMapLibrary;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-
-namespace UnitTestProject1
+﻿namespace UnitTestProject1
 {
     //[TestClass]
     //public class MainUnitTest
diff --git a/UnitTestProject1/Properties/AssemblyInfo.cs b/UnitTestProject1/Properties/AssemblyInfo.cs
@@ -1,5 +1,4 @@
 ﻿using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
 // General Information about an assembly is controlled through the following 
diff --git a/UnitTestProject1/UnitTestProject1.csproj b/UnitTestProject1/UnitTestProject1.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>UnitTestProject1</RootNamespace>
     <AssemblyName>UnitTestProject1</AssemblyName>
-    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,4 @@`
`1`		`-using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-using System.Threading.Tasks;`
	`1`	`+using System.Collections.Generic;`
`6`	`2`
`7`	`3`	`namespace AlgorithmsLibrary`
`8`	`4`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,5 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
`3`		`-using System.Linq;`
`4`		`-using System.Text;`
`5`		`-using System.Threading.Tasks;`
`6`	`3`
`7`	`4`	`namespace AlgorithmsLibrary`
`8`	`5`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,4 @@`
`1`	`1`	`using System.Reflection;`
`2`		`-using System.Runtime.CompilerServices;`
`3`	`2`	`using System.Runtime.InteropServices;`
`4`	`3`
`5`	`4`	`// General Information about an assembly is controlled through the following`