Skip to content

Commit 1157a53

Browse files
authored
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
1 parent ce59c0d commit 1157a53

38 files changed

Lines changed: 64 additions & 49 deletions

File tree

GraphLayout/Samples/AspectRatioSample/SettingGraphBoundsSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
44
<OutputType>WinExe</OutputType>
55
<RootNamespace>AspectRatioSample</RootNamespace>
66
<OldToolsVersion>3.5</OldToolsVersion>

GraphLayout/Samples/DrawingFromGeometryGraphSample/DrawingFromGeometryGraphSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
44
<OutputType>WinExe</OutputType>
55
<AssemblyName>DrawingFromFromGeometryGraphSample</AssemblyName>
66
<OldToolsVersion>3.5</OldToolsVersion>

GraphLayout/Samples/EdgeDirectionTest/EdgeDirectionTest.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>WinExe</OutputType>
5-
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
5+
<TargetFrameworks>net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
66
<UseWPF>false</UseWPF>
77
<UseWindowsForms>true</UseWindowsForms>
88
<RootNamespace>EdgeDirectionTest</RootNamespace>

GraphLayout/Samples/EdgeRoutingSample/EdgeRoutingSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
44
<OutputType>Exe</OutputType>
55
<StartupObject></StartupObject>
66
<OldToolsVersion>3.5</OldToolsVersion>

GraphLayout/Samples/Editing/Editing.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
44
<OutputType>Exe</OutputType>
55
<StartupObject></StartupObject>
66
<OldToolsVersion>3.5</OldToolsVersion>

GraphLayout/Samples/FastIncrementalLayoutWithGdi/FastIncrementalLayoutWithGdi.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
44
<OutputType>WinExe</OutputType>
55
<OldToolsVersion>3.5</OldToolsVersion>
66
<IsWebBootstrapper>false</IsWebBootstrapper>

GraphLayout/Samples/FindEmptySpotSample/FindEmptySpotSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
44
<OutputType>WinExe</OutputType>
55
<OldToolsVersion>3.5</OldToolsVersion>
66
<PublishUrl>publish\</PublishUrl>

GraphLayout/Samples/GeometryRoutinesSample/GeometryRoutinesSample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
44
<OutputType>Exe</OutputType>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<UseWindowsForms>true</UseWindowsForms>

GraphLayout/Samples/LayerConstraintsFromGeometrySample/LayerConstraintsFromGeometrySample.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
44
<OutputType>WinExe</OutputType>
55
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>
66
<UseWindowsForms>true</UseWindowsForms>

GraphLayout/Samples/LayoutOfADisconnectedGraphWithSugiyama/LayoutOfADisconnectedGraphWithSugiyama.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
22
<PropertyGroup>
3-
<TargetFrameworks>net472;net6.0-windows</TargetFrameworks>
3+
<TargetFrameworks>net472;net6.0-windows;net8.0-windows;net9.0-windows;net10.0-windows</TargetFrameworks>
44
<Platform Condition=" '$(Platform)' == '' ">x86</Platform>
55
<OutputType>WinExe</OutputType>
66
<GenerateAssemblyInfo>false</GenerateAssemblyInfo>

0 commit comments

Comments
 (0)