Multitarget Views.WPF (#1069)

* Views.WPF now multitargets Framework 4.5 and Core 3.0 #1029 * added .NET Core 3.0 to View.Desktiop.Common nuspec file * added .NET Core 3.0 to View.WPF nuspec file
mono · Dec 21, 2019 · bc3d08f · bc3d08f
1 parent 36693bd
commit bc3d08f
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git 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" />
 

diff --git 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" />
 

diff --git 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>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>
+  <ItemGroup Condition="'$(TargetFramework)' == 'net45'">
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
     <Reference Include="WindowsBase" />