Samples - 项目配置调整和路径拼接问题

Demo/Examples/Samples/AnnotationImportExportTest/CS/AnnotationImportExportTest.csproj

@@ -25,8 +25,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+        <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         <Content Include="..\..\..\TestFile\Annotations.pdf">
@@ -52,7 +52,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/AnnotationImportExportTest/VB/AnnotationImportExportTest.vbproj

@@ -130,14 +130,14 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/AnnotationTest/CS/AnnotationTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
       <Content Include="..\..\..\TestFile\Annotations.pdf">
@@ -54,7 +54,7 @@
     </ItemGroup>
 
     <ItemGroup>
-      <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows_core\ComPDFKit\ComPDFKitCSharp\ComPDFKit.NET.csproj" />
+      <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.NET.csproj" />
   </ItemGroup>
 
     <ItemGroup>

Demo/Examples/Samples/AnnotationTest/VB/AnnotationTest.vbproj

@@ -146,14 +146,8 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows_core\ComPDFKit\ComPDFKitCSharp\ComPDFKit.NET.csproj">
-      <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
-      <Name>ComPDFKit.NET</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <ItemGroup>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -161,5 +155,11 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
+      <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
+      <Name>ComPDFKit.Net</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

Demo/Examples/Samples/BackgroundTest/CS/BackgroundTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -49,7 +49,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/BackgroundTest/VB/BackgroundTest.vbproj

@@ -135,8 +135,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -146,7 +146,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/BatesTest/CS/BatesTest.cs

