diff --git a/GraphLayout/MSAGL/AutomaticGraphLayout.csproj b/GraphLayout/MSAGL/AutomaticGraphLayout.csproj
index 0b684654..6d157442 100644
--- a/GraphLayout/MSAGL/AutomaticGraphLayout.csproj
+++ b/GraphLayout/MSAGL/AutomaticGraphLayout.csproj
@@ -6,6 +6,7 @@
     <AssemblyName>Microsoft.Msagl</AssemblyName>
     <GenerateDocumentationFile>true</GenerateDocumentationFile>
     <IsPackable>true</IsPackable>
+    <NoWarn>NU1605,CS1591,CS1570,CS1572, CS1587, CS1572, CS1573, CS1712</NoWarn>   
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)'=='Release'">
     <DefineConstants>TEST_MSAGL</DefineConstants>
diff --git a/GraphLayout/Samples/AspectRatioSample/SettingGraphBoundsSample.csproj b/GraphLayout/Samples/AspectRatioSample/SettingGraphBoundsSample.csproj
index 92287f0e..0ad6cc32 100644
--- a/GraphLayout/Samples/AspectRatioSample/SettingGraphBoundsSample.csproj
+++ b/GraphLayout/Samples/AspectRatioSample/SettingGraphBoundsSample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <RootNamespace>AspectRatioSample</RootNamespace>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/GraphLayout/Samples/DrawingFromGeometryGraphSample/DrawingFromGeometryGraphSample.csproj b/GraphLayout/Samples/DrawingFromGeometryGraphSample/DrawingFromGeometryGraphSample.csproj
index 1ebb2a83..02622cd1 100644
--- a/GraphLayout/Samples/DrawingFromGeometryGraphSample/DrawingFromGeometryGraphSample.csproj
+++ b/GraphLayout/Samples/DrawingFromGeometryGraphSample/DrawingFromGeometryGraphSample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <AssemblyName>DrawingFromFromGeometryGraphSample</AssemblyName>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/GraphLayout/Samples/DrawingFromGeometryWithGtk/DrawingFromGeometryWithGtk.csproj b/GraphLayout/Samples/DrawingFromGeometryWithGtk/DrawingFromGeometryWithGtk.csproj
index f900d82d..e9f3893f 100644
--- a/GraphLayout/Samples/DrawingFromGeometryWithGtk/DrawingFromGeometryWithGtk.csproj
+++ b/GraphLayout/Samples/DrawingFromGeometryWithGtk/DrawingFromGeometryWithGtk.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/GraphLayout/Samples/EdgeRoutingSample/EdgeRoutingSample.csproj b/GraphLayout/Samples/EdgeRoutingSample/EdgeRoutingSample.csproj
index 827609d0..b4bddd0c 100644
--- a/GraphLayout/Samples/EdgeRoutingSample/EdgeRoutingSample.csproj
+++ b/GraphLayout/Samples/EdgeRoutingSample/EdgeRoutingSample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <StartupObject></StartupObject>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/GraphLayout/Samples/Editing/Editing.csproj b/GraphLayout/Samples/Editing/Editing.csproj
index 7c49baa2..3dbc37e9 100644
--- a/GraphLayout/Samples/Editing/Editing.csproj
+++ b/GraphLayout/Samples/Editing/Editing.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <StartupObject></StartupObject>
     <OldToolsVersion>3.5</OldToolsVersion>
