Add support for netstandard2.0

janbernloehr · janbernloehr · commit 4c42248463a8 · 2021-12-28T00:39:43.000+01:00
diff --git a/Xceed.Document.NET/Src/Document.cs b/Xceed.Document.NET/Src/Document.cs
@@ -28,7 +28,6 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at
 using System.Collections.ObjectModel;
 using System.Net;
 using System.Diagnostics;
-using System.Drawing.Drawing2D;
 using System.Reflection;
 using System.ComponentModel;
 
diff --git a/Xceed.Document.NET/Src/HelperFunctions.cs b/Xceed.Document.NET/Src/HelperFunctions.cs
@@ -26,7 +26,6 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at
 using System.Globalization;
 using System.Diagnostics;
 using System.Drawing;
-using System.Drawing.Drawing2D;
 
 namespace Xceed.Document.NET
 {
diff --git a/Xceed.Document.NET/Xceed.Document.NET.csproj b/Xceed.Document.NET/Xceed.Document.NET.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
 
     <AssemblyTitle>Xceed Document for .NET</AssemblyTitle>
     <Description>This assembly implements the classes for Xceed Document for .NET.</Description>
@@ -27,7 +27,11 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\SignatureLine.emf" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
     <Reference Include="WindowsBase" />
   </ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'netstandard2.0' ">
+    <PackageReference Include="System.IO.Packaging" Version="6.0.0" />
+    <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
+  </ItemGroup>
 </Project>
diff --git a/Xceed.Words.NET.Examples/Program.cs b/Xceed.Words.NET.Examples/Program.cs
@@ -19,7 +19,9 @@ namespace Xceed.Words.NET.Examples
 {
   public class Program
   {
-    internal const string SampleDirectory = @"..\..\..\Samples\";
+    internal static string SampleDirectory = System.IO.Path.Combine(
+      System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"..\..\..\Samples\"
+    );
 
     private static void Main( string[] args )
     {
diff --git a/Xceed.Words.NET.Examples/Samples/Bookmark/BookmarkSample.cs b/Xceed.Words.NET.Examples/Samples/Bookmark/BookmarkSample.cs
@@ -21,8 +21,8 @@ public class BookmarkSample
   {
     #region Private Members
 
-    private const string BookmarkSampleResourcesDirectory = Program.SampleDirectory + @"Bookmark\Resources\";
-    private const string BookmarkSampleOutputDirectory = Program.SampleDirectory + @"Bookmark\Output\";
+    private static string BookmarkSampleResourcesDirectory = Program.SampleDirectory + @"Bookmark\Resources\";
+    private static string BookmarkSampleOutputDirectory = Program.SampleDirectory + @"Bookmark\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Chart/ChartSample.cs b/Xceed.Words.NET.Examples/Samples/Chart/ChartSample.cs
@@ -21,8 +21,8 @@ public class ChartSample
   {
     #region Private Members
 
-    private const string ChartSampleOutputDirectory = Program.SampleDirectory + @"Chart\Output\";
-    private const string ChartSampleResourceDirectory = Program.SampleDirectory + @"Chart\Resources\";
+    private static string ChartSampleOutputDirectory = Program.SampleDirectory + @"Chart\Output\";
+    private static string ChartSampleResourceDirectory = Program.SampleDirectory + @"Chart\Resources\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/CheckBox/CheckBoxSample.cs b/Xceed.Words.NET.Examples/Samples/CheckBox/CheckBoxSample.cs
@@ -20,8 +20,8 @@ public class CheckBoxSample
   {
     #region Private Members
 
-    private const string CheckBoxSampleResourcesDirectory = Program.SampleDirectory + @"CheckBox\Resources\";
-    private const string CheckBoxSampleOutputDirectory = Program.SampleDirectory + @"CheckBox\Output\";
+    private static string CheckBoxSampleResourcesDirectory = Program.SampleDirectory + @"CheckBox\Resources\";
+    private static string CheckBoxSampleOutputDirectory = Program.SampleDirectory + @"CheckBox\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/DigitalSignature/DigitalSignatureSample.cs b/Xceed.Words.NET.Examples/Samples/DigitalSignature/DigitalSignatureSample.cs
@@ -20,8 +20,8 @@ public class DigitalSignatureSample
   {
     #region Private Members
 
-    private const string DigitalSignatureSampleOutputDirectory = Program.SampleDirectory + @"DigitalSignature\Output\";
-    private const string DigitalSignatureSampleResourcesDirectory = Program.SampleDirectory + @"DigitalSignature\Resources\";
+    private static string DigitalSignatureSampleOutputDirectory = Program.SampleDirectory + @"DigitalSignature\Output\";
+    private static string DigitalSignatureSampleResourcesDirectory = Program.SampleDirectory + @"DigitalSignature\Resources\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Document/DocumentSample.cs b/Xceed.Words.NET.Examples/Samples/Document/DocumentSample.cs
@@ -30,8 +30,8 @@ public class DocumentSample
         { "DATE", "October 18 2016" },
     };
 
-    private const string DocumentSampleResourcesDirectory = Program.SampleDirectory + @"Document\Resources\";
-    private const string DocumentSampleOutputDirectory = Program.SampleDirectory + @"Document\Output\";
+    private static string DocumentSampleResourcesDirectory = Program.SampleDirectory + @"Document\Resources\";
+    private static string DocumentSampleOutputDirectory = Program.SampleDirectory + @"Document\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Equation/EquationSample.cs b/Xceed.Words.NET.Examples/Samples/Equation/EquationSample.cs
@@ -21,7 +21,7 @@ public class EquationSample
   {
     #region Private Members
 
-    private const string EquationSampleOutputDirectory = Program.SampleDirectory + @"Equation\Output\";
+    private static string EquationSampleOutputDirectory = Program.SampleDirectory + @"Equation\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/FootnoteEndnote/FootnoteEndnoteSample.cs b/Xceed.Words.NET.Examples/Samples/FootnoteEndnote/FootnoteEndnoteSample.cs
@@ -22,8 +22,8 @@ public class FootnoteEndnoteSample
   {
     #region Private Members
 
-    private const string FootnoteEndnoteSampleResourcesDirectory = Program.SampleDirectory + @"FootnoteEndnote\Resources\";
-    private const string FootnoteEndnoteSampleOutputDirectory = Program.SampleDirectory + @"FootnoteEndnote\Output\";
+    private static string FootnoteEndnoteSampleResourcesDirectory = Program.SampleDirectory + @"FootnoteEndnote\Resources\";
+    private static string FootnoteEndnoteSampleOutputDirectory = Program.SampleDirectory + @"FootnoteEndnote\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/HeaderFooter/HeaderFooterSample.cs b/Xceed.Words.NET.Examples/Samples/HeaderFooter/HeaderFooterSample.cs
@@ -20,7 +20,7 @@ public class HeaderFooterSample
   {
     #region Private Members
 
-    private const string HeaderFooterSampleOutputDirectory = Program.SampleDirectory + @"HeaderFooter\Output\";
+    private static string HeaderFooterSampleOutputDirectory = Program.SampleDirectory + @"HeaderFooter\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Hyperlink/HyperlinkSample.cs b/Xceed.Words.NET.Examples/Samples/Hyperlink/HyperlinkSample.cs
@@ -21,7 +21,7 @@ public class HyperlinkSample
   {
     #region Private Members
 
-    private const string HyperlinkSampleOutputDirectory = Program.SampleDirectory + @"Hyperlink\Output\";
+    private static string HyperlinkSampleOutputDirectory = Program.SampleDirectory + @"Hyperlink\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Hyphenation/HyphenationSample.cs b/Xceed.Words.NET.Examples/Samples/Hyphenation/HyphenationSample.cs
@@ -20,8 +20,8 @@ public class HyphenationSample
   {
     #region Private Members
 
-    private const string HyphenationSampleResourceDirectory = Program.SampleDirectory + @"Hyphenation\Resources\";
-    private const string HyphenationSampleOutputDirectory = Program.SampleDirectory + @"Hyphenation\Output\";
+    private static string HyphenationSampleResourceDirectory = Program.SampleDirectory + @"Hyphenation\Resources\";
+    private static string HyphenationSampleOutputDirectory = Program.SampleDirectory + @"Hyphenation\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Image/ImageSample.cs b/Xceed.Words.NET.Examples/Samples/Image/ImageSample.cs
@@ -24,8 +24,8 @@ public class ImageSample
   {
     #region Private Members
 
-    private const string ImageSampleResourcesDirectory = Program.SampleDirectory + @"Image\Resources\";
-    private const string ImageSampleOutputDirectory = Program.SampleDirectory + @"Image\Output\";
+    private static string ImageSampleResourcesDirectory = Program.SampleDirectory + @"Image\Resources\";
+    private static string ImageSampleOutputDirectory = Program.SampleDirectory + @"Image\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Line/LineSample.cs b/Xceed.Words.NET.Examples/Samples/Line/LineSample.cs
@@ -20,7 +20,7 @@ public class LineSample
   {
     #region Private Members
 
-    private const string LineSampleOutputDirectory = Program.SampleDirectory + @"Line\Output\";
+    private static string LineSampleOutputDirectory = Program.SampleDirectory + @"Line\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/List/ListSample.cs b/Xceed.Words.NET.Examples/Samples/List/ListSample.cs
@@ -24,8 +24,8 @@ public class ListSample
   {
     #region Private Members
 
-    private const string ListSampleResourceDirectory = Program.SampleDirectory + @"List\Resources\";
-    private const string ListSampleOutputDirectory = Program.SampleDirectory + @"List\Output\";
+    private static string ListSampleResourceDirectory = Program.SampleDirectory + @"List\Resources\";
+    private static string ListSampleOutputDirectory = Program.SampleDirectory + @"List\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Margin/MarginSample.cs b/Xceed.Words.NET.Examples/Samples/Margin/MarginSample.cs
@@ -20,7 +20,7 @@ public class MarginSample
   {
     #region Private Members
 
-    private const string MarginSampleOutputDirectory = Program.SampleDirectory + @"Margin\Output\";
+    private static string MarginSampleOutputDirectory = Program.SampleDirectory + @"Margin\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Miscellaneous/MiscellaneousSample.cs b/Xceed.Words.NET.Examples/Samples/Miscellaneous/MiscellaneousSample.cs
@@ -24,9 +24,9 @@ public class MiscellaneousSample
   {
     #region Private Members
 
-    private const string MiscellaneousSampleResourcesDirectory = Program.SampleDirectory + @"Miscellaneous\Resources\";
-    private const string MiscellaneousSampleOutputDirectory = Program.SampleDirectory + @"Miscellaneous\Output\";
-    private const string MiscellaneousSampleOutputMailMergeDirectory = MiscellaneousSample.MiscellaneousSampleOutputDirectory + @"MailMerge\";
+    private static string MiscellaneousSampleResourcesDirectory = Program.SampleDirectory + @"Miscellaneous\Resources\";
+    private static string MiscellaneousSampleOutputDirectory = Program.SampleDirectory + @"Miscellaneous\Output\";
+    private static string MiscellaneousSampleOutputMailMergeDirectory = MiscellaneousSample.MiscellaneousSampleOutputDirectory + @"MailMerge\";
 
     private static List<Candidate> Canditates = new List<Candidate>()
                                           {
diff --git a/Xceed.Words.NET.Examples/Samples/Paragraph/ParagraphSample.cs b/Xceed.Words.NET.Examples/Samples/Paragraph/ParagraphSample.cs
@@ -28,8 +28,8 @@ public class ParagraphSample
         { "COST", "$13.95" },
     };
 
-    private const string ParagraphSampleResourcesDirectory = Program.SampleDirectory + @"Paragraph\Resources\";
-    private const string ParagraphSampleOutputDirectory = Program.SampleDirectory + @"Paragraph\Output\";
+    private static string ParagraphSampleResourcesDirectory = Program.SampleDirectory + @"Paragraph\Resources\";
+    private static string ParagraphSampleOutputDirectory = Program.SampleDirectory + @"Paragraph\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Parallel/ParallelSample.cs b/Xceed.Words.NET.Examples/Samples/Parallel/ParallelSample.cs
@@ -20,8 +20,8 @@ public class ParallelSample
   {
     #region Private Members
 
-    private const string ParallelSampleResourcesDirectory = Program.SampleDirectory + @"Parallel\Resources\";
-    private const string ParallelSampleOutputDirectory = Program.SampleDirectory + @"Parallel\Output\";
+    private static string ParallelSampleResourcesDirectory = Program.SampleDirectory + @"Parallel\Resources\";
+    private static string ParallelSampleOutputDirectory = Program.SampleDirectory + @"Parallel\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Protection/ProtectionSample.cs b/Xceed.Words.NET.Examples/Samples/Protection/ProtectionSample.cs
@@ -20,8 +20,8 @@ public class ProtectionSample
   {
     #region Private Members
 
-    private const string ProtectionSampleResourceDirectory = Program.SampleDirectory + @"Protection\Resources\";
-    private const string ProtectionSampleOutputDirectory = Program.SampleDirectory + @"Protection\Output\";
+    private static string ProtectionSampleResourceDirectory = Program.SampleDirectory + @"Protection\Resources\";
+    private static string ProtectionSampleOutputDirectory = Program.SampleDirectory + @"Protection\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Section/SectionSample.cs b/Xceed.Words.NET.Examples/Samples/Section/SectionSample.cs
@@ -22,7 +22,7 @@ public class SectionSample
   {
     #region Private Members
 
-    private const string SectionSampleOutputDirectory = Program.SampleDirectory + @"Section\Output\";
+    private static string SectionSampleOutputDirectory = Program.SampleDirectory + @"Section\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Shape/ShapeSample.cs b/Xceed.Words.NET.Examples/Samples/Shape/ShapeSample.cs
@@ -23,7 +23,7 @@ public class ShapeSample
   {
     #region Private Members
 
-    private const string ShapeSampleOutputDirectory = Program.SampleDirectory + @"Shape\Output\";
+    private static string ShapeSampleOutputDirectory = Program.SampleDirectory + @"Shape\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/Table/TableSample.cs b/Xceed.Words.NET.Examples/Samples/Table/TableSample.cs
@@ -24,8 +24,8 @@ public class TableSample
 
     private static Random rand = new Random();
 
-    private const string TableSampleResourcesDirectory = Program.SampleDirectory + @"Table\Resources\";
-    private const string TableSampleOutputDirectory = Program.SampleDirectory + @"Table\Output\";
+    private static string TableSampleResourcesDirectory = Program.SampleDirectory + @"Table\Resources\";
+    private static string TableSampleOutputDirectory = Program.SampleDirectory + @"Table\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Samples/TableOfContent/TableOfContentSample.cs b/Xceed.Words.NET.Examples/Samples/TableOfContent/TableOfContentSample.cs
@@ -21,8 +21,8 @@ public class TableOfContentSample
   {
     #region Private Members
 
-    private const string TableOfContentSampleResourcesDirectory = Program.SampleDirectory + @"TableOfContent\Resources\";
-    private const string TableOfContentSampleOutputDirectory = Program.SampleDirectory + @"TableOfContent\Output\";
+    private static string TableOfContentSampleResourcesDirectory = Program.SampleDirectory + @"TableOfContent\Resources\";
+    private static string TableOfContentSampleOutputDirectory = Program.SampleDirectory + @"TableOfContent\Output\";
 
     #endregion
 
diff --git a/Xceed.Words.NET.Examples/Xceed.Words.NET.Examples.csproj b/Xceed.Words.NET.Examples/Xceed.Words.NET.Examples.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40</TargetFrameworks>
+    <TargetFrameworks>net40;netcoreapp3.1;net5.0-windows;net6.0-windows</TargetFrameworks>
     <OutputType>Exe</OutputType>
     
     <AssemblyTitle>Xceed Words for .NET - Examples</AssemblyTitle>
diff --git a/Xceed.Words.NET/Xceed.Words.NET.csproj b/Xceed.Words.NET/Xceed.Words.NET.csproj
@@ -1,6 +1,6 @@
 ﻿<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <TargetFrameworks>net40</TargetFrameworks>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
 
     <AssemblyTitle>Xceed Words for .NET</AssemblyTitle>
     <Description>This assembly implements the classes for Xceed Words for .NET.</Description>
@@ -26,7 +26,7 @@
   <ItemGroup>
     <ProjectReference Include="..\Xceed.Document.NET\Xceed.Document.NET.csproj" />
   </ItemGroup>
-  <ItemGroup>
+  <ItemGroup Condition=" '$(TargetFramework)' == 'net40' ">
     <Reference Include="WindowsBase" />
   </ItemGroup>
 </Project>

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at`
`26`	`26`	`using System.Globalization;`
`27`	`27`	`using System.Diagnostics;`
`28`	`28`	`using System.Drawing;`
`29`		`-using System.Drawing.Drawing2D;`
`30`	`29`
`31`	`30`	`namespace Xceed.Document.NET`
`32`	`31`	`{`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,9 @@ namespace Xceed.Words.NET.Examples`
`19`	`19`	`{`
`20`	`20`	`public class Program`
`21`	`21`	`{`
`22`		`- internal const string SampleDirectory = @"..\..\..\Samples\";`
	`22`	`+ internal static string SampleDirectory = System.IO.Path.Combine(`
	`23`	`+ System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"..\..\..\Samples\"`
	`24`	`+ );`
`23`	`25`
`24`	`26`	`private static void Main( string[] args )`
`25`	`27`	`{`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ public class BookmarkSample`
`21`	`21`	`{`
`22`	`22`	`#region Private Members`
`23`	`23`
`24`		`- private const string BookmarkSampleResourcesDirectory = Program.SampleDirectory + @"Bookmark\Resources\";`
`25`		`- private const string BookmarkSampleOutputDirectory = Program.SampleDirectory + @"Bookmark\Output\";`
	`24`	`+ private static string BookmarkSampleResourcesDirectory = Program.SampleDirectory + @"Bookmark\Resources\";`
	`25`	`+ private static string BookmarkSampleOutputDirectory = Program.SampleDirectory + @"Bookmark\Output\";`
`26`	`26`
`27`	`27`	`#endregion`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@ public class ChartSample`
`21`	`21`	`{`
`22`	`22`	`#region Private Members`
`23`	`23`
`24`		`- private const string ChartSampleOutputDirectory = Program.SampleDirectory + @"Chart\Output\";`
`25`		`- private const string ChartSampleResourceDirectory = Program.SampleDirectory + @"Chart\Resources\";`
	`24`	`+ private static string ChartSampleOutputDirectory = Program.SampleDirectory + @"Chart\Output\";`
	`25`	`+ private static string ChartSampleResourceDirectory = Program.SampleDirectory + @"Chart\Resources\";`
`26`	`26`
`27`	`27`	`#endregion`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ public class CheckBoxSample`
`20`	`20`	`{`
`21`	`21`	`#region Private Members`
`22`	`22`
`23`		`- private const string CheckBoxSampleResourcesDirectory = Program.SampleDirectory + @"CheckBox\Resources\";`
`24`		`- private const string CheckBoxSampleOutputDirectory = Program.SampleDirectory + @"CheckBox\Output\";`
	`23`	`+ private static string CheckBoxSampleResourcesDirectory = Program.SampleDirectory + @"CheckBox\Resources\";`
	`24`	`+ private static string CheckBoxSampleOutputDirectory = Program.SampleDirectory + @"CheckBox\Output\";`
`25`	`25`
`26`	`26`	`#endregion`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ public class DigitalSignatureSample`
`20`	`20`	`{`
`21`	`21`	`#region Private Members`
`22`	`22`
`23`		`- private const string DigitalSignatureSampleOutputDirectory = Program.SampleDirectory + @"DigitalSignature\Output\";`
`24`		`- private const string DigitalSignatureSampleResourcesDirectory = Program.SampleDirectory + @"DigitalSignature\Resources\";`
	`23`	`+ private static string DigitalSignatureSampleOutputDirectory = Program.SampleDirectory + @"DigitalSignature\Output\";`
	`24`	`+ private static string DigitalSignatureSampleResourcesDirectory = Program.SampleDirectory + @"DigitalSignature\Resources\";`
`25`	`25`
`26`	`26`	`#endregion`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ public class EquationSample`
`21`	`21`	`{`
`22`	`22`	`#region Private Members`
`23`	`23`
`24`		`- private const string EquationSampleOutputDirectory = Program.SampleDirectory + @"Equation\Output\";`
	`24`	`+ private static string EquationSampleOutputDirectory = Program.SampleDirectory + @"Equation\Output\";`
`25`	`25`
`26`	`26`	`#endregion`
`27`	`27`