From af9718620144137b926167a86db0c7fd160675eb Mon Sep 17 00:00:00 2001 From: cra0zy Date: Thu, 18 Jan 2018 18:01:04 +0100 Subject: [PATCH] Reorganize the build system a bit --- CakeScripts/GAssembly.cs | 2 +- Source/GtkSharp.sln | 143 ++++++++++++++++++++++++++++++ Source/Libs/GtkSharp.sln | 116 ------------------------ Source/Libs/{ => Shared}/Gapi.xsd | 0 Source/Samples/Samples.csproj | 6 ++ build.cake | 4 +- 6 files changed, 152 insertions(+), 119 deletions(-) create mode 100644 Source/GtkSharp.sln delete mode 100755 Source/Libs/GtkSharp.sln rename Source/Libs/{ => Shared}/Gapi.xsd (100%) diff --git a/CakeScripts/GAssembly.cs b/CakeScripts/GAssembly.cs index f8c667301..49474e552 100755 --- a/CakeScripts/GAssembly.cs +++ b/CakeScripts/GAssembly.cs @@ -62,7 +62,7 @@ public class GAssembly // Generate code Cake.DotNetCoreExecute("BuildOutput/Tools/GapiCodegen.dll", "--outdir=" + GDir + " " + - "--schema=Source/Libs/Gapi.xsd " + + "--schema=Source/Libs/Shared/Gapi.xsd " + extraargs + " " + "--assembly-name=" + Name + " " + "--generate=" + tempapi diff --git a/Source/GtkSharp.sln b/Source/GtkSharp.sln new file mode 100644 index 000000000..aa8869906 --- /dev/null +++ b/Source/GtkSharp.sln @@ -0,0 +1,143 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio 15 +VisualStudioVersion = 15.0.26124.0 +MinimumVisualStudioVersion = 15.0.26124.0 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Libs", "Libs", "{CCEA1235-D75F-4919-83F6-16793B11BEF5}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GLibSharp", "Libs\GLibSharp\GLibSharp.csproj", "{B29673A7-EBEA-41F4-9F22-D72B333042A2}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PangoSharp", "Libs\PangoSharp\PangoSharp.csproj", "{D3E99527-1FEC-4DC7-8083-85E7C338E287}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CairoSharp", "Libs\CairoSharp\CairoSharp.csproj", "{92C67E4C-8FDE-463B-BEB9-CB09970887DD}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "AtkSharp", "Libs\AtkSharp\AtkSharp.csproj", "{12A721AA-8E7F-459A-A62D-F7372350E5F1}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GdkSharp", "Libs\GdkSharp\GdkSharp.csproj", "{E6D83259-6389-4768-B0A0-A649892DFE62}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GioSharp", "Libs\GioSharp\GioSharp.csproj", "{B4B26375-BED5-4000-A38F-899FF1672B47}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GtkSharp", "Libs\GtkSharp\GtkSharp.csproj", "{04597E0B-375D-4E08-A16C-EE5FF3937B73}" +EndProject +Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Samples", "Samples\Samples.csproj", "{A5667C9B-5D29-4FB6-B548-D1317A2CEF90}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Debug|x64 = Debug|x64 + Debug|x86 = Debug|x86 + Release|Any CPU = Release|Any CPU + Release|x64 = Release|x64 + Release|x86 = Release|x86 + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Debug|x64.ActiveCfg = Debug|x64 + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Debug|x64.Build.0 = Debug|x64 + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Debug|x86.ActiveCfg = Debug|x86 + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Debug|x86.Build.0 = Debug|x86 + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Release|Any CPU.Build.0 = Release|Any CPU + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Release|x64.ActiveCfg = Release|x64 + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Release|x64.Build.0 = Release|x64 + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Release|x86.ActiveCfg = Release|x86 + {B29673A7-EBEA-41F4-9F22-D72B333042A2}.Release|x86.Build.0 = Release|x86 + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Debug|x64.ActiveCfg = Debug|x64 + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Debug|x64.Build.0 = Debug|x64 + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Debug|x86.ActiveCfg = Debug|x86 + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Debug|x86.Build.0 = Debug|x86 + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Release|Any CPU.Build.0 = Release|Any CPU + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Release|x64.ActiveCfg = Release|x64 + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Release|x64.Build.0 = Release|x64 + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Release|x86.ActiveCfg = Release|x86 + {D3E99527-1FEC-4DC7-8083-85E7C338E287}.Release|x86.Build.0 = Release|x86 + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Debug|Any CPU.Build.0 = Debug|Any CPU + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Debug|x64.ActiveCfg = Debug|x64 + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Debug|x64.Build.0 = Debug|x64 + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Debug|x86.ActiveCfg = Debug|x86 + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Debug|x86.Build.0 = Debug|x86 + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Release|Any CPU.ActiveCfg = Release|Any CPU + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Release|Any CPU.Build.0 = Release|Any CPU + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Release|x64.ActiveCfg = Release|x64 + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Release|x64.Build.0 = Release|x64 + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Release|x86.ActiveCfg = Release|x86 + {92C67E4C-8FDE-463B-BEB9-CB09970887DD}.Release|x86.Build.0 = Release|x86 + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Debug|x64.ActiveCfg = Debug|x64 + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Debug|x64.Build.0 = Debug|x64 + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Debug|x86.ActiveCfg = Debug|x86 + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Debug|x86.Build.0 = Debug|x86 + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Release|Any CPU.Build.0 = Release|Any CPU + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Release|x64.ActiveCfg = Release|x64 + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Release|x64.Build.0 = Release|x64 + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Release|x86.ActiveCfg = Release|x86 + {12A721AA-8E7F-459A-A62D-F7372350E5F1}.Release|x86.Build.0 = Release|x86 + {E6D83259-6389-4768-B0A0-A649892DFE62}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {E6D83259-6389-4768-B0A0-A649892DFE62}.Debug|Any CPU.Build.0 = Debug|Any CPU + {E6D83259-6389-4768-B0A0-A649892DFE62}.Debug|x64.ActiveCfg = Debug|x64 + {E6D83259-6389-4768-B0A0-A649892DFE62}.Debug|x64.Build.0 = Debug|x64 + {E6D83259-6389-4768-B0A0-A649892DFE62}.Debug|x86.ActiveCfg = Debug|x86 + {E6D83259-6389-4768-B0A0-A649892DFE62}.Debug|x86.Build.0 = Debug|x86 + {E6D83259-6389-4768-B0A0-A649892DFE62}.Release|Any CPU.ActiveCfg = Release|Any CPU + {E6D83259-6389-4768-B0A0-A649892DFE62}.Release|Any CPU.Build.0 = Release|Any CPU + {E6D83259-6389-4768-B0A0-A649892DFE62}.Release|x64.ActiveCfg = Release|x64 + {E6D83259-6389-4768-B0A0-A649892DFE62}.Release|x64.Build.0 = Release|x64 + {E6D83259-6389-4768-B0A0-A649892DFE62}.Release|x86.ActiveCfg = Release|x86 + {E6D83259-6389-4768-B0A0-A649892DFE62}.Release|x86.Build.0 = Release|x86 + {B4B26375-BED5-4000-A38F-899FF1672B47}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {B4B26375-BED5-4000-A38F-899FF1672B47}.Debug|Any CPU.Build.0 = Debug|Any CPU + {B4B26375-BED5-4000-A38F-899FF1672B47}.Debug|x64.ActiveCfg = Debug|x64 + {B4B26375-BED5-4000-A38F-899FF1672B47}.Debug|x64.Build.0 = Debug|x64 + {B4B26375-BED5-4000-A38F-899FF1672B47}.Debug|x86.ActiveCfg = Debug|x86 + {B4B26375-BED5-4000-A38F-899FF1672B47}.Debug|x86.Build.0 = Debug|x86 + {B4B26375-BED5-4000-A38F-899FF1672B47}.Release|Any CPU.ActiveCfg = Release|Any CPU + {B4B26375-BED5-4000-A38F-899FF1672B47}.Release|Any CPU.Build.0 = Release|Any CPU + {B4B26375-BED5-4000-A38F-899FF1672B47}.Release|x64.ActiveCfg = Release|x64 + {B4B26375-BED5-4000-A38F-899FF1672B47}.Release|x64.Build.0 = Release|x64 + {B4B26375-BED5-4000-A38F-899FF1672B47}.Release|x86.ActiveCfg = Release|x86 + {B4B26375-BED5-4000-A38F-899FF1672B47}.Release|x86.Build.0 = Release|x86 + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Debug|Any CPU.Build.0 = Debug|Any CPU + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Debug|x64.ActiveCfg = Debug|x64 + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Debug|x64.Build.0 = Debug|x64 + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Debug|x86.ActiveCfg = Debug|x86 + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Debug|x86.Build.0 = Debug|x86 + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Release|Any CPU.ActiveCfg = Release|Any CPU + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Release|Any CPU.Build.0 = Release|Any CPU + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Release|x64.ActiveCfg = Release|x64 + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Release|x64.Build.0 = Release|x64 + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Release|x86.ActiveCfg = Release|x86 + {04597E0B-375D-4E08-A16C-EE5FF3937B73}.Release|x86.Build.0 = Release|x86 + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Debug|Any CPU.Build.0 = Debug|Any CPU + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Debug|x64.ActiveCfg = Debug|x64 + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Debug|x64.Build.0 = Debug|x64 + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Debug|x86.ActiveCfg = Debug|x86 + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Debug|x86.Build.0 = Debug|x86 + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Release|Any CPU.ActiveCfg = Release|Any CPU + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Release|Any CPU.Build.0 = Release|Any CPU + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Release|x64.ActiveCfg = Release|x64 + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Release|x64.Build.0 = Release|x64 + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Release|x86.ActiveCfg = Release|x86 + {A5667C9B-5D29-4FB6-B548-D1317A2CEF90}.Release|x86.Build.0 = Release|x86 + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {B29673A7-EBEA-41F4-9F22-D72B333042A2} = {CCEA1235-D75F-4919-83F6-16793B11BEF5} + {D3E99527-1FEC-4DC7-8083-85E7C338E287} = {CCEA1235-D75F-4919-83F6-16793B11BEF5} + {92C67E4C-8FDE-463B-BEB9-CB09970887DD} = {CCEA1235-D75F-4919-83F6-16793B11BEF5} + {12A721AA-8E7F-459A-A62D-F7372350E5F1} = {CCEA1235-D75F-4919-83F6-16793B11BEF5} + {E6D83259-6389-4768-B0A0-A649892DFE62} = {CCEA1235-D75F-4919-83F6-16793B11BEF5} + {B4B26375-BED5-4000-A38F-899FF1672B47} = {CCEA1235-D75F-4919-83F6-16793B11BEF5} + {04597E0B-375D-4E08-A16C-EE5FF3937B73} = {CCEA1235-D75F-4919-83F6-16793B11BEF5} + EndGlobalSection +EndGlobal diff --git a/Source/Libs/GtkSharp.sln b/Source/Libs/GtkSharp.sln deleted file mode 100755 index 667b753ba..000000000 --- a/Source/Libs/GtkSharp.sln +++ /dev/null @@ -1,116 +0,0 @@ - -Microsoft Visual Studio Solution File, Format Version 12.00 -# Visual Studio 15 -VisualStudioVersion = 15.0.26124.0 -MinimumVisualStudioVersion = 15.0.26124.0 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GLibSharp", "GLibSharp\GLibSharp.csproj", "{97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GioSharp", "GioSharp\GioSharp.csproj", "{25C49839-7DA6-45BA-849A-C6D4B8FAFA31}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CairoSharp", "CairoSharp\CairoSharp.csproj", "{23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PangoSharp", "PangoSharp\PangoSharp.csproj", "{B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GdkSharp", "GdkSharp\GdkSharp.csproj", "{9596DD67-45E2-4A38-AF3A-B8314172FC89}" -EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "GtkSharp", "GtkSharp\GtkSharp.csproj", "{1EB02885-8190-4A5D-B9EE-CD14E6EA149B}" -EndProject -Global - GlobalSection(SolutionConfigurationPlatforms) = preSolution - Debug|Any CPU = Debug|Any CPU - Debug|x64 = Debug|x64 - Debug|x86 = Debug|x86 - Release|Any CPU = Release|Any CPU - Release|x64 = Release|x64 - Release|x86 = Release|x86 - EndGlobalSection - GlobalSection(SolutionProperties) = preSolution - HideSolutionNode = FALSE - EndGlobalSection - GlobalSection(ProjectConfigurationPlatforms) = postSolution - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Debug|x64.ActiveCfg = Debug|x64 - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Debug|x64.Build.0 = Debug|x64 - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Debug|x86.ActiveCfg = Debug|x86 - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Debug|x86.Build.0 = Debug|x86 - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Release|Any CPU.Build.0 = Release|Any CPU - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Release|x64.ActiveCfg = Release|x64 - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Release|x64.Build.0 = Release|x64 - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Release|x86.ActiveCfg = Release|x86 - {97C0501F-39DC-47D1-834A-7A8BE1D7DDE1}.Release|x86.Build.0 = Release|x86 - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Debug|Any CPU.Build.0 = Debug|Any CPU - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Debug|x64.ActiveCfg = Debug|x64 - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Debug|x64.Build.0 = Debug|x64 - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Debug|x86.ActiveCfg = Debug|x86 - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Debug|x86.Build.0 = Debug|x86 - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Release|Any CPU.ActiveCfg = Release|Any CPU - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Release|Any CPU.Build.0 = Release|Any CPU - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Release|x64.ActiveCfg = Release|x64 - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Release|x64.Build.0 = Release|x64 - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Release|x86.ActiveCfg = Release|x86 - {25C49839-7DA6-45BA-849A-C6D4B8FAFA31}.Release|x86.Build.0 = Release|x86 - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Debug|Any CPU.Build.0 = Debug|Any CPU - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Debug|x64.ActiveCfg = Debug|x64 - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Debug|x64.Build.0 = Debug|x64 - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Debug|x86.ActiveCfg = Debug|x86 - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Debug|x86.Build.0 = Debug|x86 - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Release|Any CPU.ActiveCfg = Release|Any CPU - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Release|Any CPU.Build.0 = Release|Any CPU - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Release|x64.ActiveCfg = Release|x64 - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Release|x64.Build.0 = Release|x64 - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Release|x86.ActiveCfg = Release|x86 - {23BB5F1B-2E85-4DF8-AC51-8018DDB8DE0E}.Release|x86.Build.0 = Release|x86 - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Debug|Any CPU.Build.0 = Debug|Any CPU - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Debug|x64.ActiveCfg = Debug|x64 - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Debug|x64.Build.0 = Debug|x64 - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Debug|x86.ActiveCfg = Debug|x86 - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Debug|x86.Build.0 = Debug|x86 - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Release|Any CPU.ActiveCfg = Release|Any CPU - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Release|Any CPU.Build.0 = Release|Any CPU - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Release|x64.ActiveCfg = Release|x64 - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Release|x64.Build.0 = Release|x64 - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Release|x86.ActiveCfg = Release|x86 - {B7A3467A-DFF6-4089-B78A-E13B3D11FDAD}.Release|x86.Build.0 = Release|x86 - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Debug|Any CPU.Build.0 = Debug|Any CPU - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Debug|x64.ActiveCfg = Debug|x64 - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Debug|x64.Build.0 = Debug|x64 - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Debug|x86.ActiveCfg = Debug|x86 - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Debug|x86.Build.0 = Debug|x86 - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Release|Any CPU.ActiveCfg = Release|Any CPU - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Release|Any CPU.Build.0 = Release|Any CPU - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Release|x64.ActiveCfg = Release|x64 - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Release|x64.Build.0 = Release|x64 - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Release|x86.ActiveCfg = Release|x86 - {9596DD67-45E2-4A38-AF3A-B8314172FC89}.Release|x86.Build.0 = Release|x86 - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Debug|Any CPU.Build.0 = Debug|Any CPU - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Debug|x64.ActiveCfg = Debug|x64 - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Debug|x64.Build.0 = Debug|x64 - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Debug|x86.ActiveCfg = Debug|x86 - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Debug|x86.Build.0 = Debug|x86 - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Release|Any CPU.ActiveCfg = Release|Any CPU - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Release|Any CPU.Build.0 = Release|Any CPU - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Release|x64.ActiveCfg = Release|x64 - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Release|x64.Build.0 = Release|x64 - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Release|x86.ActiveCfg = Release|x86 - {1EB02885-8190-4A5D-B9EE-CD14E6EA149B}.Release|x86.Build.0 = Release|x86 - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Debug|Any CPU.Build.0 = Debug|Any CPU - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Debug|x64.ActiveCfg = Debug|x64 - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Debug|x64.Build.0 = Debug|x64 - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Debug|x86.ActiveCfg = Debug|x86 - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Debug|x86.Build.0 = Debug|x86 - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Release|Any CPU.ActiveCfg = Release|Any CPU - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Release|Any CPU.Build.0 = Release|Any CPU - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Release|x64.ActiveCfg = Release|x64 - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Release|x64.Build.0 = Release|x64 - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Release|x86.ActiveCfg = Release|x86 - {F8E204DC-9221-4D55-91CC-962DBEF09C6D}.Release|x86.Build.0 = Release|x86 - EndGlobalSection -EndGlobal diff --git a/Source/Libs/Gapi.xsd b/Source/Libs/Shared/Gapi.xsd similarity index 100% rename from Source/Libs/Gapi.xsd rename to Source/Libs/Shared/Gapi.xsd diff --git a/Source/Samples/Samples.csproj b/Source/Samples/Samples.csproj index 33aa99279..992c8a307 100644 --- a/Source/Samples/Samples.csproj +++ b/Source/Samples/Samples.csproj @@ -12,6 +12,12 @@ + + + + + + diff --git a/build.cake b/build.cake index 29e95e789..c488bc0da 100755 --- a/build.cake +++ b/build.cake @@ -44,7 +44,7 @@ Task("Prepare") // Generate code and prepare libs projects foreach(var gassembly in list) gassembly.Prepare(); - DotNetCoreRestore("Source/Libs/GtkSharp.sln"); + DotNetCoreRestore("Source/GtkSharp.sln"); }); Task("Clean") @@ -73,7 +73,7 @@ Task("Build") }; if (list.Count == Settings.AssemblyList.Count) - DotNetCoreBuild("Source/Libs/GtkSharp.sln", settings); + DotNetCoreBuild("Source/GtkSharp.sln", settings); else { foreach(var gassembly in list)