Merge pull request #998 from gircore/solution-folder-separator

Update GirCore.sln
gircore · Jan 13, 2024 · ce3bceb · ce3bceb
2 parents 8847a1d + 8908c58
commit ce3bceb
Show file tree

Hide file tree

Showing 5 changed files with 171 additions and 161 deletions.
diff --git a/src/Generation/GirTool/GenerateCommand.cs b/src/Generation/GirTool/GenerateCommand.cs
@@ -39,9 +39,6 @@ private void Execute(string[] input, string output, string? searchPathLinux, str
         }
         catch (Exception ex)
         {
-            if (ex.StackTrace is not null)
-                Log.Debug(ex.StackTrace);
-
             Log.Exception(ex);
             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");
             invocationContext.ExitCode = 1;

diff --git a/src/Generation/Shared/Log.cs b/src/Generation/Shared/Log.cs
@@ -35,7 +35,7 @@ public static void EnableVerboseOutput()
         => Switch.MinimumLevel = LogEventLevel.Verbose;
 
     public static void Exception(Exception exception)
-        => Logger.Error("Exception occured: {$exception}", exception.Message);
+        => Logger.Error(exception, "Exception occured: {$exception}", exception.Message);
 
     public static void Error(string message)
         => Logger.Error(message);

diff --git a/src/GirCore.Libs.slnf b/src/GirCore.Libs.slnf
@@ -2,55 +2,55 @@
   "solution": {
     "path": "GirCore.sln",
     "projects": [
-      "Generation/Generator/Generator.csproj",
-      "Generation/GirLoader/GirLoader.csproj",
-      "Generation/GirModel/GirModel.csproj",
-      "Generation/GirTool/GirTool.csproj",
-      "Extensions/Integration/Integration.csproj",
-      "Libs/Adw-1/Adw-1.csproj",
-      "Libs/cairo-1.0/cairo-1.0.csproj",
-      "Libs/freetype2-2.0/freetype2-2.0.csproj",
-      "Libs/Gdk-4.0/Gdk-4.0.csproj",
-      "Libs/GdkPixbuf-2.0/GdkPixbuf-2.0.csproj",
-      "Libs/Gio-2.0/Gio-2.0.csproj",
-      "Libs/GLib-2.0/GLib-2.0.csproj",
-      "Libs/GObject-2.0/GObject-2.0.csproj",
-      "Libs/Graphene-1.0/Graphene-1.0.csproj",
-      "Libs/Gsk-4.0/Gsk-4.0.csproj",
-      "Libs/Gst-1.0/Gst-1.0.csproj",
-      "Libs/GstAudio-1.0/GstAudio-1.0.csproj",
-      "Libs/GstBase-1.0/GstBase-1.0.csproj",
-      "Libs/GstPbutils-1.0/GstPbutils-1.0.csproj",
-      "Libs/GstVideo-1.0/GstVideo-1.0.csproj",
-      "Libs/Gtk-4.0/Gtk-4.0.csproj",
-      "Libs/GtkSource-5/GtkSource-5.csproj",
-      "Libs/HarfBuzz-0.0/HarfBuzz-0.0.csproj",
-      "Libs/Pango-1.0/Pango-1.0.csproj",
-      "Libs/PangoCairo-1.0/PangoCairo-1.0.csproj",
-      "Libs/Soup-3.0/Soup-3.0.csproj",
-      "Libs/WebKit-6.0/WebKit-6.0.csproj",
-      "Libs/WebKitWebProcessExtension-6.0/WebKitWebProcessExtension-6.0.csproj",
-      "Libs/JavaScriptCore-6.0/JavaScriptCore-6.0.csproj",
-      "Samples/Adw-1/Window/Window.csproj",
-      "Samples/GdkPixbuf-2.0/TestLoading/TestLoading.csproj",
-      "Samples/GdkPixbuf-2.0/TestMemoryLeaks/TestMemoryLeaks.csproj",
-      "Samples/Gio-2.0/DBusNotification/DBusNotification.csproj",
-      "Samples/Gst-1.0/VideoPlayback/VideoPlayback.csproj",
-      "Samples/Gtk-4.0/AboutDialog/AboutDialog.csproj",
-      "Samples/Gtk-4.0/Builder/Builder.csproj",
-      "Samples/Gtk-4.0/DrawingArea/DrawingArea.csproj",
-      "Samples/Gtk-4.0/FontDialog/FontDialog.csproj",
-      "Samples/Gtk-4.0/Window/Window.csproj",
-      "Samples/GtkSource-5/GtkSourceView/GtkSourceView.csproj",
-      "Samples/WebKit-6.0/JavascriptCall/JavascriptCall.csproj",
-      "Samples/WebKit-6.0/JavascriptCallback/JavascriptCallback.csproj",
-      "Tests/Generation/GirLoader.Tests/GirLoader.Tests.csproj",
-      "Tests/Libs/Cairo-1.0.Tests/Cairo-1.0.Tests.csproj",
-      "Tests/Libs/GdkPixbuf-2.0.Tests/GdkPixbuf-2.0.Tests.csproj",
-      "Tests/Libs/Gio-2.0.Tests/Gio-2.0.Tests.csproj",
-      "Tests/Libs/GLib-2.0.Tests/GLib-2.0.Tests.csproj",
-      "Tests/Libs/GObject-2.0.Tests/GObject-2.0.Tests.csproj",
-      "Tests/Libs/Gtk-4.0.Tests/Gtk-4.0.Tests.csproj",
+      "Generation\\Generator\\Generator.csproj",
+      "Generation\\GirLoader\\GirLoader.csproj",
+      "Generation\\GirModel\\GirModel.csproj",
+      "Generation\\GirTool\\GirTool.csproj",
+      "Extensions\\Integration\\Integration.csproj",
+      "Libs\\Adw-1\\Adw-1.csproj",
+      "Libs\\cairo-1.0\\cairo-1.0.csproj",
+      "Libs\\freetype2-2.0\\freetype2-2.0.csproj",
+      "Libs\\Gdk-4.0\\Gdk-4.0.csproj",
+      "Libs\\GdkPixbuf-2.0\\GdkPixbuf-2.0.csproj",
+      "Libs\\Gio-2.0\\Gio-2.0.csproj",
+      "Libs\\GLib-2.0\\GLib-2.0.csproj",
+      "Libs\\GObject-2.0\\GObject-2.0.csproj",
+      "Libs\\Graphene-1.0\\Graphene-1.0.csproj",
+      "Libs\\Gsk-4.0\\Gsk-4.0.csproj",
+      "Libs\\Gst-1.0\\Gst-1.0.csproj",
+      "Libs\\GstAudio-1.0\\GstAudio-1.0.csproj",
+      "Libs\\GstBase-1.0\\GstBase-1.0.csproj",
+      "Libs\\GstPbutils-1.0\\GstPbutils-1.0.csproj",
+      "Libs\\GstVideo-1.0\\GstVideo-1.0.csproj",
+      "Libs\\Gtk-4.0\\Gtk-4.0.csproj",
+      "Libs\\GtkSource-5\\GtkSource-5.csproj",
+      "Libs\\HarfBuzz-0.0\\HarfBuzz-0.0.csproj",
+      "Libs\\Pango-1.0\\Pango-1.0.csproj",
+      "Libs\\PangoCairo-1.0\\PangoCairo-1.0.csproj",
+      "Libs\\Soup-3.0\\Soup-3.0.csproj",
+      "Libs\\WebKit-6.0\\WebKit-6.0.csproj",
+      "Libs\\WebKitWebProcessExtension-6.0\\WebKitWebProcessExtension-6.0.csproj",
+      "Libs\\JavaScriptCore-6.0\\JavaScriptCore-6.0.csproj",
+      "Samples\\Adw-1\\Window\\Window.csproj",
+      "Samples\\GdkPixbuf-2.0\\TestLoading\\TestLoading.csproj",
+      "Samples\\GdkPixbuf-2.0\\TestMemoryLeaks\\TestMemoryLeaks.csproj",
+      "Samples\\Gio-2.0\\DBusNotification\\DBusNotification.csproj",
+      "Samples\\Gst-1.0\\VideoPlayback\\VideoPlayback.csproj",
+      "Samples\\Gtk-4.0\\AboutDialog\\AboutDialog.csproj",
+      "Samples\\Gtk-4.0\\Builder\\Builder.csproj",
+      "Samples\\Gtk-4.0\\DrawingArea\\DrawingArea.csproj",
+      "Samples\\Gtk-4.0\\FontDialog\\FontDialog.csproj",
+      "Samples\\Gtk-4.0\\Window\\Window.csproj",
+      "Samples\\GtkSource-5\\GtkSourceView\\GtkSourceView.csproj",
+      "Samples\\WebKit-6.0\\JavascriptCall\\JavascriptCall.csproj",
+      "Samples\\WebKit-6.0\\JavascriptCallback\\JavascriptCallback.csproj",
+      "Tests\\Generation\\GirLoader.Tests\\GirLoader.Tests.csproj",
+      "Tests\\Libs\\Cairo-1.0.Tests\\Cairo-1.0.Tests.csproj",
+      "Tests\\Libs\\GdkPixbuf-2.0.Tests\\GdkPixbuf-2.0.Tests.csproj",
+      "Tests\\Libs\\Gio-2.0.Tests\\Gio-2.0.Tests.csproj",
+      "Tests\\Libs\\GLib-2.0.Tests\\GLib-2.0.Tests.csproj",
+      "Tests\\Libs\\GObject-2.0.Tests\\GObject-2.0.Tests.csproj",
+      "Tests\\Libs\\Gtk-4.0.Tests\\Gtk-4.0.Tests.csproj",
     ]
   }
-}
+}
diff --git a/src/GirCore.TestLib.slnf b/src/GirCore.TestLib.slnf
@@ -2,15 +2,15 @@
   "solution": {
     "path": "GirCore.sln",
     "projects": [
-      "Generation/Generator/Generator.csproj",
-      "Generation/GirLoader/GirLoader.csproj",
-      "Generation/GirModel/GirModel.csproj",
-      "Generation/GirTool/GirTool.csproj",
-      "Libs/GirTest-0.1/GirTest-0.1.csproj",
-      "Libs/GLib-2.0/GLib-2.0.csproj",
-      "Libs/GObject-2.0/GObject-2.0.csproj",
-      "Tests/Generation/GirLoader.Tests/GirLoader.Tests.csproj",
-      "Tests/Libs/GirTest-0.1.Tests/GirTest-0.1.Tests.csproj",
+      "Generation\\Generator\\Generator.csproj",
+      "Generation\\GirLoader\\GirLoader.csproj",
+      "Generation\\GirModel\\GirModel.csproj",
+      "Generation\\GirTool\\GirTool.csproj",
+      "Libs\\GirTest-0.1\\GirTest-0.1.csproj",
+      "Libs\\GLib-2.0\\GLib-2.0.csproj",
+      "Libs\\GObject-2.0\\GObject-2.0.csproj",
+      "Tests\\Generation\\GirLoader.Tests\\GirLoader.Tests.csproj",
+      "Tests\\Libs\\GirTest-0.1.Tests\\GirTest-0.1.Tests.csproj",
     ]
   }
-}
+}