diff --git a/GraphLayout/Samples/FastIncrementalLayoutWithGdi/FastIncrementalLayoutWithGdi.csproj b/GraphLayout/Samples/FastIncrementalLayoutWithGdi/FastIncrementalLayoutWithGdi.csproj
index d8786307..f3f666f8 100644
--- a/GraphLayout/Samples/FastIncrementalLayoutWithGdi/FastIncrementalLayoutWithGdi.csproj
+++ b/GraphLayout/Samples/FastIncrementalLayoutWithGdi/FastIncrementalLayoutWithGdi.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <OldToolsVersion>3.5</OldToolsVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
diff --git a/GraphLayout/Samples/FindEmptySpotSample/FindEmptySpotSample.csproj b/GraphLayout/Samples/FindEmptySpotSample/FindEmptySpotSample.csproj
index f3f600b5..f4cb64e9 100644
--- a/GraphLayout/Samples/FindEmptySpotSample/FindEmptySpotSample.csproj
+++ b/GraphLayout/Samples/FindEmptySpotSample/FindEmptySpotSample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
diff --git a/GraphLayout/Samples/GeometryRoutinesSample/GeometryRoutinesSample.csproj b/GraphLayout/Samples/GeometryRoutinesSample/GeometryRoutinesSample.csproj
index 86bdc7c0..6a80c7c3 100644
--- a/GraphLayout/Samples/GeometryRoutinesSample/GeometryRoutinesSample.csproj
+++ b/GraphLayout/Samples/GeometryRoutinesSample/GeometryRoutinesSample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
diff --git a/GraphLayout/Samples/LayerConstraintsFromGeometrySample/LayerConstraintsFromGeometrySample.csproj b/GraphLayout/Samples/LayerConstraintsFromGeometrySample/LayerConstraintsFromGeometrySample.csproj
index cb6226a6..6448167d 100644
--- a/GraphLayout/Samples/LayerConstraintsFromGeometrySample/LayerConstraintsFromGeometrySample.csproj
+++ b/GraphLayout/Samples/LayerConstraintsFromGeometrySample/LayerConstraintsFromGeometrySample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/GraphLayout/Samples/LayoutOfADisconnectedGraphWithSugiyama/LayoutOfADisconnectedGraphWithSugiyama.csproj b/GraphLayout/Samples/LayoutOfADisconnectedGraphWithSugiyama/LayoutOfADisconnectedGraphWithSugiyama.csproj
index 9f443cb7..7f5c4ff1 100644
--- a/GraphLayout/Samples/LayoutOfADisconnectedGraphWithSugiyama/LayoutOfADisconnectedGraphWithSugiyama.csproj
+++ b/GraphLayout/Samples/LayoutOfADisconnectedGraphWithSugiyama/LayoutOfADisconnectedGraphWithSugiyama.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
diff --git a/GraphLayout/Samples/LoadingDgmlGraph/LoadingDgmlGraph.csproj b/GraphLayout/Samples/LoadingDgmlGraph/LoadingDgmlGraph.csproj
index 9f43dc4b..4a85ba11 100644
--- a/GraphLayout/Samples/LoadingDgmlGraph/LoadingDgmlGraph.csproj
+++ b/GraphLayout/Samples/LoadingDgmlGraph/LoadingDgmlGraph.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/GraphLayout/Samples/LocationLabeling/LocationLabeler.csproj b/GraphLayout/Samples/LocationLabeling/LocationLabeler.csproj
index 69a0a1a3..a39274b9 100644
--- a/GraphLayout/Samples/LocationLabeling/LocationLabeler.csproj
+++ b/GraphLayout/Samples/LocationLabeling/LocationLabeler.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <RootNamespace>LocationLabeling</RootNamespace>
     <AssemblyName>LocationLabeling</AssemblyName>
diff --git a/GraphLayout/Samples/MinWpfApp/MinWpfApp.csproj b/GraphLayout/Samples/MinWpfApp/MinWpfApp.csproj
index be9dd049..e2206ac8 100644
--- a/GraphLayout/Samples/MinWpfApp/MinWpfApp.csproj
+++ b/GraphLayout/Samples/MinWpfApp/MinWpfApp.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
diff --git a/GraphLayout/Samples/NodesWithImages/NodesWithImages.csproj b/GraphLayout/Samples/NodesWithImages/NodesWithImages.csproj
index 6d03061e..20e79813 100644
--- a/GraphLayout/Samples/NodesWithImages/NodesWithImages.csproj
+++ b/GraphLayout/Samples/NodesWithImages/NodesWithImages.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <OldToolsVersion>3.5</OldToolsVersion>
     <IsWebBootstrapper>false</IsWebBootstrapper>
diff --git a/GraphLayout/Samples/PhyloTreeFromGeometrySample/PhyloTreeFromGeometrySample.csproj b/GraphLayout/Samples/PhyloTreeFromGeometrySample/PhyloTreeFromGeometrySample.csproj
index ef268bb6..35ea23fa 100644
--- a/GraphLayout/Samples/PhyloTreeFromGeometrySample/PhyloTreeFromGeometrySample.csproj
+++ b/GraphLayout/Samples/PhyloTreeFromGeometrySample/PhyloTreeFromGeometrySample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/GraphLayout/Samples/PhyloTreeSampleOverGDI/PhyloTreeSampleOverGDI.csproj b/GraphLayout/Samples/PhyloTreeSampleOverGDI/PhyloTreeSampleOverGDI.csproj
index bd841460..536489c5 100644
--- a/GraphLayout/Samples/PhyloTreeSampleOverGDI/PhyloTreeSampleOverGDI.csproj
+++ b/GraphLayout/Samples/PhyloTreeSampleOverGDI/PhyloTreeSampleOverGDI.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
diff --git a/GraphLayout/Samples/PopulateGViewerWithPrecalculatedDrawingGraph/PopulateGViewerWithPrecalculatedDrawingGraph.csproj b/GraphLayout/Samples/PopulateGViewerWithPrecalculatedDrawingGraph/PopulateGViewerWithPrecalculatedDrawingGraph.csproj
index 0b1d6781..c270b76d 100644
--- a/GraphLayout/Samples/PopulateGViewerWithPrecalculatedDrawingGraph/PopulateGViewerWithPrecalculatedDrawingGraph.csproj
+++ b/GraphLayout/Samples/PopulateGViewerWithPrecalculatedDrawingGraph/PopulateGViewerWithPrecalculatedDrawingGraph.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <TargetFrameworks>net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net6.0-windows</TargetFrameworks>
     <UseWindowsForms>true</UseWindowsForms>
   </PropertyGroup>
 
