!3 允许net5以上可选gdi+

Merge pull request !3 from usegdi+

CPF.Skia/GlView.cs

@@ -43,7 +43,7 @@ namespace CPF.Skia
 
             var size = new PixelSize((int)Math.Round(cSize.Width * Root.RenderScaling), (int)Math.Round(cSize.Height * Root.RenderScaling));
             var skia = dc as SkiaDrawingContext;
-            var _gl = skia.GlContext;
+            var _gl = skia?.GlContext;
             if (_gl == null)
             {
                 return;

CPF.Windows/CPF.Windows.csproj

@@ -52,6 +52,16 @@
     <Reference Include="System.Drawing" />
     <Reference Include="System.Windows.Forms" />
   </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
+    <PackageReference Include="System.Drawing.Common">
+      <Version>8.0.6</Version>
+    </PackageReference>
+  </ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net5'">
+    <PackageReference Include="System.Drawing.Common">
+      <Version>8.0.6</Version>
+    </PackageReference>
+  </ItemGroup>
 
   <PropertyGroup>
     <DefineConstants Condition="'$(TargetFramework)'=='net40'">Net4</DefineConstants>

CPF.Windows/GDIPlus/Extension.cs

@@ -1,4 +1,4 @@
-#if Net4
+//#if Net4
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -83,4 +83,4 @@ namespace CPF.GDIPlus
         }
     }
 }
-#endif
+//#endif

CPF.Windows/GDIPlus/GDIPlusBitmap.cs

@@ -1,4 +1,4 @@
-#if Net4
+//#if Net4
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -91,4 +91,4 @@ namespace CPF.GDIPlus
         }
     }
 }
-#endif
+//#endif

CPF.Windows/GDIPlus/GDIPlusBitmapLock.cs

@@ -1,4 +1,4 @@
-#if Net4
+//#if Net4
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -166,4 +166,4 @@ namespace CPF.GDIPlus
         }
     }
 }
-#endif
+//#endif

CPF.Windows/GDIPlus/GDIPlusDrawingContext.cs

@@ -1,4 +1,4 @@
-#if Net4
+//#if Net4
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -802,4 +802,4 @@ namespace CPF.GDIPlus
 
 
 }
-#endif
+//#endif

CPF.Windows/GDIPlus/GDIPlusDrawingFactory.cs

@@ -1,4 +1,4 @@
-#if Net4
+//#if Net4
 using CPF.Platform;
 using System;
 using System.Collections.Generic;
@@ -20,7 +20,8 @@ namespace CPF.GDIPlus
         /// <summary>
         /// GDI+不支持GPU加速
         /// </summary>
-        public override bool UseGPU { get => false; set => throw new NotSupportedException("GDI+不支持GPU加速"); }
+        private bool _useGPU = false;
+        public override bool UseGPU { get => _useGPU; set => _useGPU = false; }
 
         public override IImageImpl ImageFromFile(string path)
         {
@@ -333,4 +334,4 @@ namespace CPF.GDIPlus
         }
     }
 }
-#endif
+//#endif

CPF.Windows/GDIPlus/GDIPlusImage.cs

@@ -1,4 +1,4 @@
-#if Net4
+//#if Net4
 using System;
 using System.Collections.Generic;
 using System.Drawing;
@@ -255,4 +255,4 @@ namespace CPF.GDIPlus
         }
     }
 }
-#endif
+//#endif

CPF.Windows/GDIPlus/GDIPlusPath.cs

@@ -1,4 +1,4 @@
-#if Net4
+//#if Net4
 using System;
 using System.Collections.Generic;
 using System.Drawing.Drawing2D;
@@ -304,4 +304,4 @@ namespace CPF.GDIPlus
         }
     }
 }
-#endif
+//#endif

CPF.Windows/GDIPlus/GDIPlusPathGeometry.cs

@@ -1,4 +1,4 @@
-#if Net4
+//#if Net4
 using System;
 using System.Collections.Generic;
 using System.Text;
@@ -70,4 +70,4 @@ namespace CPF.GDIPlus
 
     }
 }
-#endif
+//#endif