Move GirTool, Integration folders and props files

.github/dependabot.yml

@@ -5,13 +5,13 @@ updates:
     schedule:
       interval: "daily"
   - package-ecosystem: "nuget"
-    directory: "/src/Integration"
+    directory: "/src/Extensions/Integration"
     schedule:
       interval: "daily"
 
   # This traces the dependencies through the dependency chain:
   # Generator3, GirModel, GirLoader
   - package-ecosystem: "nuget"
-    directory: "/src/GirTool"
+    directory: "/src/Generation/GirTool"
     schedule:
       interval: "daily"

readme.md

@@ -58,18 +58,18 @@ For more advanced build options, see the [documentation](docs/docs/build.md).
 
 ## Code structure
 The folder structure in this repository is organized as follows:
-* **[src/GirTool](src/GirTool):** The tool to generate the bindings.
+* **[src/Generation/GirTool](src/Generation/GirTool):** The tool to generate the bindings.
 * **[src/Generation/GirLoader](src/Generation/GirLoader):** A library for reading and resolving GObject Introspection repositories.
 * **[src/Generation/GirModel](src/Generation/GirModel):** An interface based definition of the GObject data model. Used by the loader and generator to have a common understanding of the GObject data model.
 * **[src/Generation/Generator](src/Generation/Generator):** Code generator generates C# code from GObject Introspection data.
-* **[src/Integration](src/Integration):** Optional source generators to reduce boilerplate code in your projects.
+* **[src/Extensions/Integration](src/Extensions/Integration):** Optional source generators to reduce boilerplate code in your projects.
 * **[src/Libs](src/Libs):** Contains manually written code for libraries. The generator outputs code here.
 * **[src/Samples](src/Samples):** Example programs using GTK, GStreamer, and others.
 * **[src/Extensions](src/Extensions):** Auxilary libraries which extend the core libraries.
 * **[src/Tests](src/Tests):** Unit and Integration tests.
 * **[ext/gir-files](https://github.com/gircore/gir-files):** Introspection data from [gircore/gir-files](https://github.com/gircore/gir-files).
 
-The code in the library folder is not complete because most of the code is generated when the [GirTool](src/GirTool) is run.
+The code in the library folder is not complete because most of the code is generated when the [GirTool](src/Generation/GirTool) is run.
 
 [gi]: https://gi.readthedocs.io/
 [gstreamer]: https://gstreamer.freedesktop.org/

src/CleanLibs.fsx

@@ -1,4 +1,4 @@
 #r "nuget: SimpleExec, 8.0.0"
 open SimpleExec
 
-Command.Run("dotnet", "run --project GirTool/GirTool.csproj -- clean Libs")
+Command.Run("dotnet", "run --project Generation/GirTool/GirTool.csproj -- clean Libs")

src/Extensions/Directory.Build.props

@@ -1,4 +1,4 @@
 <Project>
-  <Import Project="../GirCore.Libraries.props" />
-  <Import Project="../GirCore.Publishing.props" />
+  <Import Project="../Properties/GirCore.Libraries.props" />
+  <Import Project="../Properties/GirCore.Publishing.props" />
 </Project>

src/Integration/Integration.csproj → src/Extensions/Integration/Integration.csproj

@@ -1,8 +1,4 @@
 <Project Sdk="Microsoft.NET.Sdk">
-
-  <Import Project="../GirCore.Libraries.props" />
-  <Import Project="../GirCore.Publishing.props" />
-
   <PropertyGroup>
     <IncludeBuildOutput>false</IncludeBuildOutput>
     <PackageScribanIncludeSource>true</PackageScribanIncludeSource>

src/GenerateLibs.fsx

@@ -41,7 +41,7 @@ let mutable exitCode = 0
 
 Command.Run(
     name = "dotnet",
-    args = $"run --project ../../src/GirTool/GirTool.csproj -- generate {girFiles} --output ../../src/Libs --search-path-linux linux --search-path-macos macos --search-path-windows windows --log-level Debug",
+    args = $"run --project ../../src/Generation/GirTool/GirTool.csproj -- generate {girFiles} --output ../../src/Libs --search-path-linux linux --search-path-macos macos --search-path-windows windows --log-level Debug",
     workingDirectory = "../ext/gir-files",
     handleExitCode = fun result ->
         exitCode <- result

src/Generation/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
-  <Import Project="../GirCore.Tooling.props" />
-  <Import Project="../GirCore.Logging.props" />
+  <Import Project="../Properties/GirCore.Tooling.props" />
+  <Import Project="../Properties/GirCore.Logging.props" />
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>

src/Generation/GirTool/GirTool.csproj

@@ -0,0 +1,12 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <OutputType>Exe</OutputType>
+    <IsPackable>false</IsPackable>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="System.CommandLine" Version="2.0.0-beta4.22272.1" />
+    <ProjectReference Include="../Generator/Generator.csproj" />
+    <ProjectReference Include="../GirLoader/GirLoader.csproj" />
+  </ItemGroup>
+</Project>

src/GirCore.Libs.slnf

@@ -5,8 +5,8 @@
       "Generation/Generator/Generator.csproj",
       "Generation/GirLoader/GirLoader.csproj",
       "Generation/GirModel/GirModel.csproj",
-      "GirTool/GirTool.csproj",
-      "Integration/Integration.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",
@@ -41,6 +41,7 @@
       "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",
@@ -52,4 +53,4 @@
       "Tests/Libs/Gtk-4.0.Tests/Gtk-4.0.Tests.csproj",
     ]
   }
