Migrate to new csproj and add support for netstandard2.0

Xceed.Document.NET/AssemblyVersionInfo.cs

@@ -13,11 +13,6 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at
 
   *************************************************************************************/
 
-
-#pragma warning disable 0436
-[assembly: System.Reflection.AssemblyVersion( _XceedVersionInfo.Version )]
-#pragma warning restore 0436
-
 internal static class _XceedVersionInfo
 {
   [System.Diagnostics.CodeAnalysis.SuppressMessage( "Microsoft.Performance", "CA1823:AvoidUnusedPrivateFields" )]

Xceed.Document.NET/Properties/AssemblyInfo.cs

@@ -19,23 +19,6 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 
-// General Information about an assembly is controlled through the following 
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle( "Xceed Document for .NET" )]
-[assembly: AssemblyDescription( "This assembly implements the classes for Xceed Document for .NET." )]
-
-[assembly: AssemblyCompany( "Xceed Software Inc." )]
-[assembly: AssemblyProduct( "Xceed Document for .NET" )]
-[assembly: AssemblyCopyright( "Copyright (C) Xceed Software Inc. 2009-2021" )]
-[assembly: AssemblyCulture("")]
-
-
-// Setting ComVisible to false makes the types in this assembly not visible 
-// to COM components.  If you need to access a type in this assembly from 
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
 
 // Allow the Xceed.Words.NET to get at internal stuff.
 [assembly: InternalsVisibleTo( "Xceed.Words.NET" + ",PublicKey=" +
@@ -86,18 +69,3 @@ COMMUNITY LICENSE AGREEMENT (for non-commercial use) as published at
     "1b7452ee003b80b936614cdda51db8eb6f8fde913e67d45395b480a992be17bf04744a7fe803ea" +
     "131b925dcf84a73d22264352eca7c3fcf9387f3eee1d60ac7974f04866e6c72928dc0609abe341" +
     "f92cbfb5")]
