Skip to content

Commit ce3bceb

Browse files
badcelbadcel
authored
Merge pull request #998 from gircore/solution-folder-separator
Update GirCore.sln
2 parents 8847a1d + 8908c58 commit ce3bceb

File tree

5 files changed

+171
-161
lines changed

5 files changed

+171
-161
lines changed

‎src/Generation/GirTool/GenerateCommand.cs

-3
Original file line numberDiff line numberDiff line change
@@ -39,9 +39,6 @@ private void Execute(string[] input, string output, string? searchPathLinux, str
3939
}
4040
catch (Exception ex)
4141
{
42-
if (ex.StackTrace is not null)
43-
Log.Debug(ex.StackTrace);
44-
4542
Log.Exception(ex);
4643
Log.Error("An error occurred while writing files. Please save a copy of your log output and open an issue at: https://github.com/gircore/gir.core/issues/new");
4744
invocationContext.ExitCode = 1;

‎src/Generation/Shared/Log.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ public static void EnableVerboseOutput()
3535
=> Switch.MinimumLevel = LogEventLevel.Verbose;
3636

3737
public static void Exception(Exception exception)
38-
=> Logger.Error("Exception occured: {$exception}", exception.Message);
38+
=> Logger.Error(exception, "Exception occured: {$exception}", exception.Message);
3939

4040
public static void Error(string message)
4141
=> Logger.Error(message);

‎src/GirCore.Libs.slnf

+50-50
Original file line numberDiff line numberDiff line change
@@ -2,55 +2,55 @@
22
"solution": {
33
"path": "GirCore.sln",
44
"projects": [
5-
"Generation/Generator/Generator.csproj",
6-
"Generation/GirLoader/GirLoader.csproj",
7-
"Generation/GirModel/GirModel.csproj",
8-
"Generation/GirTool/GirTool.csproj",
9-
"Extensions/Integration/Integration.csproj",
10-
"Libs/Adw-1/Adw-1.csproj",
11-
"Libs/cairo-1.0/cairo-1.0.csproj",
12-
"Libs/freetype2-2.0/freetype2-2.0.csproj",
13-
"Libs/Gdk-4.0/Gdk-4.0.csproj",
14-
"Libs/GdkPixbuf-2.0/GdkPixbuf-2.0.csproj",
15-
"Libs/Gio-2.0/Gio-2.0.csproj",
16-
"Libs/GLib-2.0/GLib-2.0.csproj",
17-
"Libs/GObject-2.0/GObject-2.0.csproj",
18-
"Libs/Graphene-1.0/Graphene-1.0.csproj",
19-
"Libs/Gsk-4.0/Gsk-4.0.csproj",
20-
"Libs/Gst-1.0/Gst-1.0.csproj",
21-
"Libs/GstAudio-1.0/GstAudio-1.0.csproj",
22-
"Libs/GstBase-1.0/GstBase-1.0.csproj",
23-
"Libs/GstPbutils-1.0/GstPbutils-1.0.csproj",
24-
"Libs/GstVideo-1.0/GstVideo-1.0.csproj",
25-
"Libs/Gtk-4.0/Gtk-4.0.csproj",
26-
"Libs/GtkSource-5/GtkSource-5.csproj",
27-
"Libs/HarfBuzz-0.0/HarfBuzz-0.0.csproj",
28-
"Libs/Pango-1.0/Pango-1.0.csproj",
29-
"Libs/PangoCairo-1.0/PangoCairo-1.0.csproj",
30-
"Libs/Soup-3.0/Soup-3.0.csproj",
31-
"Libs/WebKit-6.0/WebKit-6.0.csproj",
32-
"Libs/WebKitWebProcessExtension-6.0/WebKitWebProcessExtension-6.0.csproj",
33-
"Libs/JavaScriptCore-6.0/JavaScriptCore-6.0.csproj",
34-
"Samples/Adw-1/Window/Window.csproj",
35-
"Samples/GdkPixbuf-2.0/TestLoading/TestLoading.csproj",
36-
"Samples/GdkPixbuf-2.0/TestMemoryLeaks/TestMemoryLeaks.csproj",
37-
"Samples/Gio-2.0/DBusNotification/DBusNotification.csproj",
38-
"Samples/Gst-1.0/VideoPlayback/VideoPlayback.csproj",
39-
"Samples/Gtk-4.0/AboutDialog/AboutDialog.csproj",
40-
"Samples/Gtk-4.0/Builder/Builder.csproj",
41-
"Samples/Gtk-4.0/DrawingArea/DrawingArea.csproj",
42-
"Samples/Gtk-4.0/FontDialog/FontDialog.csproj",
43-
"Samples/Gtk-4.0/Window/Window.csproj",
44-
"Samples/GtkSource-5/GtkSourceView/GtkSourceView.csproj",
45-
"Samples/WebKit-6.0/JavascriptCall/JavascriptCall.csproj",
46-
"Samples/WebKit-6.0/JavascriptCallback/JavascriptCallback.csproj",
47-
"Tests/Generation/GirLoader.Tests/GirLoader.Tests.csproj",
48-
"Tests/Libs/Cairo-1.0.Tests/Cairo-1.0.Tests.csproj",
49-
"Tests/Libs/GdkPixbuf-2.0.Tests/GdkPixbuf-2.0.Tests.csproj",
50-
"Tests/Libs/Gio-2.0.Tests/Gio-2.0.Tests.csproj",
51-
"Tests/Libs/GLib-2.0.Tests/GLib-2.0.Tests.csproj",
52-
"Tests/Libs/GObject-2.0.Tests/GObject-2.0.Tests.csproj",
53-
"Tests/Libs/Gtk-4.0.Tests/Gtk-4.0.Tests.csproj",
5+
"Generation\\Generator\\Generator.csproj",
6+
"Generation\\GirLoader\\GirLoader.csproj",
7+
"Generation\\GirModel\\GirModel.csproj",
8+
"Generation\\GirTool\\GirTool.csproj",
9+
"Extensions\\Integration\\Integration.csproj",
10+
"Libs\\Adw-1\\Adw-1.csproj",
11+
"Libs\\cairo-1.0\\cairo-1.0.csproj",
12+
"Libs\\freetype2-2.0\\freetype2-2.0.csproj",
13+
"Libs\\Gdk-4.0\\Gdk-4.0.csproj",
14+
"Libs\\GdkPixbuf-2.0\\GdkPixbuf-2.0.csproj",
15+
"Libs\\Gio-2.0\\Gio-2.0.csproj",
16+
"Libs\\GLib-2.0\\GLib-2.0.csproj",
17+
"Libs\\GObject-2.0\\GObject-2.0.csproj",
18+
"Libs\\Graphene-1.0\\Graphene-1.0.csproj",
19+
"Libs\\Gsk-4.0\\Gsk-4.0.csproj",
20+
"Libs\\Gst-1.0\\Gst-1.0.csproj",
21+
"Libs\\GstAudio-1.0\\GstAudio-1.0.csproj",
22+
"Libs\\GstBase-1.0\\GstBase-1.0.csproj",
23+
"Libs\\GstPbutils-1.0\\GstPbutils-1.0.csproj",
24+
"Libs\\GstVideo-1.0\\GstVideo-1.0.csproj",
25+
"Libs\\Gtk-4.0\\Gtk-4.0.csproj",
26+
"Libs\\GtkSource-5\\GtkSource-5.csproj",
27+
"Libs\\HarfBuzz-0.0\\HarfBuzz-0.0.csproj",
28+
"Libs\\Pango-1.0\\Pango-1.0.csproj",
29+
"Libs\\PangoCairo-1.0\\PangoCairo-1.0.csproj",
30+
"Libs\\Soup-3.0\\Soup-3.0.csproj",
31+
"Libs\\WebKit-6.0\\WebKit-6.0.csproj",
32+
"Libs\\WebKitWebProcessExtension-6.0\\WebKitWebProcessExtension-6.0.csproj",
33+
"Libs\\JavaScriptCore-6.0\\JavaScriptCore-6.0.csproj",
34+
"Samples\\Adw-1\\Window\\Window.csproj",
35+
"Samples\\GdkPixbuf-2.0\\TestLoading\\TestLoading.csproj",
36+
"Samples\\GdkPixbuf-2.0\\TestMemoryLeaks\\TestMemoryLeaks.csproj",
37+
"Samples\\Gio-2.0\\DBusNotification\\DBusNotification.csproj",
38+
"Samples\\Gst-1.0\\VideoPlayback\\VideoPlayback.csproj",
39+
"Samples\\Gtk-4.0\\AboutDialog\\AboutDialog.csproj",
40+
"Samples\\Gtk-4.0\\Builder\\Builder.csproj",
41+
"Samples\\Gtk-4.0\\DrawingArea\\DrawingArea.csproj",
42+
"Samples\\Gtk-4.0\\FontDialog\\FontDialog.csproj",
43+
"Samples\\Gtk-4.0\\Window\\Window.csproj",
44+
"Samples\\GtkSource-5\\GtkSourceView\\GtkSourceView.csproj",
45+
"Samples\\WebKit-6.0\\JavascriptCall\\JavascriptCall.csproj",
46+
"Samples\\WebKit-6.0\\JavascriptCallback\\JavascriptCallback.csproj",
47+
"Tests\\Generation\\GirLoader.Tests\\GirLoader.Tests.csproj",
48+
"Tests\\Libs\\Cairo-1.0.Tests\\Cairo-1.0.Tests.csproj",
49+
"Tests\\Libs\\GdkPixbuf-2.0.Tests\\GdkPixbuf-2.0.Tests.csproj",
50+
"Tests\\Libs\\Gio-2.0.Tests\\Gio-2.0.Tests.csproj",
51+
"Tests\\Libs\\GLib-2.0.Tests\\GLib-2.0.Tests.csproj",
52+
"Tests\\Libs\\GObject-2.0.Tests\\GObject-2.0.Tests.csproj",
53+
"Tests\\Libs\\Gtk-4.0.Tests\\Gtk-4.0.Tests.csproj",
5454
]
5555
}
56-
}
56+
}

