From 42ceb1c0d127d80690b497a782cf4ad0989c327b Mon Sep 17 00:00:00 2001 From: Harry Date: Wed, 26 Jan 2022 13:24:28 +0100 Subject: [PATCH] Multitarget with .net6.0 and .netstandard2.0 (#318) --- Source/Libs/AtkSharp/AtkSharp.csproj | 25 ++++------- Source/Libs/CairoSharp/CairoSharp.csproj | 14 ++----- Source/Libs/Directory.Build.props | 9 ++++ Source/Libs/GLibSharp/GLibSharp.csproj | 14 ++----- Source/Libs/GdkSharp/GdkSharp.csproj | 25 ++++------- Source/Libs/GioSharp/GioSharp.csproj | 25 ++++------- Source/Libs/GtkSharp/GtkSharp.csproj | 23 +++-------- .../Libs/GtkSourceSharp/GtkSourceSharp.csproj | 15 ++----- Source/Libs/PangoSharp/PangoSharp.csproj | 25 ++++------- .../Libs/WebkitGtkSharp/WebkitGtkSharp.csproj | 41 ++++++++----------- 10 files changed, 77 insertions(+), 139 deletions(-) create mode 100644 Source/Libs/Directory.Build.props diff --git a/Source/Libs/AtkSharp/AtkSharp.csproj b/Source/Libs/AtkSharp/AtkSharp.csproj index d8f39de67..7cdfa6230 100644 --- a/Source/Libs/AtkSharp/AtkSharp.csproj +++ b/Source/Libs/AtkSharp/AtkSharp.csproj @@ -1,27 +1,20 @@ + - true - netstandard2.0 - false - https://github.com/GtkSharp/GtkSharp - https://github.com/GtkSharp/GtkSharp AtkSharp is a C# wrapper for the Atk library. atk;atksharp;atk-sharp;wrapper - - ..\..\..\BuildOutput\Debug - - - ..\..\..\BuildOutput\Release - - - - GLibSharp - - + %(RecursiveDir)%(Filename)%(Extension) + + + + GLibSharp + + + diff --git a/Source/Libs/CairoSharp/CairoSharp.csproj b/Source/Libs/CairoSharp/CairoSharp.csproj index bbc9e0ec4..1d05a1a82 100644 --- a/Source/Libs/CairoSharp/CairoSharp.csproj +++ b/Source/Libs/CairoSharp/CairoSharp.csproj @@ -1,22 +1,14 @@ + - true - netstandard2.0 - false - https://github.com/GtkSharp/GtkSharp - https://github.com/GtkSharp/GtkSharp CairoSharp is a C# wrapper for the Cairo library. cairo;cairosharp;cairo-sharp;wrapper - - ..\..\..\BuildOutput\Debug - - - ..\..\..\BuildOutput\Release - + %(RecursiveDir)%(Filename)%(Extension) + diff --git a/Source/Libs/Directory.Build.props b/Source/Libs/Directory.Build.props new file mode 100644 index 000000000..4a9335642 --- /dev/null +++ b/Source/Libs/Directory.Build.props @@ -0,0 +1,9 @@ + + + net6.0;netstandard2.0 + true + https://github.com/GtkSharp/GtkSharp + https://github.com/GtkSharp/GtkSharp + ..\..\..\BuildOutput\$(Configuration) + + \ No newline at end of file diff --git a/Source/Libs/GLibSharp/GLibSharp.csproj b/Source/Libs/GLibSharp/GLibSharp.csproj index 9461e9422..8f4b9a4cc 100644 --- a/Source/Libs/GLibSharp/GLibSharp.csproj +++ b/Source/Libs/GLibSharp/GLibSharp.csproj @@ -1,22 +1,14 @@ + - true - netstandard2.0 - false - https://github.com/GtkSharp/GtkSharp - https://github.com/GtkSharp/GtkSharp GLibSharp is a C# wrapper for the GLib library. glib;glibsharp;glib-sharp;wrapper - - ..\..\..\BuildOutput\Debug - - - ..\..\..\BuildOutput\Release - + %(RecursiveDir)%(Filename)%(Extension) + diff --git a/Source/Libs/GdkSharp/GdkSharp.csproj b/Source/Libs/GdkSharp/GdkSharp.csproj index d04f1ce00..aa1ff8fd8 100644 --- a/Source/Libs/GdkSharp/GdkSharp.csproj +++ b/Source/Libs/GdkSharp/GdkSharp.csproj @@ -1,19 +1,16 @@ + - true - netstandard2.0 - false - https://github.com/GtkSharp/GtkSharp - https://github.com/GtkSharp/GtkSharp GdkSharp is a C# wrapper for the Gdk library. gdk;gdksharp;gdk-sharp;wrapper - - ..\..\..\BuildOutput\Debug - - - ..\..\..\BuildOutput\Release - + + + + %(RecursiveDir)%(Filename)%(Extension) + + + GLibSharp @@ -28,9 +25,5 @@ PangoSharp - - - %(RecursiveDir)%(Filename)%(Extension) - - + diff --git a/Source/Libs/GioSharp/GioSharp.csproj b/Source/Libs/GioSharp/GioSharp.csproj index bdccbd34b..152a52272 100644 --- a/Source/Libs/GioSharp/GioSharp.csproj +++ b/Source/Libs/GioSharp/GioSharp.csproj @@ -1,27 +1,20 @@ + - true - netstandard2.0 - false - https://github.com/GtkSharp/GtkSharp - https://github.com/GtkSharp/GtkSharp GioSharp is a C# wrapper for the Gio library. gio;giosharp;gio-sharp;wrapper - - ..\..\..\BuildOutput\Debug - - - ..\..\..\BuildOutput\Release - - - - GLibSharp - - + %(RecursiveDir)%(Filename)%(Extension) + + + + GLibSharp + + + diff --git a/Source/Libs/GtkSharp/GtkSharp.csproj b/Source/Libs/GtkSharp/GtkSharp.csproj index bcb3f4097..854113889 100644 --- a/Source/Libs/GtkSharp/GtkSharp.csproj +++ b/Source/Libs/GtkSharp/GtkSharp.csproj @@ -1,23 +1,16 @@ - true - netstandard2.0 - false https://raw.githubusercontent.com/GtkSharp/GtkSharp/develop/Source/Libs/GtkSharp/Icon.png - https://github.com/GtkSharp/GtkSharp - https://github.com/GtkSharp/GtkSharp GtkSharp is a C# wrapper for the Gtk library. gtk;gtksharp;gtk-sharp;wrapper - - ..\..\..\BuildOutput\Debug - - - - ..\..\..\BuildOutput\Release - + + + %(RecursiveDir)%(Filename)%(Extension) + + @@ -40,12 +33,6 @@ - - - %(RecursiveDir)%(Filename)%(Extension) - - - diff --git a/Source/Libs/GtkSourceSharp/GtkSourceSharp.csproj b/Source/Libs/GtkSourceSharp/GtkSourceSharp.csproj index 8120e4e48..3fee0748e 100644 --- a/Source/Libs/GtkSourceSharp/GtkSourceSharp.csproj +++ b/Source/Libs/GtkSourceSharp/GtkSourceSharp.csproj @@ -1,25 +1,18 @@  + - true - netstandard2.0 - false - https://github.com/GtkSharp/GtkSharp - https://github.com/GtkSharp/GtkSharp GtkSourceSharp is a C# wrapper for the GtkSourceView library. sourceview;sourceviewsharp;sourceview-sharp;wrapper - - ..\..\..\BuildOutput\Debug - - - ..\..\..\BuildOutput\Release - + %(RecursiveDir)%(Filename)%(Extension) + + diff --git a/Source/Libs/PangoSharp/PangoSharp.csproj b/Source/Libs/PangoSharp/PangoSharp.csproj index fc0c831dd..661c7fb77 100644 --- a/Source/Libs/PangoSharp/PangoSharp.csproj +++ b/Source/Libs/PangoSharp/PangoSharp.csproj @@ -1,19 +1,16 @@ + - true - netstandard2.0 - false - https://github.com/GtkSharp/GtkSharp - https://github.com/GtkSharp/GtkSharp PangoSharp is a C# wrapper for the Pango library. pango;pangosharp;pango-sharp;wrapper - - ..\..\..\BuildOutput\Debug - - - ..\..\..\BuildOutput\Release - + + + + %(RecursiveDir)%(Filename)%(Extension) + + + GLibSharp @@ -22,9 +19,5 @@ CairoSharp - - - %(RecursiveDir)%(Filename)%(Extension) - - + diff --git a/Source/Libs/WebkitGtkSharp/WebkitGtkSharp.csproj b/Source/Libs/WebkitGtkSharp/WebkitGtkSharp.csproj index 2c91172b7..024dfcd8b 100644 --- a/Source/Libs/WebkitGtkSharp/WebkitGtkSharp.csproj +++ b/Source/Libs/WebkitGtkSharp/WebkitGtkSharp.csproj @@ -1,26 +1,19 @@ - - true - netstandard2.0 - false - https://github.com/GtkSharp/GtkSharp - https://github.com/GtkSharp/GtkSharp - GtkWebkitSharp is a C# wrapper for the Gtk-Webkit library. - webkitgtk;webkitgtksharp;webkit-sharp;wrapper - GtkWebkitSharp - - - ..\..\..\BuildOutput\Debug - - - ..\..\..\BuildOutput\Release - - - - %(RecursiveDir)%(Filename)%(Extension) - - - - - + + + GtkWebkitSharp is a C# wrapper for the Gtk-Webkit library. + webkitgtk;webkitgtksharp;webkit-sharp;wrapper + GtkWebkitSharp + + + + + %(RecursiveDir)%(Filename)%(Extension) + + + + + + +