From 42ceb1c0d127d80690b497a782cf4ad0989c327b Mon Sep 17 00:00:00 2001
From: Harry <harry.cpp@outlook.com>
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 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>AtkSharp is a C# wrapper for the Atk library.</Description>
     <PackageTags>atk;atksharp;atk-sharp;wrapper</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>..\..\..\BuildOutput\Debug</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\GLibSharp\GLibSharp.csproj">
-      <Name>GLibSharp</Name>
-    </ProjectReference>
-  </ItemGroup>
+
   <ItemGroup>
     <Compile Include="..\Shared\*.cs">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\GLibSharp\GLibSharp.csproj">
+      <Name>GLibSharp</Name>
+    </ProjectReference>
+  </ItemGroup>
+
 </Project>
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 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>CairoSharp is a C# wrapper for the Cairo library.</Description>
     <PackageTags>cairo;cairosharp;cairo-sharp;wrapper</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>..\..\..\BuildOutput\Debug</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
-  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="..\Shared\*.cs">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>
   </ItemGroup>
+
 </Project>
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 @@
+<Project>
+  <PropertyGroup>
+    <TargetFrameworks>net6.0;netstandard2.0</TargetFrameworks>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
+    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
+    <OutputPath>..\..\..\BuildOutput\$(Configuration)</OutputPath>
+  </PropertyGroup>
+</Project>
\ 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 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>GLibSharp is a C# wrapper for the GLib library.</Description>
     <PackageTags>glib;glibsharp;glib-sharp;wrapper</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>..\..\..\BuildOutput\Debug</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
-  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="..\Shared\*.cs">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>
   </ItemGroup>
+
 </Project>
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 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>GdkSharp is a C# wrapper for the Gdk library.</Description>
     <PackageTags>gdk;gdksharp;gdk-sharp;wrapper</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>..\..\..\BuildOutput\Debug</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
-  </PropertyGroup>
+  
+  <ItemGroup>
+    <Compile Include="..\Shared\*.cs">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\GLibSharp\GLibSharp.csproj">
       <Name>GLibSharp</Name>
@@ -28,9 +25,5 @@
       <Name>PangoSharp</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Shared\*.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
-  </ItemGroup>
+
 </Project>
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 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>GioSharp is a C# wrapper for the Gio library.</Description>
     <PackageTags>gio;giosharp;gio-sharp;wrapper</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>..\..\..\BuildOutput\Debug</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
-  </PropertyGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\GLibSharp\GLibSharp.csproj">
-      <Name>GLibSharp</Name>
-    </ProjectReference>
-  </ItemGroup>
+  
   <ItemGroup>
     <Compile Include="..\Shared\*.cs">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\GLibSharp\GLibSharp.csproj">
+      <Name>GLibSharp</Name>
+    </ProjectReference>
+  </ItemGroup>
+
 </Project>
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 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
     <PackageIconUrl>https://raw.githubusercontent.com/GtkSharp/GtkSharp/develop/Source/Libs/GtkSharp/Icon.png</PackageIconUrl>
-    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>GtkSharp is a C# wrapper for the Gtk library.</Description>
     <PackageTags>gtk;gtksharp;gtk-sharp;wrapper</PackageTags>
   </PropertyGroup>
 
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>..\..\..\BuildOutput\Debug</OutputPath>
-  </PropertyGroup>
-
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
-  </PropertyGroup>
+  <ItemGroup>
+    <Compile Include="..\Shared\*.cs">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\GLibSharp\GLibSharp.csproj">
@@ -40,12 +33,6 @@
     </ProjectReference>
   </ItemGroup>
 
-  <ItemGroup>
-    <Compile Include="..\Shared\*.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
-  </ItemGroup>
-
   <ItemGroup>
     <Content Include="GtkSharp.targets" PackagePath="build\GtkSharp.targets" />
   </ItemGroup>
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 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>GtkSourceSharp is a C# wrapper for the GtkSourceView library.</Description>
     <PackageTags>sourceview;sourceviewsharp;sourceview-sharp;wrapper</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>..\..\..\BuildOutput\Debug</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
-  </PropertyGroup>
+
   <ItemGroup>
     <Compile Include="..\Shared\*.cs">
       <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
     </Compile>
   </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\GtkSharp\GtkSharp.csproj" />
   </ItemGroup>
+
 </Project>
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 @@
 <Project Sdk="Microsoft.NET.Sdk">
+
   <PropertyGroup>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-    <TargetFramework>netstandard2.0</TargetFramework>
-    <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-    <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
     <Description>PangoSharp is a C# wrapper for the Pango library.</Description>
     <PackageTags>pango;pangosharp;pango-sharp;wrapper</PackageTags>
   </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-    <OutputPath>..\..\..\BuildOutput\Debug</OutputPath>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-    <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
-  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Shared\*.cs">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
+
   <ItemGroup>
     <ProjectReference Include="..\GLibSharp\GLibSharp.csproj">
       <Name>GLibSharp</Name>
@@ -22,9 +19,5 @@
       <Name>CairoSharp</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="..\Shared\*.cs">
-      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-    </Compile>
-  </ItemGroup>
+
 </Project>
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 @@
 <Project Sdk="Microsoft.NET.Sdk">
-    <PropertyGroup>
-        <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
-        <TargetFramework>netstandard2.0</TargetFramework>
-        <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
-        <PackageProjectUrl>https://github.com/GtkSharp/GtkSharp</PackageProjectUrl>
-        <RepositoryUrl>https://github.com/GtkSharp/GtkSharp</RepositoryUrl>
-        <Description>GtkWebkitSharp is a C# wrapper for the Gtk-Webkit library.</Description>
-        <PackageTags>webkitgtk;webkitgtksharp;webkit-sharp;wrapper</PackageTags>
-        <RootNamespace>GtkWebkitSharp</RootNamespace>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
-        <OutputPath>..\..\..\BuildOutput\Debug</OutputPath>
-    </PropertyGroup>
-    <PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
-        <OutputPath>..\..\..\BuildOutput\Release</OutputPath>
-    </PropertyGroup>
-    <ItemGroup>
-        <Compile Include="..\Shared\*.cs">
-            <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
-        </Compile>
-    </ItemGroup>
-    <ItemGroup>
-        <ProjectReference Include="..\GtkSharp\GtkSharp.csproj" />
-    </ItemGroup>
+
+  <PropertyGroup>
+    <Description>GtkWebkitSharp is a C# wrapper for the Gtk-Webkit library.</Description>
+    <PackageTags>webkitgtk;webkitgtksharp;webkit-sharp;wrapper</PackageTags>
+    <RootNamespace>GtkWebkitSharp</RootNamespace>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <Compile Include="..\Shared\*.cs">
+      <Link>%(RecursiveDir)%(Filename)%(Extension)</Link>
+    </Compile>
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\GtkSharp\GtkSharp.csproj" />
+  </ItemGroup>
+
 </Project>