‎src/GirCore.TestLib.slnf

+10-10
Original file line numberDiff line numberDiff line change
@@ -2,15 +2,15 @@
22
"solution": {
33
"path": "GirCore.sln",
44
"projects": [
5-
"Generation/Generator/Generator.csproj",
6-
"Generation/GirLoader/GirLoader.csproj",
7-
"Generation/GirModel/GirModel.csproj",
8-
"Generation/GirTool/GirTool.csproj",
9-
"Libs/GirTest-0.1/GirTest-0.1.csproj",
10-
"Libs/GLib-2.0/GLib-2.0.csproj",
11-
"Libs/GObject-2.0/GObject-2.0.csproj",
12-
"Tests/Generation/GirLoader.Tests/GirLoader.Tests.csproj",
13-
"Tests/Libs/GirTest-0.1.Tests/GirTest-0.1.Tests.csproj",
5+
"Generation\\Generator\\Generator.csproj",
6+
"Generation\\GirLoader\\GirLoader.csproj",
7+
"Generation\\GirModel\\GirModel.csproj",
8+
"Generation\\GirTool\\GirTool.csproj",
9+
"Libs\\GirTest-0.1\\GirTest-0.1.csproj",
10+
"Libs\\GLib-2.0\\GLib-2.0.csproj",
11+
"Libs\\GObject-2.0\\GObject-2.0.csproj",
12+
"Tests\\Generation\\GirLoader.Tests\\GirLoader.Tests.csproj",
13+
"Tests\\Libs\\GirTest-0.1.Tests\\GirTest-0.1.Tests.csproj",
1414
]
1515
}
16-
}
16+
}

0 commit comments

Comments
 (0)