diff --git a/GraphLayout/Samples/SameLayerSample/SameLayerSample.csproj b/GraphLayout/Samples/SameLayerSample/SameLayerSample.csproj
index 1f082c85..33262b2d 100644
--- a/GraphLayout/Samples/SameLayerSample/SameLayerSample.csproj
+++ b/GraphLayout/Samples/SameLayerSample/SameLayerSample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/GraphLayout/Samples/SimplestWinFormsSample/SimplestWinFormsSample.csproj b/GraphLayout/Samples/SimplestWinFormsSample/SimplestWinFormsSample.csproj
index 38df463b..1576a9fc 100644
--- a/GraphLayout/Samples/SimplestWinFormsSample/SimplestWinFormsSample.csproj
+++ b/GraphLayout/Samples/SimplestWinFormsSample/SimplestWinFormsSample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/GraphLayout/Samples/SvgLayerSample/SvgLayerSample.csproj b/GraphLayout/Samples/SvgLayerSample/SvgLayerSample.csproj
index 8b6b653a..769af461 100644
--- a/GraphLayout/Samples/SvgLayerSample/SvgLayerSample.csproj
+++ b/GraphLayout/Samples/SvgLayerSample/SvgLayerSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/GraphLayout/Samples/UsingMDSLayoutSample/UsingMDSLayoutSample.csproj b/GraphLayout/Samples/UsingMDSLayoutSample/UsingMDSLayoutSample.csproj
index 73619f89..69becd3a 100644
--- a/GraphLayout/Samples/UsingMDSLayoutSample/UsingMDSLayoutSample.csproj
+++ b/GraphLayout/Samples/UsingMDSLayoutSample/UsingMDSLayoutSample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
diff --git a/GraphLayout/Samples/WindowsApplicationSample/WindowsApplicationSample.csproj b/GraphLayout/Samples/WindowsApplicationSample/WindowsApplicationSample.csproj
index 8edac2bb..74f3764d 100644
--- a/GraphLayout/Samples/WindowsApplicationSample/WindowsApplicationSample.csproj
+++ b/GraphLayout/Samples/WindowsApplicationSample/WindowsApplicationSample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <OldToolsVersion>3.5</OldToolsVersion>
     <PublishUrl>publish\</PublishUrl>
diff --git a/GraphLayout/Samples/WpfApplicationSample/WpfApplicationSample.csproj b/GraphLayout/Samples/WpfApplicationSample/WpfApplicationSample.csproj
index 9dc0ca62..9ac9ba7c 100644
--- a/GraphLayout/Samples/WpfApplicationSample/WpfApplicationSample.csproj
+++ b/GraphLayout/Samples/WpfApplicationSample/WpfApplicationSample.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWPF>true</UseWPF>
diff --git a/GraphLayout/Test/Test01/Test01.csproj b/GraphLayout/Test/Test01/Test01.csproj
index 65a370a7..c6e688f6 100644
--- a/GraphLayout/Test/Test01/Test01.csproj
+++ b/GraphLayout/Test/Test01/Test01.csproj
@@ -15,6 +15,7 @@
     <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
+  
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <PlatformTarget>x86</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
@@ -176,4 +177,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
\ No newline at end of file
+</Project>
diff --git a/GraphLayout/TinyClickDemo/TinyClickDemo.csproj b/GraphLayout/TinyClickDemo/TinyClickDemo.csproj
index f04f2455..d63d0a19 100644
--- a/GraphLayout/TinyClickDemo/TinyClickDemo.csproj
+++ b/GraphLayout/TinyClickDemo/TinyClickDemo.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>WinExe</OutputType>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <UseWindowsForms>true</UseWindowsForms>
diff --git a/GraphLayout/WriteToSvgSample/WriteToSvgSample.csproj b/GraphLayout/WriteToSvgSample/WriteToSvgSample.csproj
index c4f79b48..5354f069 100644
--- a/GraphLayout/WriteToSvgSample/WriteToSvgSample.csproj
+++ b/GraphLayout/WriteToSvgSample/WriteToSvgSample.csproj
@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <OutputType>Exe</OutputType>
-    <TargetFrameworks>net6.0;net7.0</TargetFrameworks>
+    <TargetFrameworks>net6.0</TargetFrameworks>
   </PropertyGroup>
 
   <ItemGroup>