-
-
-
-
-
-
-
-
-
-#pragma warning disable 1699
-[assembly: AssemblyDelaySign( false )]
-[assembly: AssemblyKeyFile( @"..\..\sn.snk" )]
-[assembly: AssemblyKeyName( "" )]
-#pragma warning restore 1699
-

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;
 

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
 {

Xceed.Document.NET/Xceed.Document.NET.csproj

@@ -1,161 +1,24 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="4.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+<Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProductVersion>9.0.21022</ProductVersion>
-    <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{E863D072-AA8B-4108-B5F1-785241B37F67}</ProjectGuid>
-    <OutputType>Library</OutputType>
-    <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Xceed.Document.NET</RootNamespace>
-    <AssemblyName>Xceed.Document.NET</AssemblyName>
-    <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <StartupObject>
-    </StartupObject>
-    <FileUpgradeFlags>
-    </FileUpgradeFlags>
-    <OldToolsVersion>3.5</OldToolsVersion>
-    <UpgradeBackupLocation />
-    <PublishUrl>publish\</PublishUrl>
-    <Install>true</Install>
-    <InstallFrom>Disk</InstallFrom>
-    <UpdateEnabled>false</UpdateEnabled>
-    <UpdateMode>Foreground</UpdateMode>
-    <UpdateInterval>7</UpdateInterval>
-    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
-    <UpdatePeriodically>false</UpdatePeriodically>
-    <UpdateRequired>false</UpdateRequired>
-    <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
-    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
-    <IsWebBootstrapper>false</IsWebBootstrapper>
-    <UseApplicationTrust>false</UseApplicationTrust>
-    <BootstrapperEnabled>true</BootstrapperEnabled>
-    <TargetFrameworkProfile>
-    </TargetFrameworkProfile>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <Optimize>false</Optimize>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DefineConstants>TRACE;DEBUG;NETFRAMEWORK</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <DocumentationFile>
-    </DocumentationFile>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <NoWarn>CS1591</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <DebugType>none</DebugType>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DefineConstants>TRACE;NETFRAMEWORK</DefineConstants>
-    <ErrorReport>prompt</ErrorReport>
-    <WarningLevel>4</WarningLevel>
-    <CodeAnalysisRuleSet>AllRules.ruleset</CodeAnalysisRuleSet>
-    <DocumentationFile>
-    </DocumentationFile>
-  </PropertyGroup>
-  <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
+    <TargetFrameworks>net40;netstandard2.0</TargetFrameworks>
+
+    <AssemblyTitle>Xceed Document for .NET</AssemblyTitle>
+    <Description>This assembly implements the classes for Xceed Document for .NET.</Description>
+    <Version>2.0.0.0</Version>
+
+    <Company>Xceed Software Inc.</Company>
+    <Product>Xceed Document for .NET</Product>
+    <Copyright>Copyright (C) Xceed Software Inc. 2009-2021</Copyright>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
+    <SignAssembly>true</SignAssembly>
+    <DelaySign>false</DelaySign>
+    <AssemblyOriginatorKeyFile>sn.snk</AssemblyOriginatorKeyFile>
   </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="System" />
-    <Reference Include="System.Configuration" />
-    <Reference Include="System.Core">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Xml.Linq">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data.DataSetExtensions">
-      <RequiredTargetFramework>3.5</RequiredTargetFramework>
-    </Reference>
-    <Reference Include="System.Data" />
-    <Reference Include="WindowsBase">
-      <RequiredTargetFramework>3.0</RequiredTargetFramework>
-    </Reference>
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="AssemblyVersionInfo.cs" />
-    <Compile Include="AssemblyVersionInfoCommon.cs" />
-    <Compile Include="Src\Bookmark.cs" />
-    <Compile Include="Src\BookmarkCollection.cs" />
-    <Compile Include="Src\Border.cs" />
-    <Compile Include="Src\Borders.cs" />
-    <Compile Include="Src\Charts\Axis.cs" />
-    <Compile Include="Src\Charts\BarChart.cs" />
-    <Compile Include="Src\Charts\Chart.cs" />
-    <Compile Include="Src\Charts\LineChart.cs" />
-    <Compile Include="Src\Charts\PieChart.cs" />
-    <Compile Include="Src\Charts\XElementHelpers.cs" />
-    <Compile Include="Src\Container.cs" />
-    <Compile Include="Src\Endnote.cs" />
-    <Compile Include="Src\ExtensionsHeadings.cs" />
-    <Compile Include="Src\Font.cs" />
-    <Compile Include="Src\Footers.cs" />
-    <Compile Include="Src\Footer.cs" />
-    <Compile Include="Src\CustomProperty.cs" />
-    <Compile Include="Src\DocProperty.cs" />
-    <Compile Include="Src\Footnote.cs" />
-    <Compile Include="Src\FormattedText.cs" />
-    <Compile Include="Src\Header.cs" />
-    <Compile Include="Src\Headers.cs" />
-    <Compile Include="Src\HelperFunctions.cs" />
-    <Compile Include="Src\Hyperlink.cs" />
-    <Compile Include="Src\IParagraphContainer.cs" />
-    <Compile Include="Src\List.cs" />
-    <Compile Include="Src\Note.cs" />
-    <Compile Include="Src\NoteProperties.cs" />
-    <Compile Include="Src\PackagePartStream.cs" />
-    <Compile Include="Src\PageLayout.cs" />
-    <Compile Include="Src\Section.cs" />
-    <Compile Include="Src\TableOfContents.cs" />
-    <Compile Include="Utils\Exceptions\ThrowException.cs" />
-    <Compile Include="Src\_BaseClasses.cs" />
-    <Compile Include="Src\Table.cs" />
-    <Compile Include="Src\_Enumerations.cs" />
-    <Compile Include="Src\Formatting.cs" />
-    <Compile Include="Src\Image.cs" />
-    <Compile Include="Src\Picture.cs" />
-    <Compile Include="Src\Paragraph.cs" />
-    <Compile Include="Src\Document.cs" />
-    <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="Src\_Extensions.cs">
-      <SubType>Code</SubType>
-    </Compile>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\default_styles.xml.gz" />
     <EmbeddedResource Include="Resources\styles.xml.gz" />
   </ItemGroup>
-  <ItemGroup>
-    <BootstrapperPackage Include="Microsoft.Net.Client.3.5">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1 Client Profile</ProductName>
-      <Install>false</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
-      <Visible>False</Visible>
-      <ProductName>.NET Framework 3.5 SP1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-    <BootstrapperPackage Include="Microsoft.Windows.Installer.3.1">
-      <Visible>False</Visible>
-      <ProductName>Windows Installer 3.1</ProductName>
-      <Install>true</Install>
-    </BootstrapperPackage>
-  </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="Resources\numbering.default_bullet_abstract.xml.gz" />
     <EmbeddedResource Include="Resources\numbering.default_decimal_abstract.xml.gz" />
@@ -164,12 +27,11 @@
   <ItemGroup>
     <EmbeddedResource Include="Resources\SignatureLine.emf" />
   </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
-       Other similar extension points exist, see Microsoft.Common.targets.
-  <Target Name="BeforeBuild">
-  </Target>
-  <Target Name="AfterBuild">
-  </Target>
-  -->
-</Project>
+  <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>

Xceed.Words.NET.Examples/Program.cs

@@ -19,11 +19,9 @@ namespace Xceed.Words.NET.Examples
 {
   public class Program
   {
-#if NETCORE || NET5
-    internal const string SampleDirectory = @"..\..\..\Samples\";
-#else
-    internal const string SampleDirectory = @"..\..\Samples\";
-#endif
+    internal static string SampleDirectory = System.IO.Path.Combine(
+      System.IO.Path.GetDirectoryName(Assembly.GetExecutingAssembly().Location), @"..\..\..\Samples\"
+    );
 
     private static void Main( string[] args )
     {

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
 

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
 

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
 

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
 

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
 

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