Update Graphviz to version 11.0.0 (#94)

* Update Graphviz to version 11.0.0 * Change copying behavior to Always, because it goes wrong too often, causing segfaults when binaries have changed * Upgrade packages
Rubjerg · Dec 13, 2024 · e5d49d6 · e5d49d6
1 parent 6c05a02
commit e5d49d6
Show file tree

Hide file tree

Showing 107 changed files with 33 additions and 34 deletions.
diff --git a/GraphvizWrapper/graphvizfiles/Debug/acyclic.exe b/GraphvizWrapper/graphvizfiles/Debug/acyclic.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/bcomps.exe b/GraphvizWrapper/graphvizfiles/Debug/bcomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/ccomps.exe b/GraphvizWrapper/graphvizfiles/Debug/ccomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cdt.dll b/GraphvizWrapper/graphvizfiles/Debug/cdt.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cgraph++.dll b/GraphvizWrapper/graphvizfiles/Debug/cgraph++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cgraph.dll b/GraphvizWrapper/graphvizfiles/Debug/cgraph.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/circo.exe b/GraphvizWrapper/graphvizfiles/Debug/circo.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/cluster.exe b/GraphvizWrapper/graphvizfiles/Debug/cluster.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/dijkstra.exe b/GraphvizWrapper/graphvizfiles/Debug/dijkstra.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/dot.exe b/GraphvizWrapper/graphvizfiles/Debug/dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/dot2gxl.exe b/GraphvizWrapper/graphvizfiles/Debug/dot2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/dot_builtins.exe b/GraphvizWrapper/graphvizfiles/Debug/dot_builtins.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/edgepaint.exe b/GraphvizWrapper/graphvizfiles/Debug/edgepaint.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/fdp.exe b/GraphvizWrapper/graphvizfiles/Debug/fdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gc.exe b/GraphvizWrapper/graphvizfiles/Debug/gc.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gml2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/gml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/graphml2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/graphml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gv2gml.exe b/GraphvizWrapper/graphvizfiles/Debug/gv2gml.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gv2gxl.exe b/GraphvizWrapper/graphvizfiles/Debug/gv2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvc++.dll b/GraphvizWrapper/graphvizfiles/Debug/gvc++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvc.dll b/GraphvizWrapper/graphvizfiles/Debug/gvc.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvcolor.exe b/GraphvizWrapper/graphvizfiles/Debug/gvcolor.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvgen.exe b/GraphvizWrapper/graphvizfiles/Debug/gvgen.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvmap.exe b/GraphvizWrapper/graphvizfiles/Debug/gvmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvpack.exe b/GraphvizWrapper/graphvizfiles/Debug/gvpack.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_core.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_core.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_dot_layout.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_dot_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_gdiplus.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_gdiplus.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_kitty.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_kitty.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_neato_layout.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_neato_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_pango.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_pango.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvplugin_vt.dll b/GraphvizWrapper/graphvizfiles/Debug/gvplugin_vt.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gvpr.exe b/GraphvizWrapper/graphvizfiles/Debug/gvpr.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gxl2dot.exe b/GraphvizWrapper/graphvizfiles/Debug/gxl2dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/gxl2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/gxl2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/mm2gv.exe b/GraphvizWrapper/graphvizfiles/Debug/mm2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/neato.exe b/GraphvizWrapper/graphvizfiles/Debug/neato.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/nop.exe b/GraphvizWrapper/graphvizfiles/Debug/nop.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/osage.exe b/GraphvizWrapper/graphvizfiles/Debug/osage.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/patchwork.exe b/GraphvizWrapper/graphvizfiles/Debug/patchwork.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/pathplan.dll b/GraphvizWrapper/graphvizfiles/Debug/pathplan.dll
diff --git a/GraphvizWrapper/graphvizfiles/Debug/prune.exe b/GraphvizWrapper/graphvizfiles/Debug/prune.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/sccmap.exe b/GraphvizWrapper/graphvizfiles/Debug/sccmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/sfdp.exe b/GraphvizWrapper/graphvizfiles/Debug/sfdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/tred.exe b/GraphvizWrapper/graphvizfiles/Debug/tred.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/twopi.exe b/GraphvizWrapper/graphvizfiles/Debug/twopi.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/unflatten.exe b/GraphvizWrapper/graphvizfiles/Debug/unflatten.exe
diff --git a/GraphvizWrapper/graphvizfiles/Debug/xdot.dll b/GraphvizWrapper/graphvizfiles/Debug/xdot.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/Pathplan.dll b/GraphvizWrapper/graphvizfiles/Release/Pathplan.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/acyclic.exe b/GraphvizWrapper/graphvizfiles/Release/acyclic.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/bcomps.exe b/GraphvizWrapper/graphvizfiles/Release/bcomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/ccomps.exe b/GraphvizWrapper/graphvizfiles/Release/ccomps.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/cdt.dll b/GraphvizWrapper/graphvizfiles/Release/cdt.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/cgraph++.dll b/GraphvizWrapper/graphvizfiles/Release/cgraph++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/cgraph.dll b/GraphvizWrapper/graphvizfiles/Release/cgraph.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/circo.exe b/GraphvizWrapper/graphvizfiles/Release/circo.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/cluster.exe b/GraphvizWrapper/graphvizfiles/Release/cluster.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/dijkstra.exe b/GraphvizWrapper/graphvizfiles/Release/dijkstra.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/dot.exe b/GraphvizWrapper/graphvizfiles/Release/dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/dot2gxl.exe b/GraphvizWrapper/graphvizfiles/Release/dot2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/dot_builtins.exe b/GraphvizWrapper/graphvizfiles/Release/dot_builtins.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/edgepaint.exe b/GraphvizWrapper/graphvizfiles/Release/edgepaint.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/fdp.exe b/GraphvizWrapper/graphvizfiles/Release/fdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gc.exe b/GraphvizWrapper/graphvizfiles/Release/gc.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gml2gv.exe b/GraphvizWrapper/graphvizfiles/Release/gml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/graphml2gv.exe b/GraphvizWrapper/graphvizfiles/Release/graphml2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gv2gml.exe b/GraphvizWrapper/graphvizfiles/Release/gv2gml.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gv2gxl.exe b/GraphvizWrapper/graphvizfiles/Release/gv2gxl.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvc++.dll b/GraphvizWrapper/graphvizfiles/Release/gvc++.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvc.dll b/GraphvizWrapper/graphvizfiles/Release/gvc.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvcolor.exe b/GraphvizWrapper/graphvizfiles/Release/gvcolor.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvgen.exe b/GraphvizWrapper/graphvizfiles/Release/gvgen.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvmap.exe b/GraphvizWrapper/graphvizfiles/Release/gvmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvpack.exe b/GraphvizWrapper/graphvizfiles/Release/gvpack.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_core.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_core.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_dot_layout.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_dot_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_gdiplus.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_gdiplus.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_kitty.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_kitty.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_neato_layout.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_neato_layout.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_pango.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_pango.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvplugin_vt.dll b/GraphvizWrapper/graphvizfiles/Release/gvplugin_vt.dll
diff --git a/GraphvizWrapper/graphvizfiles/Release/gvpr.exe b/GraphvizWrapper/graphvizfiles/Release/gvpr.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gxl2dot.exe b/GraphvizWrapper/graphvizfiles/Release/gxl2dot.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/gxl2gv.exe b/GraphvizWrapper/graphvizfiles/Release/gxl2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/mm2gv.exe b/GraphvizWrapper/graphvizfiles/Release/mm2gv.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/neato.exe b/GraphvizWrapper/graphvizfiles/Release/neato.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/nop.exe b/GraphvizWrapper/graphvizfiles/Release/nop.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/osage.exe b/GraphvizWrapper/graphvizfiles/Release/osage.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/patchwork.exe b/GraphvizWrapper/graphvizfiles/Release/patchwork.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/prune.exe b/GraphvizWrapper/graphvizfiles/Release/prune.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/sccmap.exe b/GraphvizWrapper/graphvizfiles/Release/sccmap.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/sfdp.exe b/GraphvizWrapper/graphvizfiles/Release/sfdp.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/tred.exe b/GraphvizWrapper/graphvizfiles/Release/tred.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/twopi.exe b/GraphvizWrapper/graphvizfiles/Release/twopi.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/unflatten.exe b/GraphvizWrapper/graphvizfiles/Release/unflatten.exe
diff --git a/GraphvizWrapper/graphvizfiles/Release/xdot.dll b/GraphvizWrapper/graphvizfiles/Release/xdot.dll
diff --git a/GraphvizWrapper/include/geom.h b/GraphvizWrapper/include/geom.h
@@ -28,6 +28,11 @@ typedef struct { int x, y; } point;
 
 typedef struct pointf_s { double x, y; } pointf;
 
+typedef struct {
+  pointf p; // arbitrary point on the line
+  double m; // slope of the line
+} linef;
+
 /* tell pathplan/pathgeom.h */
 #define HAVE_POINTF_S
 

diff --git a/GraphvizWrapper/include/graphviz_version.h b/GraphvizWrapper/include/graphviz_version.h
@@ -3,7 +3,7 @@
 #define GVPLUGIN_VERSION 6
 #define PACKAGE_BUGREPORT "https://gitlab.com/graphviz/graphviz/-/issues"
 #define PACKAGE_NAME "graphviz"
-#define PACKAGE_STRING "graphviz 11.0.0~dev.20240413.1811"
+#define PACKAGE_STRING "graphviz 11.0.0"
 #define PACKAGE_TARNAME "graphviz"
 #define PACKAGE_URL ""
-#define PACKAGE_VERSION "11.0.0~dev.20240413.1811"
+#define PACKAGE_VERSION "11.0.0"
diff --git a/GraphvizWrapper/include/gvcjob.h b/GraphvizWrapper/include/gvcjob.h
@@ -39,7 +39,6 @@ extern "C" {
 
 #define PENWIDTH_NORMAL 1.
 #define PENWIDTH_BOLD 2.
-    typedef enum { GVATTR_STRING, GVATTR_BOOL, GVATTR_COLOR } gvattr_t;
 
 /* The -T output formats listed below are examples only, they are not definitive or inclusive,
  other outputs may use the flags now, or in the future 
@@ -144,12 +143,6 @@ extern "C" {
 	int id;
 	const char *type;
     } gvplugin_active_loadimage_t;
-
-    typedef struct gv_argvlist_s {
-	char **argv;
-	size_t argc;
-	size_t alloc;
-    } gv_argvlist_t;
 
     typedef struct gvdevice_callbacks_s {
 	void (*refresh) (GVJ_t * job);
@@ -356,16 +349,12 @@ extern "C" {
 					/* (e.g. button 1 clicked on current obj) */
 	char *active_tooltip;		/* tooltip of active object - or NULL */
 	char *selected_href;		/* href of selected object - or NULL */
-	gv_argvlist_t selected_obj_type_name; /* (e.g. "edge" "node3" "e" "->" "node5" "") */
-	gv_argvlist_t selected_obj_attributes; /* attribute triplets: name, value, type */
-				/* e.g. "color", "red", GVATTR_COLOR,
-					"style", "filled", GVATTR_BOOL, */
 
 	void *window;		/* display-specific data for gvrender plugin */
 
         /* keybindings for keyboard events */
 	gvevent_key_binding_t *keybindings;
-	int numkeys;
+	size_t numkeys;
 	void *keycodes;
     };
 

diff --git a/GraphvizWrapper/lib/gvc.lib b/GraphvizWrapper/lib/gvc.lib
diff --git a/How-to-upgrade-graphviz.txt b/How-to-upgrade-graphviz.txt
@@ -1,15 +1,20 @@
 - Navigate to https://gitlab.com/groups/graphviz/-/packages/ and click the version you want to upgrade to
-- Download and install `windows_10_cmake_Debug_graphviz-install-<version>-win64.exe` on your system
-- Navigate to `C:\Program Files\Graphviz\bin` and copy all the files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\graphvizfiles\Debug\`.
+
+- Download and extract `windows_10_cmake_Debug_Graphviz-<version>-win64.zip`.
+- Navigate to `bin/` and copy all the files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\graphvizfiles\Debug\`.
   Check that every existing file was overwritten.
-- Navigate to `C:\Program Files\Graphviz\lib` and copy all the .lib files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\lib\`.
+- Navigate to `lib/` and copy all the .lib files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\lib\`.
   Check that every existing file was overwritten.
-- Navigate to `C:\Program Files\Graphviz\include\graphviz` and copy all the lib files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\include\`.
+- Navigate to `include/graphviz/` and copy all the .h files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\include\`.
   Check that every existing file was overwritten.
-- Download and install `windows_10_cmake_Release_graphviz-install-<version>-win64.exe` on your system
-- Navigate to `C:\Program Files\Graphviz\bin` and copy all the files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\graphvizfiles\Release\`.
+
+- Download and extract `windows_10_cmake_Release_Graphviz-<version>-win64.zip`.
+- Navigate to `bin/` and copy all the files in that folder to `Graphviz.NetWrapper\GraphvizWrapper\graphvizfiles\Release\`.
   Check that every existing file was overwritten.
+
 - Make sure that the toolset selected for GraphvizWrapper.dll is compatible with the vcruntime version shipped with graphviz.
 - Remove all DLLs starting with `concrt`, `msvcp` or `vcruntime`. These are part of the Visual C++ redistributable package, and we're not shipping those.
 - Remove all files ending in `.sh`, these are not crossplatform and we don't need them.
 - Check if any other files are new, and investigate if that is expected.
+
+- Compile and run the tests
diff --git a/Rubjerg.Graphviz.NugetTest/Rubjerg.Graphviz.NugetTest.csproj b/Rubjerg.Graphviz.NugetTest/Rubjerg.Graphviz.NugetTest.csproj
@@ -16,20 +16,20 @@
       <Version>2.0.2</Version>
     </PackageReference>
     <PackageReference Include="NUnit.ConsoleRunner">
-      <Version>3.17.0</Version>
+      <Version>3.18.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.14.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit.Extension.TeamCityEventListener">
-      <Version>1.0.7</Version>
+      <Version>1.0.9</Version>
     </PackageReference>
     <PackageReference Include="OpenCover">
       <Version>4.7.1221</Version>
     </PackageReference>
     <!--We need both packages below to run the tests in VS https://github.com/microsoft/vstest/issues/1870-->
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Rubjerg.Graphviz.Test/Rubjerg.Graphviz.Test.csproj b/Rubjerg.Graphviz.Test/Rubjerg.Graphviz.Test.csproj
@@ -22,7 +22,7 @@
 
   <ItemGroup>
     <PackageReference Include="NUnit.ConsoleRunner">
-      <Version>3.18.1</Version>
+      <Version>3.18.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.14.0</Version>
@@ -34,7 +34,7 @@
       <Version>4.7.1221</Version>
     </PackageReference>
     <!--We need both packages below to run the tests in VS https://github.com/microsoft/vstest/issues/1870-->
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
 

diff --git a/Rubjerg.Graphviz.TransitiveNugetTest/Rubjerg.Graphviz.TransitiveNugetTest.csproj b/Rubjerg.Graphviz.TransitiveNugetTest/Rubjerg.Graphviz.TransitiveNugetTest.csproj
@@ -17,20 +17,20 @@
 
   <ItemGroup>
     <PackageReference Include="NUnit.ConsoleRunner">
-      <Version>3.17.0</Version>
+      <Version>3.18.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.14.0</Version>
     </PackageReference>
     <PackageReference Include="NUnit.Extension.TeamCityEventListener">
-      <Version>1.0.7</Version>
+      <Version>1.0.9</Version>
     </PackageReference>
     <PackageReference Include="OpenCover">
       <Version>4.7.1221</Version>
     </PackageReference>
     <!--We need both packages below to run the tests in VS https://github.com/microsoft/vstest/issues/1870-->
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
-    <PackageReference Include="NUnit3TestAdapter" Version="4.5.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
+    <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
 
 </Project>
diff --git a/Rubjerg.Graphviz.TransitiveTest/Rubjerg.Graphviz.TransitiveTest.csproj b/Rubjerg.Graphviz.TransitiveTest/Rubjerg.Graphviz.TransitiveTest.csproj
@@ -18,7 +18,7 @@
 
   <ItemGroup>
     <PackageReference Include="NUnit.ConsoleRunner">
-      <Version>3.18.1</Version>
+      <Version>3.18.3</Version>
     </PackageReference>
     <PackageReference Include="NUnit">
       <Version>3.14.0</Version>
@@ -30,7 +30,7 @@
       <Version>4.7.1221</Version>
     </PackageReference>
     <!--We need both packages below to run the tests in VS https://github.com/microsoft/vstest/issues/1870-->
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.12.0" />
     <PackageReference Include="NUnit3TestAdapter" Version="4.6.0" />
   </ItemGroup>
 

diff --git a/Rubjerg.Graphviz/Rubjerg.Graphviz.csproj b/Rubjerg.Graphviz/Rubjerg.Graphviz.csproj
@@ -34,7 +34,7 @@
 
   <ItemGroup>
     <None Update="*.dll;*.lib;*.pdb;*.exp;*.exe;config6">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <Pack>true</Pack>
       <PackageCopyToOutput>true</PackageCopyToOutput>
     </None>

diff --git a/nunit-console.sh b/nunit-console.sh
@@ -1,2 +1,2 @@
 #!/bin/bash
-packages\\nunit.consolerunner\\3.18.1\\tools\\nunit3-console.exe "$@" --trace=Off --where "cat!=Slow and cat!=Flaky"
+packages\\nunit.consolerunner\\3.18.3\\tools\\nunit3-console.exe "$@" --trace=Off --where "cat!=Slow and cat!=Flaky"