@@ -87,7 +87,7 @@ namespace BatesTest
         /// <param name="document">Regular document</param> 
         private static bool AddBates(CPDFDocument document)
         {
-            string addBatesPath = outputPath + "\\AddBatesTest.pdf";
+            string addBatesPath = Path.Combine(outputPath, "AddBatesTest.pdf");
 
             CPDFBates bates = document.GetBates();
             byte[] color = { 255, 0, 0 };
@@ -140,7 +140,7 @@ namespace BatesTest
              
             Console.WriteLine("Change bates 0 done, new text is {0}", bates.GetText(0));
 
-            string editBatesPath = outputPath + "\\EditBatesTest.pdf";
+            string editBatesPath = Path.Combine(outputPath, "EditBatesTest.pdf");
 
             if (document.WriteToFilePath(editBatesPath))
             {
@@ -163,7 +163,7 @@ namespace BatesTest
 
             bates.Clear();
 
-            string clearBatesPath = outputPath + "\\ClearBatesTest.pdf";
+            string clearBatesPath = Path.Combine(outputPath, "ClearBatesTest.pdf");
 
             if (document.WriteToFilePath(clearBatesPath))
             {

Demo/Examples/Samples/BatesTest/CS/BatesTest.csproj

@@ -14,8 +14,8 @@
     </PropertyGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -40,7 +40,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/BatesTest/VB/BatesTest.vbproj

@@ -128,14 +128,14 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">

Demo/Examples/Samples/BookmarkTest/CS/BookmarkTest.cs

@@ -123,7 +123,7 @@ namespace BookmarkTest
                 return false;
             }
             Console.WriteLine("Add bookmark in page {0}. ", bookmark.PageIndex + 1);
-            string addBookmarkPath = outputPath + "//AddBookmarkTest.pdf";
+            string addBookmarkPath = Path.Combine(outputPath, "AddBookmarkTest.pdf");
             if (document.WriteToFilePath(addBookmarkPath))
             {
                 Console.WriteLine("Browse the changed file in " + addBookmarkPath);
@@ -146,7 +146,7 @@ namespace BookmarkTest
             {
                 return false;
             }
-            string removeBookmarkPath = outputPath + "//RemoveBookmarkTest.pdf";
+            string removeBookmarkPath = Path.Combine(outputPath, "RemoveBookmarkTest.pdf");
             if (document.WriteToFilePath(removeBookmarkPath))
             {
                 Console.WriteLine("Browse the changed file in " + removeBookmarkPath);

Demo/Examples/Samples/BookmarkTest/CS/BookmarkTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -41,7 +41,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/BookmarkTest/VB/BookmarkTest.vbproj

@@ -128,14 +128,14 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">

Demo/Examples/Samples/DigitalSignatureTest/CS/DigitalSignatureTest.cs

@@ -15,7 +15,7 @@ using ImageMagick;
 
 namespace DigitalSignatureTest
 {
-    internal class DigitalSignatureTest
+    internal class DigitalSignatureTestCertPathInPath
     {
         static private string parentPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory())));
         static private string outputPath = Path.Combine(parentPath, "Output", "CS");
@@ -185,7 +185,7 @@ namespace DigitalSignatureTest
                 signatureConfig.LogoHeight = image.Height;
                 signatureConfig.LogoWidth = image.Width;
             }
-            string filePath = outputPath + "\\" + document.FileName + "_Signed.pdf";
+            string filePath = Path.Combine(outputPath, document.FileName + "_Signed.pdf");
             signatureField.UpdataApWithSignature(signatureConfig);
             if (document.WriteSignatureToFilePath(signatureField,
                 filePath,
@@ -215,7 +215,7 @@ namespace DigitalSignatureTest
 
             CPDFSignature signature = document.GetSignatureList()[0];
             document.RemoveSignature(signature, true);
-            string filePath = outputPath + "\\" + document.FileName + "_RemovedSign.pdf";
+            string filePath = Path.Combine(outputPath, "" + document.FileName + "_RemovedSign.pdf");
             document.WriteToFilePath(filePath);
             Console.WriteLine("File saved in " + filePath);
 

Demo/Examples/Samples/DigitalSignatureTest/CS/DigitalSignatureTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -48,7 +48,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/DigitalSignatureTest/VB/DigitalSignatureTest.vbproj

@@ -130,8 +130,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -144,7 +144,7 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/DocumentCompare/CS/DocumentCompare.cs

@@ -7,7 +7,7 @@ namespace DocumentCompareTest
 {
     internal class DocumentCompare
     {
-        static private string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        private static string outputPath =Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) ?? string.Empty, "Output", "CS");
 
         static void Main(string[] args)
         {
@@ -59,7 +59,7 @@ namespace DocumentCompareTest
             CPDFCompareOverlay compareOverlay = new CPDFCompareOverlay(document1, "1-5", document2, "1-5");
             compareOverlay.Compare();
             CPDFDocument comparisonDocument = compareOverlay.ComparisonDocument();
-            string path = outputPath + "\\CompareDocumentTest.pdf";
+            string path = Path.Combine(outputPath, "CompareDocumentTest.pdf");
             if (!comparisonDocument.WriteToFilePath(path))
             {
                 return false;

Demo/Examples/Samples/DocumentCompare/CS/DocumentCompareTest.csproj

@@ -1,20 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+<Project Sdk="Microsoft.NET.Sdk">
+  
   <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{0BB38D20-C3CF-47D7-8E2E-97195672AB67}</ProjectGuid>
     <OutputType>Exe</OutputType>
-    <RootNamespace>DocumentCompare</RootNamespace>
+    <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
+    <TargetFrameworks>net7.0;net461</TargetFrameworks>
+    <LangVersion>7.3</LangVersion>
+    <Configurations>Release;Debug</Configurations>
+    <Platforms>AnyCPU;x64</Platforms>
     <AssemblyName>Samples_ComPDFKit</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <FileAlignment>512</FileAlignment>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-    <Deterministic>true</Deterministic>
-    <NuGetPackageImportStamp>
-    </NuGetPackageImportStamp>
   </PropertyGroup>
+  
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
     <DebugSymbols>true</DebugSymbols>
@@ -38,17 +33,10 @@
     <ApplicationIcon>ComPDFKit_Logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="PresentationFramework.Aero2, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\PresentationFramework.Aero2.1.0.1\lib\PresentationFramework.Aero2.dll</HintPath>
-    </Reference>
-    <Reference Include="System" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="Microsoft.CSharp" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="System.Xml" />
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
+      <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
+      <Name>ComPDFKit.Desk</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="..\..\LicenseKey.cs">
@@ -85,16 +73,9 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
     </Content>
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
-      <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
-      <Name>ComPDFKit.Desk</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

Demo/Examples/Samples/DocumentCompare/VB/DocumentCompareTest.vbproj

@@ -142,7 +142,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/DocumentCompareTest/CS/DocumentCompareTest.cs

@@ -7,7 +7,7 @@ namespace DocumentCompareTest
 {
     internal class DocumentCompare
     {
-        static private string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        static private string outputPath = Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) ?? string.Empty, "Output","CS");
 
         static void Main(string[] args)
         {
@@ -59,7 +59,7 @@ namespace DocumentCompareTest
             CPDFCompareOverlay compareOverlay = new CPDFCompareOverlay(document1, "1-5", document2, "1-5");
             compareOverlay.Compare();
             CPDFDocument comparisonDocument = compareOverlay.ComparisonDocument();
-            string path = outputPath + "\\CompareDocumentTest.pdf";
+            string path = Path.Combine(outputPath, "CompareDocumentTest.pdf";
             if (!comparisonDocument.WriteToFilePath(path))
             {
                 return false;

Demo/Examples/Samples/DocumentInfoTest/CS/DocumentInfoTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -41,7 +41,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/DocumentInfoTest/VB/DocumentInfoTest.vbproj

@@ -126,8 +126,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -137,7 +137,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/EncryptTest/CS/EncryptTest.cs

@@ -10,7 +10,7 @@ namespace EncryptTest
 {
     internal class EncryptTest
     {
-        static private string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        private static string outputPath =Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) ?? string.Empty, "Output", "CS");
         static private string userPassword = string.Empty;
         static private string ownerPassword = string.Empty;
 
@@ -125,7 +125,7 @@ namespace EncryptTest
         {
             CPDFDocumentEncryptionLevel encryptionLevel = CPDFDocumentEncryptionLevel.CPDFDocumentEncryptionLevelRC4;
             document.Encrypt(userPassword, ownerPassword, permissionsInfo, encryptionLevel);
-            string encryptPath = outputPath + "\\EncryptUseRC4Test.pdf";
+            string encryptPath = Path.Combine(outputPath, "EncryptUseRC4Test.pdf");
             if (!document.WriteToFilePath(encryptPath))
             {
                 return false;
@@ -151,7 +151,7 @@ namespace EncryptTest
         {
             CPDFDocumentEncryptionLevel encryptionLevel = CPDFDocumentEncryptionLevel.CPDFDocumentEncryptionLevelAES128;
             document.Encrypt(userPassword, ownerPassword, permissionsInfo, encryptionLevel);
-            string encryptPath = outputPath + "\\EncryptUseAES128Test.pdf";
+            string encryptPath = Path.Combine(outputPath, "EncryptUseAES128Test.pdf");
             if (!document.WriteToFilePath(encryptPath))
             {
                 return false;
@@ -177,7 +177,7 @@ namespace EncryptTest
         {
             CPDFDocumentEncryptionLevel encryptionLevel = CPDFDocumentEncryptionLevel.CPDFDocumentEncryptionLevelAES256;
             document.Encrypt(userPassword, ownerPassword, permissionsInfo, encryptionLevel);
-            string encryptPath = outputPath + "\\EncryptUseAES256Test.pdf";
+            string encryptPath = Path.Combine(outputPath, "EncryptUseAES256Test.pdf");
             if (!document.WriteToFilePath(encryptPath))
             {
                 return false;
@@ -203,7 +203,7 @@ namespace EncryptTest
         {
             CPDFDocumentEncryptionLevel encryptionLevel = CPDFDocumentEncryptionLevel.CPDFDocumentEncryptionLevelNoEncryptAlgo;
             document.Encrypt(userPassword, ownerPassword, permissionsInfo, encryptionLevel);
-            string encryptPath = outputPath + "\\EncryptUseNoEncryptAlgoTest.pdf";
+            string encryptPath = Path.Combine(outputPath, "EncryptUseNoEncryptAlgoTest.pdf");
             if (!document.WriteToFilePath(encryptPath))
             {
                 return false;
@@ -295,7 +295,7 @@ namespace EncryptTest
             permissionsInfo.AllowsCopying = false;
             CPDFDocumentEncryptionLevel encryptionLevel = CPDFDocumentEncryptionLevel.CPDFDocumentEncryptionLevelRC4;
             document.Encrypt(userPassword, ownerPassword, permissionsInfo, encryptionLevel);
-            string encryptPath = outputPath + "\\EncryptByOwnerPasswordTest.pdf";
+            string encryptPath = Path.Combine(outputPath, "EncryptByOwnerPasswordTest.pdf");
             if (!document.WriteToFilePath(encryptPath))
             {
                 return false;
@@ -331,7 +331,7 @@ namespace EncryptTest
             permissionsInfo.AllowsCopying = false;
             CPDFDocumentEncryptionLevel encryptionLevel = CPDFDocumentEncryptionLevel.CPDFDocumentEncryptionLevelRC4;
             document.Encrypt(userPassword, ownerPassword, permissionsInfo, encryptionLevel);
-            string encryptPath = outputPath + "\\EncryptByAllPasswordsTest.pdf";
+            string encryptPath = Path.Combine(outputPath, "EncryptByAllPasswordsTest.pdf");
             if (!document.WriteToFilePath(encryptPath))
             {
                 return false;
@@ -396,7 +396,7 @@ namespace EncryptTest
         {
             userPassword = "User";
             ownerPassword = "Owner";
-            string decryptPath = outputPath + "\\DecryptTest.pdf";
+            string decryptPath = Path.Combine(outputPath, "DecryptTest.pdf");
             document.UnlockWithPassword(userPassword);
             if (!document.Decrypt(decryptPath))
             {

Demo/Examples/Samples/EncryptTest/CS/EncryptTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -44,7 +44,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/EncryptTest/VB/EncryptTest.vbproj

@@ -130,8 +130,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -141,7 +141,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/FlattenTest/CS/FlattenTest.cs

@@ -7,7 +7,7 @@ namespace FlattenTest
 {
     internal class FlattenTest
     {
-        static private string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        private static string outputPath =Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) ?? string.Empty, "Output", "CS");
         static void Main(string[] args)
         {
             #region Perparation work
@@ -56,7 +56,7 @@ namespace FlattenTest
                 annotationCount += page.GetAnnotCount();
             }
             Console.Write("{0} annotations in the file. ", annotationCount);
-            string flattenPath = outputPath + "\\FlattenTest.pdf";
+            string flattenPath = Path.Combine(outputPath, "FlattenTest.pdf");
             if (!document.WriteFlattenToFilePath(flattenPath))
             {
                 return false;

Demo/Examples/Samples/FlattenTest/CS/FlattenTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -45,7 +45,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/FlattenTest/VB/FlattenTest.vbproj

@@ -125,8 +125,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -136,7 +136,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/HeaderFooterTest/CS/HeaderFooterTest.cs

@@ -7,7 +7,7 @@ namespace HeaderFooterTest
 {
     internal class HeaderFooterTest
     {
-        private static string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        private static string outputPath = Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(Directory.GetCurrentDirectory()))) ?? string.Empty, "Output", "CS");
 
         private static Dictionary<int, string> IntToLocationDic = new Dictionary<int, string>()
         {
@@ -107,7 +107,7 @@ namespace HeaderFooterTest
 
             headerFooter.Update();
 
-            string addHeaderFooterPath = outputPath + "\\AddCommonHeaderFooterTest.pdf";
+            string addHeaderFooterPath = Path.Combine(outputPath, "AddCommonHeaderFooterTest.pdf");
 
             if (!document.WriteToFilePath(addHeaderFooterPath))
             {
@@ -138,7 +138,7 @@ namespace HeaderFooterTest
 
             headerFooter.Update();
 
-            string addHeaderFooterPath = outputPath + "\\AddPageHeaderFooterTest.pdf";
+            string addHeaderFooterPath = Path.Combine(outputPath, "AddPageHeaderFooterTest.pdf");
 
             if (document.WriteToFilePath(addHeaderFooterPath))
             {
@@ -175,7 +175,7 @@ namespace HeaderFooterTest
 
             Console.WriteLine("Change head and footer 0 succeeded, new text is {0}", headerFooter.GetText(0));
 
-            string editHeaderFooterPath = outputPath + "\\EditHeaderFooterTest.pdf";
+            string editHeaderFooterPath = Path.Combine(outputPath, "EditHeaderFooterTest.pdf");
 
             if (document.WriteToFilePath(editHeaderFooterPath))
             {
@@ -194,7 +194,7 @@ namespace HeaderFooterTest
 
             headerFooter.Clear();
 
-            string clearHeaderFooterPath = outputPath + "\\ClearHeaderFooterTest.pdf";
+            string clearHeaderFooterPath = Path.Combine(outputPath, "ClearHeaderFooterTest.pdf");
 
             if (document.WriteToFilePath(clearHeaderFooterPath))
             {

Demo/Examples/Samples/HeaderFooterTest/CS/HeaderFooterTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -41,7 +41,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/HeaderFooterTest/VB/HeaderFooterTest.vbproj

@@ -123,8 +123,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -134,7 +134,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/ImageExtractTest/CS/ImageExtractTest.cs

@@ -6,7 +6,7 @@ namespace ImageExtractTest
 {
     internal class ImageExtractTest
     {
-        static private string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        private static string outputPath =Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) ?? string.Empty, "Output", "CS");
 
         static void Main(string[] args)
         {

Demo/Examples/Samples/ImageExtractTest/CS/ImageExtractTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -41,7 +41,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/ImageExtractTest/VB/ImageExtractTest.vbproj

@@ -126,8 +126,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -137,7 +137,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/InteractiveFormsTest/CS/InteractiveFormsTest.cs

@@ -16,7 +16,7 @@ namespace InteractiveFormsTest
 {
     internal class InteractiveFormsTest
     {
-        static private string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        private static string outputPath =Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) ?? string.Empty, "Output", "CS");
           
         static void Main(string[] args)
         {
@@ -184,7 +184,7 @@ namespace InteractiveFormsTest
             CreateRadioButton(document);
 
             // Save to pointed path so you can observe the effect.
-            string path = outputPath + "\\CreateFormsTest.pdf";
+            string path = Path.Combine(outputPath, "CreateFormsTest.pdf");
 
             if (!document.WriteToFilePath(path)) 
             {

Demo/Examples/Samples/InteractiveFormsTest/CS/InteractiveFormsTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -42,7 +42,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/InteractiveFormsTest/VB/InteractiveFormsTest.vbproj

@@ -125,8 +125,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -136,7 +136,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/OutlineTest/CS/OutlineTest.cs

@@ -8,7 +8,7 @@ namespace OutlineTest
 {
     internal class OutlineTest
     {
-        static private string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        private static string outputPath =Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) ?? string.Empty, "Output", "CS");
         static private int outlineCounter = 0;
         static private int outlineNumber = 0;
 
@@ -177,7 +177,7 @@ namespace OutlineTest
             CPDFOutline targetOutline = document.GetOutlineList()[1];
             targetOutline.MoveChildAtIndex(document, outline, targetOutline.ChildList.Count);
 
-            string path = outputPath + "\\MoveOutlineTest.pdf";
+            string path = Path.Combine(outputPath, "MoveOutlineTest.pdf");
             if (!document.WriteToFilePath(path))
             {
                 return false;
@@ -194,7 +194,7 @@ namespace OutlineTest
         { 
             document.GetOutlineList()[0].RemoveFromParent(document);
 
-            string path = outputPath + "\\RemoveOutlineTest.pdf";
+            string path = Path.Combine(outputPath, "RemoveOutlineTest.pdf");
             if (!document.WriteToFilePath(path))
             {
                 return false;

Demo/Examples/Samples/OutlineTest/CS/OutlineTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -45,7 +45,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/OutlineTest/VB/OutlineTest.vbproj

@@ -125,8 +125,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -136,7 +136,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/PDFATest/CS/PDFATest.cs

@@ -6,7 +6,7 @@ namespace PDFATest
 {
     internal class PDFATest
     {
-        static private string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        private static string outputPath =Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) ?? string.Empty, "Output", "CS");
 
         static void Main(string[] args)
         {
@@ -69,7 +69,7 @@ namespace PDFATest
         /// <param name="document">Regular document</param> 
         static public bool CovertToPDFA1a(CPDFDocument document)
         {
-            string convertToPDFA1aPath = outputPath + "\\ConvertToPDFA1aTest.pdf";
+            string convertToPDFA1aPath = Path.Combine(outputPath, "ConvertToPDFA1aTest.pdf");
             if (!document.WritePDFAToFilePath(CPDFType.CPDFTypePDFA1a, convertToPDFA1aPath))
             {
                 return false;
@@ -84,7 +84,7 @@ namespace PDFATest
         /// <param name="document">Regular document</param> 
         static public bool CovertToPDFA1b(CPDFDocument document)
         {
-            string convertToPDFA1bPath = outputPath + "\\ConvertToPDFA1bTest.pdf";
+            string convertToPDFA1bPath = Path.Combine(outputPath, "ConvertToPDFA1bTest.pdf");
             if (!document.WritePDFAToFilePath(CPDFType.CPDFTypePDFA1b, convertToPDFA1bPath))
             {
                 return false;

Demo/Examples/Samples/PDFATest/CS/PDFATest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -42,7 +42,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/PDFATest/VB/PDFATest.vbproj

@@ -125,8 +125,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -136,7 +136,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/PDFPageTest/CS/PDFPageTest.cs

@@ -11,7 +11,7 @@ namespace PDFPageTest
 {
     internal class PDFPageTest
     {
-        static private string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        private static string outputPath =Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) ?? string.Empty, "Output", "CS");
         static void Main(string[] args)
         {
             #region Perparation work
@@ -156,7 +156,7 @@ namespace PDFPageTest
             Console.WriteLine("Insert PageIndex: {0}", pageIndex);
             Console.WriteLine("Size: {0}*{1}", pageWidth, pageHeight);
 
-            string path = outputPath + "\\InsertBlankPageTest.pdf";
+            string path = Path.Combine(outputPath, "InsertBlankPageTest.pdf");
             if (!document.WriteToFilePath(path))
             {
                 return false;
@@ -174,7 +174,7 @@ namespace PDFPageTest
             CPDFDocument documentForInsert = CPDFDocument.InitWithFilePath("Text.pdf");
             document.ImportPagesAtIndex(documentForInsert, "1", 1);
 
-            string path = outputPath + "\\InsertPDFPPageTest.pdf";
+            string path = Path.Combine(outputPath, "InsertPDFPPageTest.pdf");
             if (!document.WriteToFilePath(path))
             {
                 return false;
@@ -193,7 +193,7 @@ namespace PDFPageTest
             CPDFDocument documentPart1 = CPDFDocument.CreateDocument();
             documentPart1.ImportPagesAtIndex(document, "1-2", 0);
 
-            string pathPart1 = outputPath + "\\SplitPart1Test.pdf";
+            string pathPart1 = Path.Combine(outputPath, "SplitPart1Test.pdf");
             if (!documentPart1.WriteToFilePath(pathPart1))
             {
                 return false;
@@ -204,7 +204,7 @@ namespace PDFPageTest
             CPDFDocument documentPart2 = CPDFDocument.CreateDocument();
             documentPart2.ImportPagesAtIndex(document, "3-5", 0);
 
-            string pathPart2 = outputPath + "\\SplitPart2Test.pdf";
+            string pathPart2 = Path.Combine(outputPath, "SplitPart2Test.pdf");
             if (!documentPart2.WriteToFilePath(pathPart2))
             {
                 return false;
@@ -229,7 +229,7 @@ namespace PDFPageTest
             document.RemovePages(pageNumbersToRemove.ToArray());
              
 
-            string path = outputPath + "\\RemoveEvenPagesTest.pdf";
+            string path = Path.Combine(outputPath, "RemoveEvenPagesTest.pdf");
             if (!document.WriteToFilePath(path))
             {
                 return false;
@@ -245,7 +245,7 @@ namespace PDFPageTest
         static private bool RotatePage(CPDFDocument document)
         {
             document.RotatePage(0, 1);//Rotation: Rotate 90 degrees per unit
-            string path = outputPath + "\\RotatePageTest.pdf";
+            string path = Path.Combine(outputPath, "RotatePageTest.pdf");
             if (!document.WriteToFilePath(path))
             {
                 return false;
@@ -266,7 +266,7 @@ namespace PDFPageTest
             document.RemovePages(pageList.ToArray());
             CPDFDocument documentForInsert = CPDFDocument.InitWithFilePath("Text.pdf");
             document.ImportPagesAtIndex(documentForInsert, "1", 0);
-            string path = outputPath + "\\RepalcePagesTest.pdf";
+            string path = Path.Combine(outputPath, "RepalcePagesTest.pdf");
             if (!document.WriteToFilePath(path))
             {
                 return false;
@@ -285,7 +285,7 @@ namespace PDFPageTest
         {
             CPDFDocument extractDocument = CPDFDocument.CreateDocument();
             extractDocument.ImportPagesAtIndex(document, "1", 0);
-            string path = outputPath + "\\ExtractPagesTest.pdf";
+            string path = Path.Combine(outputPath, "ExtractPagesTest.pdf");
             if (!extractDocument.WriteToFilePath(path))
             {
                 return false;

Demo/Examples/Samples/PDFPageTest/CS/PDFPageTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -46,7 +46,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/PDFPageTest/VB/PDFPageTest.vbproj

@@ -129,8 +129,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -140,7 +140,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/PDFRedactTest/CS/PDFRedactTest.cs

@@ -10,7 +10,7 @@ namespace PDFRedactTest
 {
     internal class PDFRedactTest
     {
-        static private string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        private static string outputPath =Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) ?? string.Empty, "Output", "CS");
         static void Main(string[] args)
         {
             #region Perparation work
@@ -79,7 +79,7 @@ namespace PDFRedactTest
             redact.UpdateAp();
             document.ApplyRedaction();
             // Save to pointed path so you can observe the effect.
-            string path = outputPath + "\\RedactTest.pdf";
+            string path = Path.Combine(outputPath, "RedactTest.pdf");
             if (!document.WriteToFilePath(path))
             {
                 return false;

Demo/Examples/Samples/PDFRedactTest/CS/PDFRedactTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -42,7 +42,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/PDFRedactTest/VB/PDFRedactTest.vbproj

@@ -126,8 +126,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -137,7 +137,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/PDFToImage/CS/PDFToImage.cs

@@ -58,7 +58,7 @@ namespace PDFToImageTest
                 CRect pageRect = new CRect(0, (int)(pageSize.Height / 72.0 * 96), (int)(pageSize.Width / 72.0 * 96), 0);
                 byte[] bmpData = new byte[(int)(pageRect.width() * pageRect.height() * (96 / 72.0) * (96 / 72.0) * 4)];
                 pdfPage.RenderPageBitmapWithMatrix((float)(96 / 72.0), pageRect, 0xFFFFFFFF, bmpData, 0, true);
-                var path = outputPath + @"\PDFToImageTest" + i + ".png";
+                var path = Path.Combine(outputPath, "PDFToImageTest" + i + ".png");
 
                 var settings = new MagickReadSettings()
                 {

Demo/Examples/Samples/PDFToImage/CS/PDFToImageTest.csproj

@@ -83,14 +83,14 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/PDFToImage/VB/PDFToImageTest.vbproj

@@ -128,14 +128,14 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/PDFToImageTest/CS/PDFToImageTest.cs

@@ -72,7 +72,7 @@ namespace PDFToImageTest
                 WriteableBitmap writeableBitmap = new WriteableBitmap((int)pageRect.width(), (int)pageRect.height(), 96, 96, PixelFormats.Bgra32, null);
 
                 writeableBitmap.WritePixels(new Int32Rect(0, 0, (int)pageRect.width(), (int)pageRect.height()), bmpData, writeableBitmap.BackBufferStride, 0);
-                var path = outputPath + @"\PDFToImageTest" + i + ".png";
+                var path = Path.Combine(outputPath, "PDFToImageTest" + i + ".png");
                 SaveWriteableBitmapAsPng(writeableBitmap, path);
                 Console.WriteLine("Png image saved in {0}", path);
             }

Demo/Examples/Samples/TextExtractTest/CS/TextExtractTest.cs

@@ -7,8 +7,8 @@ namespace TextExtractTest
     internal class TextExtractTest
     {
         private static string parentPath =
-            Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory())));
-        private static string outputPath = parentPath + "\\Output\\CS";
+            Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(Directory.GetCurrentDirectory())));
+        private static string outputPath = Path.Combine(parentPath, "Output", "CS");
         static void Main(string[] args)
         {
             #region Perparation work
@@ -40,7 +40,7 @@ namespace TextExtractTest
         //
         static private bool PDFToText(CPDFDocument document)
         {
-            string path = outputPath + "//PDFToText.txt";
+            string path = Path.Combine(outputPath, "PDFToText.txt");
             if (!document.PdfToText("1-" + document.PageCount.ToString(), path))//Page ranges are counted from 1
             {
                 return false;

Demo/Examples/Samples/TextExtractTest/CS/TextExtractTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -42,7 +42,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/TextExtractTest/VB/TextExtractTest.vbproj

@@ -125,8 +125,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -136,7 +136,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/TextSearchTest/CS/TextSearchTest.cs

@@ -12,8 +12,8 @@ namespace TextSearchTest
     internal class TextSearch
     {
         private static string parentPath =
-            Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory())));
-        private static string outputPath = parentPath + "\\Output\\CS";
+            Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(Directory.GetCurrentDirectory())));
+        private static string outputPath = Path.Combine(parentPath, "Output", "CS");
         static void Main(string[] args)
         {
             #region Perparation work
@@ -106,7 +106,7 @@ namespace TextSearchTest
             //Highlight the first result
             HighlightTheFirstResult(page, rects[0]);
 
-            string path = outputPath + "\\HighlightFirstTest.pdf";
+            string path = Path.Combine(outputPath, "HighlightFirstTest.pdf");
             if (!document.WriteToFilePath(path))
             {
                 return false;

Demo/Examples/Samples/TextSearchTest/CS/TextSearchTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -42,7 +42,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/TextSearchTest/VB/TextSearchTest.vbproj

@@ -127,8 +127,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -138,7 +138,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/UrlLoadTest/UrlLoadTest.csproj

@@ -21,7 +21,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <None Remove="C:\Users\holee\.nuget\packages\compdfkit.netframework\1.10.0\build\x64\ComPDFKit.dll" />
+    <None Remove="C:\Users\holee\.nuget\packages\compdfkit.netframework\1.10.0\build\x64\ComPDFKitNative.dll" />
   </ItemGroup>
 
   <ItemGroup>

Demo/Examples/Samples/WatermarkTest/CS/WatermarkTest.cs

@@ -11,7 +11,7 @@ namespace WatermarkTest
 {
     internal class WatermarkTest
     {
-        static private string outputPath = Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) + "\\Output\\CS";
+        private static string outputPath =Path.Combine(Path.GetDirectoryName(Path.GetDirectoryName(Path.GetDirectoryName(System.IO.Directory.GetCurrentDirectory()))) ?? string.Empty, "Output", "CS");
         static void Main(string[] args)
         {
             #region Perparation work
@@ -109,7 +109,7 @@ namespace WatermarkTest
             watermark.SetVerticalSpacing(10);
             watermark.SetHorizontalSpacing(10);
             watermark.CreateWatermark();
-            string path = outputPath + "\\AddTextWatermarkTest.pdf";
+            string path = Path.Combine(outputPath, "AddTextWatermarkTest.pdf");
             if (!document.WriteToFilePath(path))
             {
                 return false;
@@ -147,7 +147,7 @@ namespace WatermarkTest
             watermark.SetHorizontalSpacing(10);
             watermark.CreateWatermark();
 
-            string path = outputPath + "\\AddImageWatermarkTest.pdf";
+            string path = Path.Combine(outputPath, "AddImageWatermarkTest.pdf");
             if (!document.WriteToFilePath(path))
             {
                 return false;
@@ -163,7 +163,7 @@ namespace WatermarkTest
         static private bool DeleteWatermark(CPDFDocument watermarkDocument)
         {
             watermarkDocument.DeleteWatermarks();
-            string path = outputPath + "\\DeleteWatermarkTest.pdf";
+            string path = Path.Combine(outputPath, "DeleteWatermarkTest.pdf");
             if (!watermarkDocument.WriteToFilePath(path))
             {
                 return false;

Demo/Examples/Samples/WatermarkTest/CS/WatermarkTest.csproj

@@ -21,8 +21,8 @@
     </ItemGroup>
 
     <ItemGroup>
-      <Content Include="..\..\..\..\..\..\x64\ComPDFKit.dll">
-          <Link>x64\ComPDFKit.dll</Link>
+      <Content Include="..\..\..\..\..\..\x64\ComPDFKitNative.dll">
+          <Link>x64\ComPDFKitNative.dll</Link>
           <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
         </Content>
         
@@ -47,7 +47,7 @@
     </ItemGroup>
 
     <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>

Demo/Examples/Samples/WatermarkTest/VB/WatermarkTest.vbproj

@@ -134,8 +134,8 @@
       <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKit.dll">
-      <Link>x64\ComPDFKit.dll</Link>
+    <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x64\ComPDFKitNative.dll">
+      <Link>x64\ComPDFKitNative.dll</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Content Include="..\..\..\packages\ComPDFKit.NetFramework.1.11.0\build\x86\ComPDFKit.dll">
@@ -145,7 +145,7 @@
     <Content Include="ComPDFKit_Logo.ico" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
+    <ProjectReference Include="..\..\..\..\..\..\compdfkit_windows\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Net.csproj">
       <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
       <Name>ComPDFKit.Desk</Name>
     </ProjectReference>