Merge pull request #49 from FastReports/AddedWindowsFormsSDKforNet5windows

Added WindowsForms SDK and removed System.Drawing.Common dependency

Author: KirillKornienko

Nuget/FastReport.Compat.nuspec

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<package xmlns="http://schemas.microsoft.com/packaging/2013/05/nuspec.xsd">
+  <metadata>
+    <frameworkReferences>
+      <group targetFramework="net5.0-windows7.0">
+        <frameworkReference name="Microsoft.WindowsDesktop.App.WindowsForms" />
+      </group>
+    </frameworkReferences>
+  </metadata>
+</package>

build/build.cake

@@ -163,7 +163,10 @@ Task("Compat")
 
     var dependencies = new List<NuSpecDependency>();
     AddNuSpecDep(null, null, ".NETFramework4.0");
-    AddNuSpecDepCore("System.Drawing.Common", SystemDrawingCommonVersion);
+    // System.Drawing.Common reference doesn't included in net5.0-windows target
+    AddNuSpecDep("System.Drawing.Common", SystemDrawingCommonVersion, ".NETStandard2.0");
+    AddNuSpecDep("System.Drawing.Common", SystemDrawingCommonVersion, ".NETStandard2.1");
+    AddNuSpecDep("System.Drawing.Common", SystemDrawingCommonVersion, tfmCore30);
     AddNuSpecDepCore("Microsoft.CodeAnalysis.CSharp", CodeAnalysisCSharpVersion);
     AddNuSpecDepCore("Microsoft.CodeAnalysis.VisualBasic", CodeAnalysisVisualBasicVersion);
     AddNuSpecDep("System.Windows.Extensions", "4.6.0", tfmCore30);
@@ -196,7 +199,7 @@ Task("Compat")
     };
 
     // Pack
-    NuGetPack(nuGetPackSettings);
+    NuGetPack(Path.Combine(solutionDirectory, "Nuget", nuGetPackSettings.Id + ".nuspec"), nuGetPackSettings);
 
     // Local functions:
 

src/FastReport.Compat-Windows/FastReport.Compat-Windows.csproj

@@ -1,8 +1,9 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
 
   <PropertyGroup>
     <TargetFrameworks>net40;$(CustomTargetFrameworks)</TargetFrameworks>
     <DefineConstants>$(DefineConstants);NETCOREWIN</DefineConstants>
+    <UseWindowsForms>true</UseWindowsForms>
     <AssemblyName>FastReport.Compat</AssemblyName>
     <PackageId>$(AssemblyName)</PackageId>
     <ProduceReferenceAssembly>false</ProduceReferenceAssembly>
@@ -25,9 +26,12 @@
 
   <Import Project="$(SlnDir)UsedPackages.version"/>
   <ItemGroup Condition="'$(TargetFramework)'!='net40'">
-    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.CSharp" Version="$(CodeAnalysisCSharpVersion)" />
     <PackageReference Include="Microsoft.CodeAnalysis.VisualBasic" Version="$(CodeAnalysisVisualBasicVersion)" />
+  </ItemGroup>
+
+  <ItemGroup Condition="'$(TargetFramework)'=='netcoreapp3.0'">
+    <PackageReference Include="System.Drawing.Common" Version="$(SystemDrawingCommonVersion)" />
     <PackageReference Include="System.Windows.Extensions" Version="4.6.0"/>
   </ItemGroup>