diff --git a/GraphLayout/tools/Dot2Graph/Dot2Graph.csproj b/GraphLayout/tools/Dot2Graph/Dot2Graph.csproj
index 033d3e8b..a174df71 100644
--- a/GraphLayout/tools/Dot2Graph/Dot2Graph.csproj
+++ b/GraphLayout/tools/Dot2Graph/Dot2Graph.csproj
@@ -1,113 +1,48 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">x86</Platform>
-    <ProductVersion>8.0.30703</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{BA8FED53-458E-4CB3-8EB3-CBFCADD87E5D}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
+<Project Sdk="Microsoft.NET.Sdk">
+	<PropertyGroup>
+		<OutputType>Library</OutputType>
+		<TargetFramework>net472</TargetFramework>
+		<RuntimeIdentifiers>win</RuntimeIdentifiers>
+	</PropertyGroup>
+
+	<PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
     <RootNamespace>Dot2Graph</RootNamespace>
     <AssemblyName>Dot2Graph</AssemblyName>
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
+    <Platforms>AnyCPU;x86;x64</Platforms>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
+
+  <!-- Debug Configuration -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Debug'">
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <Optimize>false</Optimize>
     <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <PlatformTarget>x86</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-  </PropertyGroup>
-  <PropertyGroup>
-    <StartupObject />
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|AnyCPU'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <DebugType>full</DebugType>
     <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|AnyCPU'">
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE</DefineConstants>
-    <Optimize>true</Optimize>
-    <DebugType>pdbonly</DebugType>
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
-  </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Debug|x64'">
-    <DebugSymbols>true</DebugSymbols>
-    <OutputPath>bin\x64\Debug\</OutputPath>
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
     <DebugType>full</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)' == 'Release|x64'">
-    <OutputPath>bin\x64\Release\</OutputPath>
+
+  <!-- Release Configuration -->
+  <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <DefineConstants>TRACE</DefineConstants>
     <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugType>pdbonly</DebugType>
-    <PlatformTarget>x64</PlatformTarget>
-    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Xml" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AttributeValuePair.cs" />
-    <Compile Include="Dot.cs" />
-    <Compile Include="DotLex.cs" />
-    <Compile Include="PosData.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\Drawing\AutomaticGraphLayout.Drawing.csproj">
-      <Project>{B76F8F71-4B00-4242-BE36-C9F0732511F7}</Project>
-      <Name>AutomaticGraphLayout.Drawing</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\MSAGL\AutomaticGraphLayout.csproj">
-      <Project>{415D3E3F-7105-46C1-84D2-7ECB34213D92}</Project>
-      <Name>AutomaticGraphLayout</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\QUT.ShiftReduceParser\QUT.ShiftReduceParser.csproj">
-      <Project>{ef5cf15e-5645-433b-8a23-af93e3f2682f}</Project>
-      <Name>QUT.ShiftReduceParser</Name>
-    </ProjectReference>
-  </ItemGroup>
+
+
   <ItemGroup>
     <None Include="dot.lex" />
     <None Include="dot.y" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
\ No newline at end of file
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\Drawing\AutomaticGraphLayout.Drawing.csproj" />
+    <ProjectReference Include="..\..\MSAGL\AutomaticGraphLayout.csproj" />
+    <ProjectReference Include="..\QUT.ShiftReduceParser\QUT.ShiftReduceParser.csproj" />
+  </ItemGroup>
+
+</Project>
diff --git a/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.csproj b/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.csproj
index d49e7a15..672b8787 100644
--- a/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.csproj
+++ b/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.csproj
@@ -1,6 +1,6 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <OutputType>Library</OutputType>
     <RootNamespace>Microsoft.Msagl.GraphViewerGdi</RootNamespace>
     <AssemblyName>Microsoft.Msagl.GraphViewerGdi</AssemblyName>
diff --git a/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj b/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj
index 5b3d24cd..3e8cdfeb 100644
--- a/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj
+++ b/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj
@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
-    <TargetFrameworks>net472;net6.0-windows;net7.0-windows</TargetFrameworks>
+    <TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
     <UseWPF>true</UseWPF>
     <AssemblyName>Microsoft.Msagl.WpfGraphControl</AssemblyName>
   </PropertyGroup>