From ce59c0d4c5e517e3ed515ea930a3dc58a8f6c6a0 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 3 Jun 2026 22:52:36 +0000 Subject: [PATCH 1/4] Initial plan From 1157a53e37f03b7e0a14feeb1977069fdd282df7 Mon Sep 17 00:00:00 2001 From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com> Date: Wed, 3 Jun 2026 23:06:57 +0000 Subject: [PATCH 2/4] Fix BinaryFormatter crash in .NET 9+ by adding net8/9/10 target frameworks - GraphViewerGDI: add net8.0-windows, net9.0-windows, net10.0-windows TFMs - GraphViewerGDI: add GenerateResourceUsePreserializedResources=true for net472 fix - GraphViewerGDI.nuspec: add NuGet entries for new TFMs - All tool, test, and sample projects: add net8/9/10-windows TFMs --- .../SettingGraphBoundsSample.csproj | 2 +- .../DrawingFromGeometryGraphSample.csproj | 2 +- .../EdgeDirectionTest.csproj | 2 +- .../EdgeRoutingSample.csproj | 2 +- GraphLayout/Samples/Editing/Editing.csproj | 2 +- .../FastIncrementalLayoutWithGdi.csproj | 2 +- .../FindEmptySpotSample.csproj | 2 +- .../GeometryRoutinesSample.csproj | 2 +- .../LayerConstraintsFromGeometrySample.csproj | 2 +- ...outOfADisconnectedGraphWithSugiyama.csproj | 2 +- .../LoadingDgmlGraph/LoadingDgmlGraph.csproj | 2 +- .../LocationLabeling/LocationLabeler.csproj | 2 +- .../Samples/MinWpfApp/MinWpfApp.csproj | 2 +- .../NodesWithImages/NodesWithImages.csproj | 2 +- .../PhyloTreeFromGeometrySample.csproj | 2 +- .../PhyloTreeSampleOverGDI.csproj | 2 +- ...ViewerWithPrecalculatedDrawingGraph.csproj | 2 +- .../SameLayerSample/SameLayerSample.csproj | 2 +- .../SimplestWinFormsSample.csproj | 2 +- .../SvgLayerSample/SvgLayerSample.csproj | 2 +- .../UsingMDSLayoutSample.csproj | 2 +- .../WindowsApplicationSample.csproj | 2 +- .../WpfApplicationSample.csproj | 2 +- .../WpfApplicationSample_OnnxViewer.csproj | 2 +- GraphLayout/Test/Test01/Test01.csproj | 3 +- GraphLayout/Test/TestForGDI/TestForGDI.csproj | 3 +- .../TestFormForGViewer.csproj | 3 +- .../Test/TestGraphmaps/TestGraphmaps.csproj | 2 +- .../VoronoiDiagramTest.csproj | 2 +- .../TinyClickDemo/TinyClickDemo.csproj | 2 +- .../WriteToSvgSample/WriteToSvgSample.csproj | 2 +- .../DebugCurveViewer/DebugCurveViewer.csproj | 3 +- .../FormForGViewer/FormForGViewer.csproj | 3 +- .../GraphViewerGDI/GraphViewerGDI.csproj | 3 +- .../GraphViewerGDI/GraphViewerGDI.nuspec | 29 +++++++++++++++++-- .../GraphmapsWpfControl.csproj | 3 +- .../WpfGraphControl/WpfGraphControl.csproj | 3 +- GraphLayout/tools/agl/agl.csproj | 4 +-- 38 files changed, 64 insertions(+), 49 deletions(-) diff --git a/GraphLayout/Samples/AspectRatioSample/SettingGraphBoundsSample.csproj b/GraphLayout/Samples/AspectRatioSample/SettingGraphBoundsSample.csproj index 0ad6cc32..26dd3d16 100644 --- a/GraphLayout/Samples/AspectRatioSample/SettingGraphBoundsSample.csproj +++ b/GraphLayout/Samples/AspectRatioSample/SettingGraphBoundsSample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe AspectRatioSample 3.5 diff --git a/GraphLayout/Samples/DrawingFromGeometryGraphSample/DrawingFromGeometryGraphSample.csproj b/GraphLayout/Samples/DrawingFromGeometryGraphSample/DrawingFromGeometryGraphSample.csproj index b61904b4..63f8944a 100644 --- a/GraphLayout/Samples/DrawingFromGeometryGraphSample/DrawingFromGeometryGraphSample.csproj +++ b/GraphLayout/Samples/DrawingFromGeometryGraphSample/DrawingFromGeometryGraphSample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe DrawingFromFromGeometryGraphSample 3.5 diff --git a/GraphLayout/Samples/EdgeDirectionTest/EdgeDirectionTest.csproj b/GraphLayout/Samples/EdgeDirectionTest/EdgeDirectionTest.csproj index 5ddf3b7c..4a08897c 100644 --- a/GraphLayout/Samples/EdgeDirectionTest/EdgeDirectionTest.csproj +++ b/GraphLayout/Samples/EdgeDirectionTest/EdgeDirectionTest.csproj @@ -2,7 +2,7 @@ WinExe - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows false true EdgeDirectionTest diff --git a/GraphLayout/Samples/EdgeRoutingSample/EdgeRoutingSample.csproj b/GraphLayout/Samples/EdgeRoutingSample/EdgeRoutingSample.csproj index b4bddd0c..556ae842 100644 --- a/GraphLayout/Samples/EdgeRoutingSample/EdgeRoutingSample.csproj +++ b/GraphLayout/Samples/EdgeRoutingSample/EdgeRoutingSample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows Exe 3.5 diff --git a/GraphLayout/Samples/Editing/Editing.csproj b/GraphLayout/Samples/Editing/Editing.csproj index d1518013..2cac3a07 100644 --- a/GraphLayout/Samples/Editing/Editing.csproj +++ b/GraphLayout/Samples/Editing/Editing.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows Exe 3.5 diff --git a/GraphLayout/Samples/FastIncrementalLayoutWithGdi/FastIncrementalLayoutWithGdi.csproj b/GraphLayout/Samples/FastIncrementalLayoutWithGdi/FastIncrementalLayoutWithGdi.csproj index b854833e..4bc3b6f2 100644 --- a/GraphLayout/Samples/FastIncrementalLayoutWithGdi/FastIncrementalLayoutWithGdi.csproj +++ b/GraphLayout/Samples/FastIncrementalLayoutWithGdi/FastIncrementalLayoutWithGdi.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe 3.5 false diff --git a/GraphLayout/Samples/FindEmptySpotSample/FindEmptySpotSample.csproj b/GraphLayout/Samples/FindEmptySpotSample/FindEmptySpotSample.csproj index f4cb64e9..5a99f287 100644 --- a/GraphLayout/Samples/FindEmptySpotSample/FindEmptySpotSample.csproj +++ b/GraphLayout/Samples/FindEmptySpotSample/FindEmptySpotSample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe 3.5 publish\ diff --git a/GraphLayout/Samples/GeometryRoutinesSample/GeometryRoutinesSample.csproj b/GraphLayout/Samples/GeometryRoutinesSample/GeometryRoutinesSample.csproj index 2c8bf32a..1f72713e 100644 --- a/GraphLayout/Samples/GeometryRoutinesSample/GeometryRoutinesSample.csproj +++ b/GraphLayout/Samples/GeometryRoutinesSample/GeometryRoutinesSample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows Exe false true diff --git a/GraphLayout/Samples/LayerConstraintsFromGeometrySample/LayerConstraintsFromGeometrySample.csproj b/GraphLayout/Samples/LayerConstraintsFromGeometrySample/LayerConstraintsFromGeometrySample.csproj index 6448167d..ffbd2383 100644 --- a/GraphLayout/Samples/LayerConstraintsFromGeometrySample/LayerConstraintsFromGeometrySample.csproj +++ b/GraphLayout/Samples/LayerConstraintsFromGeometrySample/LayerConstraintsFromGeometrySample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe false true diff --git a/GraphLayout/Samples/LayoutOfADisconnectedGraphWithSugiyama/LayoutOfADisconnectedGraphWithSugiyama.csproj b/GraphLayout/Samples/LayoutOfADisconnectedGraphWithSugiyama/LayoutOfADisconnectedGraphWithSugiyama.csproj index 7f5c4ff1..902a5496 100644 --- a/GraphLayout/Samples/LayoutOfADisconnectedGraphWithSugiyama/LayoutOfADisconnectedGraphWithSugiyama.csproj +++ b/GraphLayout/Samples/LayoutOfADisconnectedGraphWithSugiyama/LayoutOfADisconnectedGraphWithSugiyama.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows x86 WinExe false diff --git a/GraphLayout/Samples/LoadingDgmlGraph/LoadingDgmlGraph.csproj b/GraphLayout/Samples/LoadingDgmlGraph/LoadingDgmlGraph.csproj index 211f27a2..afac9a89 100644 --- a/GraphLayout/Samples/LoadingDgmlGraph/LoadingDgmlGraph.csproj +++ b/GraphLayout/Samples/LoadingDgmlGraph/LoadingDgmlGraph.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows Exe false true diff --git a/GraphLayout/Samples/LocationLabeling/LocationLabeler.csproj b/GraphLayout/Samples/LocationLabeling/LocationLabeler.csproj index a39274b9..281e2259 100644 --- a/GraphLayout/Samples/LocationLabeling/LocationLabeler.csproj +++ b/GraphLayout/Samples/LocationLabeling/LocationLabeler.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe LocationLabeling LocationLabeling diff --git a/GraphLayout/Samples/MinWpfApp/MinWpfApp.csproj b/GraphLayout/Samples/MinWpfApp/MinWpfApp.csproj index e2206ac8..38497547 100644 --- a/GraphLayout/Samples/MinWpfApp/MinWpfApp.csproj +++ b/GraphLayout/Samples/MinWpfApp/MinWpfApp.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe false true diff --git a/GraphLayout/Samples/NodesWithImages/NodesWithImages.csproj b/GraphLayout/Samples/NodesWithImages/NodesWithImages.csproj index 20e79813..e4a1ed6e 100644 --- a/GraphLayout/Samples/NodesWithImages/NodesWithImages.csproj +++ b/GraphLayout/Samples/NodesWithImages/NodesWithImages.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe 3.5 false diff --git a/GraphLayout/Samples/PhyloTreeFromGeometrySample/PhyloTreeFromGeometrySample.csproj b/GraphLayout/Samples/PhyloTreeFromGeometrySample/PhyloTreeFromGeometrySample.csproj index 35ea23fa..9c31ae5b 100644 --- a/GraphLayout/Samples/PhyloTreeFromGeometrySample/PhyloTreeFromGeometrySample.csproj +++ b/GraphLayout/Samples/PhyloTreeFromGeometrySample/PhyloTreeFromGeometrySample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe false true diff --git a/GraphLayout/Samples/PhyloTreeSampleOverGDI/PhyloTreeSampleOverGDI.csproj b/GraphLayout/Samples/PhyloTreeSampleOverGDI/PhyloTreeSampleOverGDI.csproj index 536489c5..9189e3b7 100644 --- a/GraphLayout/Samples/PhyloTreeSampleOverGDI/PhyloTreeSampleOverGDI.csproj +++ b/GraphLayout/Samples/PhyloTreeSampleOverGDI/PhyloTreeSampleOverGDI.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe 3.5 publish\ diff --git a/GraphLayout/Samples/PopulateGViewerWithPrecalculatedDrawingGraph/PopulateGViewerWithPrecalculatedDrawingGraph.csproj b/GraphLayout/Samples/PopulateGViewerWithPrecalculatedDrawingGraph/PopulateGViewerWithPrecalculatedDrawingGraph.csproj index 4fa8897e..b7f16778 100644 --- a/GraphLayout/Samples/PopulateGViewerWithPrecalculatedDrawingGraph/PopulateGViewerWithPrecalculatedDrawingGraph.csproj +++ b/GraphLayout/Samples/PopulateGViewerWithPrecalculatedDrawingGraph/PopulateGViewerWithPrecalculatedDrawingGraph.csproj @@ -2,7 +2,7 @@ WinExe - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows true diff --git a/GraphLayout/Samples/SameLayerSample/SameLayerSample.csproj b/GraphLayout/Samples/SameLayerSample/SameLayerSample.csproj index 33262b2d..8ac7c6d3 100644 --- a/GraphLayout/Samples/SameLayerSample/SameLayerSample.csproj +++ b/GraphLayout/Samples/SameLayerSample/SameLayerSample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe false true diff --git a/GraphLayout/Samples/SimplestWinFormsSample/SimplestWinFormsSample.csproj b/GraphLayout/Samples/SimplestWinFormsSample/SimplestWinFormsSample.csproj index 26850742..af73e243 100644 --- a/GraphLayout/Samples/SimplestWinFormsSample/SimplestWinFormsSample.csproj +++ b/GraphLayout/Samples/SimplestWinFormsSample/SimplestWinFormsSample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe false true diff --git a/GraphLayout/Samples/SvgLayerSample/SvgLayerSample.csproj b/GraphLayout/Samples/SvgLayerSample/SvgLayerSample.csproj index 769af461..bc0890eb 100644 --- a/GraphLayout/Samples/SvgLayerSample/SvgLayerSample.csproj +++ b/GraphLayout/Samples/SvgLayerSample/SvgLayerSample.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net6.0;net8.0;net9.0;net10.0 diff --git a/GraphLayout/Samples/UsingMDSLayoutSample/UsingMDSLayoutSample.csproj b/GraphLayout/Samples/UsingMDSLayoutSample/UsingMDSLayoutSample.csproj index 9a327072..ac8aa19a 100644 --- a/GraphLayout/Samples/UsingMDSLayoutSample/UsingMDSLayoutSample.csproj +++ b/GraphLayout/Samples/UsingMDSLayoutSample/UsingMDSLayoutSample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe 3.5 publish\ diff --git a/GraphLayout/Samples/WindowsApplicationSample/WindowsApplicationSample.csproj b/GraphLayout/Samples/WindowsApplicationSample/WindowsApplicationSample.csproj index daca30db..0f49fa9a 100644 --- a/GraphLayout/Samples/WindowsApplicationSample/WindowsApplicationSample.csproj +++ b/GraphLayout/Samples/WindowsApplicationSample/WindowsApplicationSample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe 3.5 publish\ diff --git a/GraphLayout/Samples/WpfApplicationSample/WpfApplicationSample.csproj b/GraphLayout/Samples/WpfApplicationSample/WpfApplicationSample.csproj index c77edf43..3737a297 100644 --- a/GraphLayout/Samples/WpfApplicationSample/WpfApplicationSample.csproj +++ b/GraphLayout/Samples/WpfApplicationSample/WpfApplicationSample.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe false true diff --git a/GraphLayout/Samples/WpfApplicationSample_OnnxViewer/WpfApplicationSample_OnnxViewer.csproj b/GraphLayout/Samples/WpfApplicationSample_OnnxViewer/WpfApplicationSample_OnnxViewer.csproj index c78a459a..cf6c95f8 100644 --- a/GraphLayout/Samples/WpfApplicationSample_OnnxViewer/WpfApplicationSample_OnnxViewer.csproj +++ b/GraphLayout/Samples/WpfApplicationSample_OnnxViewer/WpfApplicationSample_OnnxViewer.csproj @@ -2,7 +2,7 @@ WinExe - net6.0-windows + net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows true diff --git a/GraphLayout/Test/Test01/Test01.csproj b/GraphLayout/Test/Test01/Test01.csproj index 423a8ae6..73bea408 100644 --- a/GraphLayout/Test/Test01/Test01.csproj +++ b/GraphLayout/Test/Test01/Test01.csproj @@ -2,8 +2,7 @@ WinExe - net6.0-windows - Test01 + net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows Test01 x86;x64;AnyCPU Debug;Release diff --git a/GraphLayout/Test/TestForGDI/TestForGDI.csproj b/GraphLayout/Test/TestForGDI/TestForGDI.csproj index 4e06b906..cc4b3c38 100644 --- a/GraphLayout/Test/TestForGDI/TestForGDI.csproj +++ b/GraphLayout/Test/TestForGDI/TestForGDI.csproj @@ -2,8 +2,7 @@ WinExe - net472;net6.0-windows - TestForGdi + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows TestForGdi AnyCPU;x86;x64 Debug;Release diff --git a/GraphLayout/Test/TestFormForGViewer/TestFormForGViewer.csproj b/GraphLayout/Test/TestFormForGViewer/TestFormForGViewer.csproj index f7e4015a..6fc577e1 100644 --- a/GraphLayout/Test/TestFormForGViewer/TestFormForGViewer.csproj +++ b/GraphLayout/Test/TestFormForGViewer/TestFormForGViewer.csproj @@ -2,8 +2,7 @@ Library - net472;net6.0-windows - TestFormForGViewer + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows TestFormForGViewer Debug;Release false diff --git a/GraphLayout/Test/TestGraphmaps/TestGraphmaps.csproj b/GraphLayout/Test/TestGraphmaps/TestGraphmaps.csproj index 0830df67..8bbaf90c 100644 --- a/GraphLayout/Test/TestGraphmaps/TestGraphmaps.csproj +++ b/GraphLayout/Test/TestGraphmaps/TestGraphmaps.csproj @@ -4,7 +4,7 @@ WinExe TestGraphmaps TestGraphmaps - net8.0-windows + net8.0-windows;net9.0-windows;net10.0-windows true CS8618;CS8603 diff --git a/GraphLayout/Test/VoronoiDiagramTest/VoronoiDiagramTest.csproj b/GraphLayout/Test/VoronoiDiagramTest/VoronoiDiagramTest.csproj index 08e4ab59..5b5cfb60 100644 --- a/GraphLayout/Test/VoronoiDiagramTest/VoronoiDiagramTest.csproj +++ b/GraphLayout/Test/VoronoiDiagramTest/VoronoiDiagramTest.csproj @@ -1,7 +1,7 @@  WinExe - net6.0-windows + net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows diff --git a/GraphLayout/TinyClickDemo/TinyClickDemo.csproj b/GraphLayout/TinyClickDemo/TinyClickDemo.csproj index d63d0a19..1d26f8b1 100644 --- a/GraphLayout/TinyClickDemo/TinyClickDemo.csproj +++ b/GraphLayout/TinyClickDemo/TinyClickDemo.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows WinExe false true diff --git a/GraphLayout/WriteToSvgSample/WriteToSvgSample.csproj b/GraphLayout/WriteToSvgSample/WriteToSvgSample.csproj index 5354f069..46b9b14d 100644 --- a/GraphLayout/WriteToSvgSample/WriteToSvgSample.csproj +++ b/GraphLayout/WriteToSvgSample/WriteToSvgSample.csproj @@ -2,7 +2,7 @@ Exe - net6.0 + net6.0;net8.0;net9.0;net10.0 diff --git a/GraphLayout/tools/DebugCurveViewer/DebugCurveViewer.csproj b/GraphLayout/tools/DebugCurveViewer/DebugCurveViewer.csproj index 3bc7140d..697014d2 100644 --- a/GraphLayout/tools/DebugCurveViewer/DebugCurveViewer.csproj +++ b/GraphLayout/tools/DebugCurveViewer/DebugCurveViewer.csproj @@ -2,8 +2,7 @@ WinExe - net472;net6.0-windows - DebugCurveViewer + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows DebugCurveViewer AnyCPU;x86;x64 Debug;Release diff --git a/GraphLayout/tools/FormForGViewer/FormForGViewer.csproj b/GraphLayout/tools/FormForGViewer/FormForGViewer.csproj index c9c7a35e..0a97c74f 100644 --- a/GraphLayout/tools/FormForGViewer/FormForGViewer.csproj +++ b/GraphLayout/tools/FormForGViewer/FormForGViewer.csproj @@ -2,8 +2,7 @@ Library - net472;net6.0-windows - TestFormForGViewer + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows TestFormForGViewer Debug;Release false diff --git a/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.csproj b/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.csproj index 519abc65..d1511262 100644 --- a/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.csproj +++ b/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.csproj @@ -1,6 +1,6 @@  - net472;net6.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows Library Microsoft.Msagl.GraphViewerGdi Microsoft.Msagl.GraphViewerGdi @@ -10,6 +10,7 @@ 1591,CA1416 false true + true diff --git a/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.nuspec b/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.nuspec index 8de21e2e..a8b3a2ad 100644 --- a/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.nuspec +++ b/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.nuspec @@ -31,13 +31,30 @@ - + + + + + + + + + + - + + + + + + + + + @@ -46,5 +63,11 @@ - + + + + + + + \ No newline at end of file diff --git a/GraphLayout/tools/GraphmapsWpfControl/GraphmapsWpfControl.csproj b/GraphLayout/tools/GraphmapsWpfControl/GraphmapsWpfControl.csproj index 310dba91..d1aa68d0 100644 --- a/GraphLayout/tools/GraphmapsWpfControl/GraphmapsWpfControl.csproj +++ b/GraphLayout/tools/GraphmapsWpfControl/GraphmapsWpfControl.csproj @@ -3,8 +3,7 @@ Library Microsoft.Msagl.GraphmapsWpfControl Microsoft.Msagl.GraphmapsWpfControl - net472;net6.0-windows - true + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows 4 diff --git a/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj b/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj index 8d62a1ac..0bd8df7e 100644 --- a/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj +++ b/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj @@ -1,8 +1,7 @@  - net472;net6.0-windows - true + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows Microsoft.Msagl.WpfGraphControl diff --git a/GraphLayout/tools/agl/agl.csproj b/GraphLayout/tools/agl/agl.csproj index 56d1c5b0..35c38966 100644 --- a/GraphLayout/tools/agl/agl.csproj +++ b/GraphLayout/tools/agl/agl.csproj @@ -3,9 +3,7 @@ WinExe Agl agl - net472;net6.0-windows - true - 4 + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows CA1303;CA1801;CA2000;CA1304;CA1031 From c579224081d4f43d3a8456ade7031ce68bd1fb28 Mon Sep 17 00:00:00 2001 From: Copilot CLI Date: Wed, 3 Jun 2026 16:42:08 -0700 Subject: [PATCH 3/4] Fix malformed csproj edits from PR #396 Restore lines clobbered while adding net8/9/10 TFMs: - RootNamespace in TestForGDI, Test01, DebugCurveViewer, FormForGViewer - UseWPF in WpfGraphControl, GraphmapsWpfControl - UseWindowsForms/WarningLevel in agl Fixes invalid XML (MSB4025) and broken WPF builds so all projects build on net9/net10 while keeping the BinaryFormatter crash fix. Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- GraphLayout/Test/Test01/Test01.csproj | 3 ++- GraphLayout/Test/TestForGDI/TestForGDI.csproj | 3 ++- GraphLayout/tools/DebugCurveViewer/DebugCurveViewer.csproj | 3 ++- GraphLayout/tools/FormForGViewer/FormForGViewer.csproj | 1 + .../tools/GraphmapsWpfControl/GraphmapsWpfControl.csproj | 1 + GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj | 1 + GraphLayout/tools/agl/agl.csproj | 2 ++ 7 files changed, 11 insertions(+), 3 deletions(-) diff --git a/GraphLayout/Test/Test01/Test01.csproj b/GraphLayout/Test/Test01/Test01.csproj index 73bea408..f9b52c05 100644 --- a/GraphLayout/Test/Test01/Test01.csproj +++ b/GraphLayout/Test/Test01/Test01.csproj @@ -2,7 +2,8 @@ WinExe - net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows + net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows + Test01 Test01 x86;x64;AnyCPU Debug;Release diff --git a/GraphLayout/Test/TestForGDI/TestForGDI.csproj b/GraphLayout/Test/TestForGDI/TestForGDI.csproj index cc4b3c38..e1c38422 100644 --- a/GraphLayout/Test/TestForGDI/TestForGDI.csproj +++ b/GraphLayout/Test/TestForGDI/TestForGDI.csproj @@ -2,7 +2,8 @@ WinExe - net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows + TestForGdi TestForGdi AnyCPU;x86;x64 Debug;Release diff --git a/GraphLayout/tools/DebugCurveViewer/DebugCurveViewer.csproj b/GraphLayout/tools/DebugCurveViewer/DebugCurveViewer.csproj index 697014d2..3c5f7b05 100644 --- a/GraphLayout/tools/DebugCurveViewer/DebugCurveViewer.csproj +++ b/GraphLayout/tools/DebugCurveViewer/DebugCurveViewer.csproj @@ -2,7 +2,8 @@ WinExe - net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows + net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows + DebugCurveViewer DebugCurveViewer AnyCPU;x86;x64 Debug;Release diff --git a/GraphLayout/tools/FormForGViewer/FormForGViewer.csproj b/GraphLayout/tools/FormForGViewer/FormForGViewer.csproj index 0a97c74f..1736c195 100644 --- a/GraphLayout/tools/FormForGViewer/FormForGViewer.csproj +++ b/GraphLayout/tools/FormForGViewer/FormForGViewer.csproj @@ -3,6 +3,7 @@ Library net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows + TestFormForGViewer TestFormForGViewer Debug;Release false diff --git a/GraphLayout/tools/GraphmapsWpfControl/GraphmapsWpfControl.csproj b/GraphLayout/tools/GraphmapsWpfControl/GraphmapsWpfControl.csproj index d1aa68d0..bba42356 100644 --- a/GraphLayout/tools/GraphmapsWpfControl/GraphmapsWpfControl.csproj +++ b/GraphLayout/tools/GraphmapsWpfControl/GraphmapsWpfControl.csproj @@ -4,6 +4,7 @@ Microsoft.Msagl.GraphmapsWpfControl Microsoft.Msagl.GraphmapsWpfControl net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows + true 4 diff --git a/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj b/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj index 0bd8df7e..dfb4605c 100644 --- a/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj +++ b/GraphLayout/tools/WpfGraphControl/WpfGraphControl.csproj @@ -2,6 +2,7 @@ net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows + true Microsoft.Msagl.WpfGraphControl diff --git a/GraphLayout/tools/agl/agl.csproj b/GraphLayout/tools/agl/agl.csproj index 35c38966..d5782e85 100644 --- a/GraphLayout/tools/agl/agl.csproj +++ b/GraphLayout/tools/agl/agl.csproj @@ -4,6 +4,8 @@ Agl agl net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows + true + 4 CA1303;CA1801;CA2000;CA1304;CA1031 From 99a54bb86deefe4ad7f2a25bc6d65be6c37bf420 Mon Sep 17 00:00:00 2001 From: levnach Date: Thu, 4 Jun 2026 09:44:52 -0700 Subject: [PATCH 4/4] Address review: fix nuspec framework references for new TFMs GraphViewerGDI.nuspec: remove frameworkReference entries for net8/9/10 (only net6 kept); adding Microsoft.WindowsDesktop.App.WinForms for modern TFMs triggers issue #390 (NETSDK1073). WpfGraphControl.nuspec: add dependency groups and lib file entries for net8/9/10-windows so the WPF package ships the new TFM build artifacts, without adding frameworkReference entries (beware of issue #390). Co-authored-by: Copilot <223556219+Copilot@users.noreply.github.com> --- .../tools/GraphViewerGDI/GraphViewerGDI.nuspec | 9 --------- .../tools/WpfGraphControl/WpfGraphControl.nuspec | 12 ++++++++++++ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.nuspec b/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.nuspec index a8b3a2ad..e031d78a 100644 --- a/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.nuspec +++ b/GraphLayout/tools/GraphViewerGDI/GraphViewerGDI.nuspec @@ -46,15 +46,6 @@ - - - - - - - - - diff --git a/GraphLayout/tools/WpfGraphControl/WpfGraphControl.nuspec b/GraphLayout/tools/WpfGraphControl/WpfGraphControl.nuspec index dc4cd1e6..5dc4d68d 100644 --- a/GraphLayout/tools/WpfGraphControl/WpfGraphControl.nuspec +++ b/GraphLayout/tools/WpfGraphControl/WpfGraphControl.nuspec @@ -25,6 +25,15 @@ + + + + + + + + + @@ -35,5 +44,8 @@ + + + \ No newline at end of file