Skip to content

Commit 4951e66

Browse files
chtenbchtenb
committed
Remove .exe and .dll suffixes
1 parent 3f48ca7 commit 4951e66

6 files changed

Lines changed: 139 additions & 139 deletions

File tree

‎Rubjerg.Graphviz/ForeignFunctionInterface.cs‎

Lines changed: 77 additions & 77 deletions
Large diffs are not rendered by default.

‎Rubjerg.Graphviz/GraphvizCommand.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ public static string ConvertBytesOutputToString(byte[] data)
3434
/// <returns>stderr may contain warnings, stdout is in utf8 encoding</returns>
3535
public static (byte[] stdout, string stderr) Exec(Graph input, string format = "xdot", string? outputPath = null, string engine = LayoutEngines.Dot)
3636
{
37-
string exeName = "dot.exe";
37+
string exeName = "dot";
3838
string arguments = $"-T{format} -K{engine}";
3939
if (outputPath != null)
4040
{

‎Rubjerg.Graphviz/Marshaling.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,6 @@ public static T MarshalToUtf8<T>(string? s, Func<IntPtr, T> continuation, bool f
8787
return byteArray;
8888
}
8989

90-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
90+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
9191
private static extern void free_str(IntPtr ptr);
9292
}

‎Rubjerg.Graphviz/NativeMethods.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public static void CreateConsole()
2626

2727
// P/Invoke required:
2828
private const uint StdOutputHandle = 0xFFFFFFF5;
29-
[DllImport("kernel32.dll")]
29+
[DllImport("kernel32")]
3030
private static extern IntPtr GetStdHandle(uint nStdHandle);
31-
[DllImport("kernel32.dll")]
31+
[DllImport("kernel32")]
3232
private static extern void SetStdHandle(uint nStdHandle, IntPtr handle);
3333
[DllImport("kernel32")]
3434
static extern bool AllocConsole();

‎Rubjerg.Graphviz/XDotFFI.cs‎

Lines changed: 57 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -10,198 +10,198 @@ namespace Rubjerg.Graphviz;
1010
/// </summary>
1111
internal static class XDotFFI
1212
{
13-
[DllImport("xdot.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
13+
[DllImport("xdot", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
1414
private static extern IntPtr parseXDot(IntPtr xdotString);
1515
public static IntPtr ParseXDot(string xdotString) => MarshalToUtf8(xdotString, parseXDot);
1616

17-
[DllImport("xdot.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
17+
[DllImport("xdot", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
1818
public static extern void freeXDot(IntPtr xdotptr);
1919

2020
// Accessors for xdot
21-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
21+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
2222
public static extern UIntPtr get_cnt(IntPtr xdot);
2323

24-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
24+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
2525
public static extern IntPtr get_ops(IntPtr xdot);
2626

2727
// Accessors for xdot_image
28-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
28+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
2929
private static extern IntPtr get_name_image(IntPtr img);
3030
public static string? GetNameImage(IntPtr img) => MarshalFromUtf8(get_name_image(img), false);
3131

32-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
32+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
3333
public static extern IntPtr get_pos(IntPtr img);
3434

3535
// Accessors for xdot_font
36-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
36+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
3737
public static extern double get_size(IntPtr font);
3838

39-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
39+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
4040
private static extern IntPtr get_name_font(IntPtr font);
4141
public static string? GetNameFont(IntPtr img) => MarshalFromUtf8(get_name_font(img), false);
4242

4343
// Accessors for xdot_op
44-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
44+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
4545
public static extern XDotKind get_kind(IntPtr op);
4646

47-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
47+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
4848
public static extern IntPtr get_ellipse(IntPtr op);
4949

50-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
50+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
5151
public static extern IntPtr get_polygon(IntPtr op);
5252

53-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
53+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
5454
public static extern IntPtr get_polyline(IntPtr op);
5555

56-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
56+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
5757
public static extern IntPtr get_bezier(IntPtr op);
5858

59-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
59+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
6060
public static extern IntPtr get_text(IntPtr op);
6161

62-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
62+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
6363
public static extern IntPtr get_image(IntPtr op);
6464

65-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
65+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
6666
private static extern IntPtr get_color(IntPtr op);
6767
public static string? GetColor(IntPtr op) => MarshalFromUtf8(get_color(op), false);
6868

69-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
69+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
7070
public static extern IntPtr get_grad_color(IntPtr op);
7171

72-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
72+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
7373
public static extern IntPtr get_font(IntPtr op);
7474

75-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
75+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
7676
private static extern IntPtr get_style(IntPtr op);
7777
public static string? GetStyle(IntPtr op) => MarshalFromUtf8(get_style(op), false);
7878

79-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
79+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
8080
public static extern uint get_fontchar(IntPtr op);
8181

8282
// Accessors for xdot_color
83-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
83+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
8484
public static extern XDotGradType get_type(IntPtr clr);
8585

86-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
86+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
8787
private static extern IntPtr get_clr(IntPtr clr);
8888
public static string? GetClr(IntPtr clr) => MarshalFromUtf8(get_clr(clr), false);
8989

90-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
90+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
9191
public static extern IntPtr get_ling(IntPtr clr);
9292

93-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
93+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
9494
public static extern IntPtr get_ring(IntPtr clr);
9595

9696
// Accessors for xdot_text
97-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
97+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
9898
public static extern double get_x_text(IntPtr txt);
9999

100-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
100+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
101101
public static extern double get_y_text(IntPtr txt);
102102

103-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
103+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
104104
public static extern TextAlign get_align(IntPtr txt);
105105

106-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
106+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
107107
public static extern double get_width(IntPtr txt);
108108

109-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
109+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
110110
private static extern IntPtr get_text_str(IntPtr txt);
111111
public static string? GetTextStr(IntPtr txt) => MarshalFromUtf8(get_text_str(txt), false);
112112

113113
// Accessors for xdot_linear_grad
114-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
114+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
115115
public static extern double get_x0_ling(IntPtr ling);
116116

117-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
117+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
118118
public static extern double get_y0_ling(IntPtr ling);
119119

120-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
120+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
121121
public static extern double get_x1_ling(IntPtr ling);
122122

123-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
123+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
124124
public static extern double get_y1_ling(IntPtr ling);
125125

126-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
126+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
127127
public static extern int get_n_stops_ling(IntPtr ling);
128128

129-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
129+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
130130
public static extern IntPtr get_stops_ling(IntPtr ling);
131131

132132
// Accessors for xdot_radial_grad
133-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
133+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
134134
public static extern double get_x0_ring(IntPtr ring);
135135

136-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
136+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
137137
public static extern double get_y0_ring(IntPtr ring);
138138

139-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
139+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
140140
public static extern double get_r0_ring(IntPtr ring);
141141

142-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
142+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
143143
public static extern double get_x1_ring(IntPtr ring);
144144

145-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
145+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
146146
public static extern double get_y1_ring(IntPtr ring);
147147

148-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
148+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
149149
public static extern double get_r1_ring(IntPtr ring);
150150

151-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
151+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
152152
public static extern int get_n_stops_ring(IntPtr ring);
153153

154-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
154+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
155155
public static extern IntPtr get_stops_ring(IntPtr ring);
156156

157157
// Accessors for xdot_color_stop
158-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
158+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
159159
public static extern float get_frac(IntPtr stop);
160160

161-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
161+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
162162
private static extern IntPtr get_color_stop(IntPtr stop);
163163
public static string? GetColorStop(IntPtr stop) => MarshalFromUtf8(get_color_stop(stop), false);
164164

165165
// Accessors for xdot_polyline
166-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
166+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
167167
public static extern UIntPtr get_cnt_polyline(IntPtr polyline);
168168

169-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
169+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
170170
public static extern IntPtr get_pts_polyline(IntPtr polyline);
171171

172172
// Accessors for xdot_point
173-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
173+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
174174
public static extern double get_x_point(IntPtr point);
175175

176-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
176+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
177177
public static extern double get_y_point(IntPtr point);
178178

179-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
179+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
180180
public static extern double get_z_point(IntPtr point);
181181

182182
// Accessors for xdot_rect
183-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
183+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
184184
public static extern double get_x_rect(IntPtr rect);
185185

186-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
186+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
187187
public static extern double get_y_rect(IntPtr rect);
188188

189-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
189+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
190190
public static extern double get_w_rect(IntPtr rect);
191191

192-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
192+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
193193
public static extern double get_h_rect(IntPtr rect);
194194

195195
// Index function for xdot_color_stop array
196-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
196+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
197197
public static extern IntPtr get_color_stop_at_index(IntPtr stops, int index);
198198

199199
// Index function for xdot_op array
200-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
200+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
201201
public static extern IntPtr get_op_at_index(IntPtr ops, int index);
202202

203203
// Index function for xdot_pt array
204-
[DllImport("GraphvizWrapper.dll", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
204+
[DllImport("GraphvizWrapper", SetLastError = true, CallingConvention = CallingConvention.Cdecl)]
205205
public static extern IntPtr get_pt_at_index(IntPtr pts, int index);
206206

207207
}

‎run-tests-netcore.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
#!/bin/bash
2-
dotnet test --no-build -f net8.0 -v d --filter "Category != Flaky & Category != Slow" "$@"
2+
dotnet test --no-build -p:OutputPath=bin/x64/Debug/net8.0 -f net8.0 -v d --filter "Category != Flaky & Category != Slow" "$@"
33

0 commit comments

Comments
 (0)