Merge pull request #1 from flensrocker/netstandard2.0

Use target framework netstandard2.0 and default constant NETSTANDARD2_0
YetaWF · Jun 12, 2018 · 7d09e32 · 7d09e32
2 parents 992166d + ba2574f
commit 7d09e32
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 12 deletions.
diff --git a/src/PdfSharp/PdfSharp.csproj b/src/PdfSharp/PdfSharp.csproj
@@ -2,11 +2,10 @@
 
   <PropertyGroup>
     <Version>3.0.0.0</Version>
-    <TargetFramework>netcoreapp2.0</TargetFramework>
-    <RuntimeIdentifiers>win10-x64</RuntimeIdentifiers>
-    <DefineConstants>$(DefineConstants);NETCOREAPP;CORE;CORE_WITH_GDI</DefineConstants>
-    <AssemblyName>PdfSharp.netcoreapp</AssemblyName>
-    <PackageId>PdfSharp.netcoreapp</PackageId>
+    <TargetFramework>netstandard2.0</TargetFramework>
+    <DefineConstants>$(DefineConstants);CORE;CORE_WITH_GDI</DefineConstants>
+    <AssemblyName>PdfSharp.netstandard2.0</AssemblyName>
+    <PackageId>PdfSharp.netstandard2.0</PackageId>
     <GenerateAssemblyTitleAttribute>false</GenerateAssemblyTitleAttribute>
     <GenerateAssemblyDescriptionAttribute>false</GenerateAssemblyDescriptionAttribute>
     <GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
@@ -42,7 +41,7 @@
 
 
   <ItemGroup>
-    <PackageReference Include="System.Drawing.Common" Version="4.5.0-preview2-26406-04" />
+    <PackageReference Include="System.Drawing.Common" Version="4.5.0" />
   </ItemGroup>
 
 </Project>
diff --git a/src/PdfSharp/Windows/PagePreview-ag.xaml.cs b/src/PdfSharp/Windows/PagePreview-ag.xaml.cs
@@ -1,4 +1,4 @@
-#if !NETCOREAPP
+#if !NETSTANDARD2_0
 
 using System;
 using System.Collections.Generic;

diff --git a/src/PdfSharp/Windows/PagePreview-wpf.xaml.cs b/src/PdfSharp/Windows/PagePreview-wpf.xaml.cs
@@ -1,4 +1,4 @@
-#if !NETCOREAPP
+#if !NETSTANDARD2_0
 
 using System;
 using System.Collections.Generic;

diff --git a/src/PdfSharp/Windows/PagePreviewDesignTimeData.cs b/src/PdfSharp/Windows/PagePreviewDesignTimeData.cs
@@ -1,4 +1,4 @@
-#if !NETCOREAPP
+#if !NETSTANDARD2_0
 
 using System;
 using System.Net;

diff --git a/src/PdfSharp/Windows/VisualPresenter.cs b/src/PdfSharp/Windows/VisualPresenter.cs
@@ -1,4 +1,4 @@
-#if !NETCOREAPP
+#if !NETSTANDARD2_0
 
 
 using System;

diff --git a/src/PdfSharp/Windows/enums/RenderMode.cs b/src/PdfSharp/Windows/enums/RenderMode.cs
@@ -27,7 +27,7 @@
 // DEALINGS IN THE SOFTWARE.
 #endregion
 
-#if !NETCOREAPP
+#if !NETSTANDARD2_0
 
 namespace PdfSharp.Windows
 {

diff --git a/src/PdfSharp/Windows/enums/Zoom.cs b/src/PdfSharp/Windows/enums/Zoom.cs
@@ -27,7 +27,7 @@
 // DEALINGS IN THE SOFTWARE.
 #endregion
 
-#if !NETCOREAPP
+#if !NETSTANDARD2_0
 
 namespace PdfSharp.Windows
 {