-}
+}

src/GirCore.TestLib.slnf

@@ -5,12 +5,12 @@
       "Generation/Generator/Generator.csproj",
       "Generation/GirLoader/GirLoader.csproj",
       "Generation/GirModel/GirModel.csproj",
-      "GirTool/GirTool.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",
     ]
   }
-}
+}

src/GirCore.sln

@@ -1,5 +1,4 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
+Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.26124.0
 MinimumVisualStudioVersion = 15.0.26124.0
@@ -39,8 +38,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GstPbutils-1.0", "Libs/GstP
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GstBase-1.0", "Libs/GstBase-1.0/GstBase-1.0.csproj", "{8678914B-C262-4EFB-BCC0-96A15D969C2B}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Integration", "Integration/Integration.csproj", "{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}"
-EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{8BC11A63-D52B-40CB-9DDD-CD7C6DC21059}"
 	ProjectSection(SolutionItems) = preProject
 		Tests/Directory.Build.props = Tests/Directory.Build.props
@@ -73,17 +70,12 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GirLoader", "Generation/Gir
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "SolutionItems", "SolutionItems", "{B670D679-3B2C-43E8-9F87-5E4E17628011}"
 	ProjectSection(SolutionItems) = preProject
-		GirCore.Publishing.props = GirCore.Publishing.props
 		../.editorconfig = ../.editorconfig
 		../.gitignore = ../.gitignore
-		GirCore.Logging.props = GirCore.Logging.props
-		GirCore.Testing.props = GirCore.Testing.props
 		CleanLibs.fsx = CleanLibs.fsx
 		GenerateLibs.fsx = GenerateLibs.fsx
 		NugetReadme.md = NugetReadme.md
 		../readme.md = ../readme.md
-		GirCore.Tooling.props = GirCore.Tooling.props
-		GirCore.Libraries.props = GirCore.Libraries.props
 		GenerateGirTestLib.fsx = GenerateGirTestLib.fsx
 	EndProjectSection
 EndProject
@@ -123,8 +115,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GirModel", "Generation/GirM
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Generator", "Generation/Generator/Generator.csproj", "{6222D769-0F81-490C-B8BD-B0E2D295D97A}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GirTool", "GirTool/GirTool.csproj", "{438717C4-F16C-40F5-9537-90554700C6E7}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gdk-4.0", "Libs/Gdk-4.0/Gdk-4.0.csproj", "{0E47FC0B-FD9B-4F8F-887C-953062CDACBA}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PangoCairo-1.0", "Libs/PangoCairo-1.0/PangoCairo-1.0.csproj", "{D0634971-C783-4D5C-AABC-11D9A73793D1}"
@@ -212,7 +202,20 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "actions", "actions", "{A860
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "create", "create", "{C095C48D-7B27-47D5-9472-ACFB5A188099}"
 	ProjectSection(SolutionItems) = preProject
