From 0e735e35662fad06d0c20eb29da4276b3f3bb5c6 Mon Sep 17 00:00:00 2001
From: Tyson Williams <tyson.williams@blocherconsulting.com>
Date: Wed, 18 Dec 2019 15:24:22 -0600
Subject: [PATCH 1/4] Views.WPF now multitargets Framework 4.51 and Core 3.0
 #1029

---
 .../SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj         | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj
index 6bde44562d..166b44047e 100644
--- a/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj
@@ -1,12 +1,13 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFramework>net45</TargetFramework>
+    <TargetFrameworks>net451;netcoreapp3.0</TargetFrameworks>
+    <UseWpf>true</UseWpf>
     <RootNamespace>SkiaSharp.Views.WPF</RootNamespace>
     <AssemblyName>SkiaSharp.Views.WPF</AssemblyName>
     <PackagingGroup>SkiaSharp.Views.WPF</PackagingGroup>
     <DefineConstants>$(DefineConstants);__DESKTOP__;__WPF__</DefineConstants>
   </PropertyGroup>
-  <ItemGroup>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net451'">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="WindowsBase" />

From 741badab69c196c06c071e865e44e050b9453f2b Mon Sep 17 00:00:00 2001
From: Tyson Williams <tyson.williams@blocherconsulting.com>
Date: Thu, 19 Dec 2019 14:33:42 -0600
Subject: [PATCH 2/4] added .NET Core 3.0 to View.Desktiop.Common nuspec file

---
 nuget/SkiaSharp.Views.Desktop.Common.nuspec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nuget/SkiaSharp.Views.Desktop.Common.nuspec b/nuget/SkiaSharp.Views.Desktop.Common.nuspec
index 095ecdca37..4c9c434a97 100644
--- a/nuget/SkiaSharp.Views.Desktop.Common.nuspec
+++ b/nuget/SkiaSharp.Views.Desktop.Common.nuspec
@@ -36,6 +36,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
     <!-- SkiaSharp.Views.*.dll -->
     <file src="lib/net45/SkiaSharp.Views.Desktop.Common.dll" />
     <file src="lib/net45/SkiaSharp.Views.Desktop.Common.xml" />
+    <file src="lib/netcoreapp3.0/SkiaSharp.Views.Desktop.Common.dll" />
+    <file src="lib/netcoreapp3.0/SkiaSharp.Views.Desktop.Common.xml" />
     <file src="lib/netstandard2.0/SkiaSharp.Views.Desktop.Common.dll" />
     <file src="lib/netstandard2.0/SkiaSharp.Views.Desktop.Common.xml" />
 

From cc8578b3142a9481655edb41cbc7a2d87a085619 Mon Sep 17 00:00:00 2001
From: Tyson Williams <tyson.williams@blocherconsulting.com>
Date: Thu, 19 Dec 2019 14:43:32 -0600
Subject: [PATCH 3/4] added .NET Core 3.0 to View.WPF nuspec file

---
 nuget/SkiaSharp.Views.WPF.nuspec | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/nuget/SkiaSharp.Views.WPF.nuspec b/nuget/SkiaSharp.Views.WPF.nuspec
index 9fc5b36e86..482b30830f 100644
--- a/nuget/SkiaSharp.Views.WPF.nuspec
+++ b/nuget/SkiaSharp.Views.WPF.nuspec
@@ -35,6 +35,8 @@ Please visit https://go.microsoft.com/fwlink/?linkid=868517 to view the release
   <files>
 
     <!-- SkiaSharp.Views.*.dll -->
+    <file src="lib/netcoreapp3.0/SkiaSharp.Views.WPF.dll" />
+    <file src="lib/netcoreapp3.0/SkiaSharp.Views.WPF.xml" />
     <file platform="windows" src="lib/net45/SkiaSharp.Views.WPF.dll" />
     <file platform="windows" src="lib/net45/SkiaSharp.Views.WPF.xml" />
 

From a0aa584f3da521d9de1cefb5c7e9b6e49c410205 Mon Sep 17 00:00:00 2001
From: Tyson Williams <tyson.williams@blocherconsulting.com>
Date: Fri, 20 Dec 2019 07:37:44 -0600
Subject: [PATCH 4/4] Reverted net45 to net451 change

---
 .../SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj b/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj
index 166b44047e..1b018dfd4d 100644
--- a/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj
+++ b/source/SkiaSharp.Views/SkiaSharp.Views.WPF/SkiaSharp.Views.WPF.csproj
@@ -1,13 +1,13 @@
 <Project Sdk="Microsoft.NET.Sdk.WindowsDesktop">
   <PropertyGroup>
-    <TargetFrameworks>net451;netcoreapp3.0</TargetFrameworks>
+    <TargetFrameworks>net45;netcoreapp3.0</TargetFrameworks>
     <UseWpf>true</UseWpf>
     <RootNamespace>SkiaSharp.Views.WPF</RootNamespace>
     <AssemblyName>SkiaSharp.Views.WPF</AssemblyName>
     <PackagingGroup>SkiaSharp.Views.WPF</PackagingGroup>
     <DefineConstants>$(DefineConstants);__DESKTOP__;__WPF__</DefineConstants>
   </PropertyGroup>
-  <ItemGroup Condition="'$(TargetFramework)' == 'net451'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="WindowsBase" />