-		..\.github\actions\create\action.yml = ..\.github\actions\create\action.yml
+		../.github/actions/create/action.yml = ../.github/actions/create/action.yml
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Integration", "Extensions/Integration/Integration.csproj", "{A3B33B42-BCA3-4AE5-935C-50E0151B2325}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GirTool", "Generation/GirTool/GirTool.csproj", "{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Properties", "Properties", "{BE2159DE-B264-4C71-9B52-94C5C956F76A}"
+	ProjectSection(SolutionItems) = preProject
+		Properties/GirCore.Libraries.props = Properties/GirCore.Libraries.props
+		Properties/GirCore.Logging.props = Properties/GirCore.Logging.props
+		Properties/GirCore.Publishing.props = Properties/GirCore.Publishing.props
+		Properties/GirCore.Testing.props = Properties/GirCore.Testing.props
+		Properties/GirCore.Tooling.props = Properties/GirCore.Tooling.props
 	EndProjectSection
 EndProject
 Global
@@ -384,18 +387,6 @@ Global
 		{8678914B-C262-4EFB-BCC0-96A15D969C2B}.Release|x64.Build.0 = Release|Any CPU
 		{8678914B-C262-4EFB-BCC0-96A15D969C2B}.Release|x86.ActiveCfg = Release|Any CPU
 		{8678914B-C262-4EFB-BCC0-96A15D969C2B}.Release|x86.Build.0 = Release|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Debug|x64.Build.0 = Debug|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Debug|x86.Build.0 = Debug|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Release|Any CPU.Build.0 = Release|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Release|x64.ActiveCfg = Release|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Release|x64.Build.0 = Release|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Release|x86.ActiveCfg = Release|Any CPU
-		{60AA5BC4-7B82-41D2-A2A0-2235D8B04BBF}.Release|x86.Build.0 = Release|Any CPU
 		{53101A81-CB4A-4589-AEB1-0E229D17AE7A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{53101A81-CB4A-4589-AEB1-0E229D17AE7A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{53101A81-CB4A-4589-AEB1-0E229D17AE7A}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -528,18 +519,6 @@ Global
 		{6222D769-0F81-490C-B8BD-B0E2D295D97A}.Release|x64.Build.0 = Release|Any CPU
 		{6222D769-0F81-490C-B8BD-B0E2D295D97A}.Release|x86.ActiveCfg = Release|Any CPU
 		{6222D769-0F81-490C-B8BD-B0E2D295D97A}.Release|x86.Build.0 = Release|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Debug|x64.Build.0 = Debug|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Debug|x86.Build.0 = Debug|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Release|x64.ActiveCfg = Release|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Release|x64.Build.0 = Release|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Release|x86.ActiveCfg = Release|Any CPU
-		{438717C4-F16C-40F5-9537-90554700C6E7}.Release|x86.Build.0 = Release|Any CPU
 		{0E47FC0B-FD9B-4F8F-887C-953062CDACBA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{0E47FC0B-FD9B-4F8F-887C-953062CDACBA}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{0E47FC0B-FD9B-4F8F-887C-953062CDACBA}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -828,6 +807,30 @@ Global
 		{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Release|x64.Build.0 = Release|Any CPU
 		{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Release|x86.ActiveCfg = Release|Any CPU
 		{9CF39E8D-5543-47E9-A136-A85009FF12C3}.Release|x86.Build.0 = Release|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Debug|x64.Build.0 = Debug|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Debug|x86.Build.0 = Debug|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Release|Any CPU.Build.0 = Release|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Release|x64.ActiveCfg = Release|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Release|x64.Build.0 = Release|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Release|x86.ActiveCfg = Release|Any CPU
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325}.Release|x86.Build.0 = Release|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Debug|x64.Build.0 = Debug|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Debug|x86.Build.0 = Debug|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Release|Any CPU.Build.0 = Release|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Release|x64.ActiveCfg = Release|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Release|x64.Build.0 = Release|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Release|x86.ActiveCfg = Release|Any CPU
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{BF7F9B0B-CB43-4161-BFAD-C6EE479FC86B} = {386AE10F-B7AC-4C97-AC5C-202D3662A868}
@@ -896,5 +899,8 @@ Global
 		{9CF39E8D-5543-47E9-A136-A85009FF12C3} = {825BF602-98A7-45E7-A2C9-9E68160B7DF3}
 		{A8607D28-5605-4833-803F-AB6DC85E8BBD} = {A2ECECDD-9986-450D-A0AC-D2BE32A0B23E}
 		{C095C48D-7B27-47D5-9472-ACFB5A188099} = {A8607D28-5605-4833-803F-AB6DC85E8BBD}
+		{A3B33B42-BCA3-4AE5-935C-50E0151B2325} = {82ACABCF-0CE8-40ED-9402-8499407E846F}
+		{03CEAA82-AEEC-4A6D-B5D9-BF149C0CA0D7} = {7A05C10C-8797-4D29-A97A-F399316BE893}
+		{BE2159DE-B264-4C71-9B52-94C5C956F76A} = {B670D679-3B2C-43E8-9F87-5E4E17628011}
 	EndGlobalSection
-EndGlobal
+EndGlobal

src/Libs/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
-  <Import Project="../GirCore.Libraries.props" />
-  <Import Project="../GirCore.Publishing.props" />
+  <Import Project="../Properties/GirCore.Libraries.props" />
+  <Import Project="../Properties/GirCore.Publishing.props" />
 
   <PropertyGroup Condition="$(GenerateDocumentationFile) == 'True'">
     <NoWarn>1591</NoWarn>

src/Tests/Directory.Build.props

@@ -1,6 +1,6 @@
 <Project>
-  <Import Project="../GirCore.Libraries.props" />
-  <Import Project="../GirCore.Testing.props" />
+  <Import Project="../Properties/GirCore.Libraries.props" />
+  <Import Project="../Properties/GirCore.Testing.props" />
 
   <PropertyGroup>
     <IsPackable>false</IsPackable>