Browse Source

compdfkit(win) - 更换密钥和验证方式、更改项目信息,去除对sdk源代码依赖

liuaoran 1 year ago
parent
commit
51668f601e
88 changed files with 462 additions and 603 deletions
  1. 1 1
      Demo/Examples/Annotations/Annotations.csproj
  2. 2 26
      Demo/Examples/Annotations/App.xaml.cs
  3. 8 38
      Demo/Examples/Annotations/Properties/AssemblyInfo.cs
  4. 27 0
      Demo/Examples/Compdfkit_Tools/Common/Helper/CommonHelper.cs
  5. 0 2
      Demo/Examples/Compdfkit_Tools/PDFView/PDFViewControl/PDFViewControl.xaml.cs
  6. 1 1
      Demo/Examples/Compdfkit_Tools/PageEdit/PDFPageEdit/CPDFPageEditControl.xaml
  7. 2 2
      Demo/Examples/Compdfkit_Tools/Properties/AssemblyInfo.cs
  8. 2 22
      Demo/Examples/ContentEditor/App.xaml.cs
  9. 1 1
      Demo/Examples/ContentEditor/ContentEditor.csproj
  10. 7 38
      Demo/Examples/ContentEditor/Properties/AssemblyInfo.cs
  11. 2 23
      Demo/Examples/DocsEditor/App.xaml.cs
  12. 1 1
      Demo/Examples/DocsEditor/DocsEditor.csproj
  13. 8 38
      Demo/Examples/DocsEditor/Properties/AssemblyInfo.cs
  14. 1 29
      Demo/Examples/Examlpes.sln
  15. 2 22
      Demo/Examples/Forms/App.xaml.cs
  16. 1 1
      Demo/Examples/Forms/Forms.csproj
  17. 8 38
      Demo/Examples/Forms/Properties/AssemblyInfo.cs
  18. 2 2
      Demo/Examples/PDFATest/PDFATest.csproj
  19. 2 28
      Demo/Examples/PDFViewer/App.xaml.cs
  20. BIN
      Demo/Examples/PDFViewer/ComPDFKit.Desk.dll
  21. BIN
      Demo/Examples/PDFViewer/ComPDFKit.Viewer.dll
  22. 7 9
      Demo/Examples/PDFViewer/PDFViewer.csproj
  23. 2 2
      Demo/Examples/PDFViewer/Properties/AssemblyInfo.cs
  24. 1 5
      Demo/Examples/Samples/AnnotationImportExportTest/AnnotationImportExportTest.cs
  25. 49 3
      Demo/Examples/Samples/AnnotationImportExportTest/AnnotationImportExportTest.csproj
  26. 3 3
      Demo/Examples/Samples/AnnotationImportExportTest/App.config
  27. 3 3
      Demo/Examples/Samples/AnnotationImportExportTest/Properties/AssemblyInfo.cs
  28. 0 4
      Demo/Examples/Samples/AnnotationTest/AnnotationTest.cs
  29. 30 3
      Demo/Examples/Samples/AnnotationTest/AnnotationTest.csproj
  30. 3 3
      Demo/Examples/Samples/AnnotationTest/Properties/AssemblyInfo.cs
  31. 2 11
      Demo/Examples/Samples/BackgroundTest/BackgroundTest.cs
  32. 29 2
      Demo/Examples/Samples/BackgroundTest/BackgroundTest.csproj
  33. 3 3
      Demo/Examples/Samples/BackgroundTest/Properties/AssemblyInfo.cs
  34. 8 6
      Demo/Examples/Samples/BatesTest/BatesTest.cs
  35. 2 2
      Demo/Examples/Samples/BatesTest/BatesTest.csproj
  36. 1 1
      Demo/Examples/Samples/BatesTest/LicenseKey.cs
  37. 3 3
      Demo/Examples/Samples/BatesTest/Properties/AssemblyInfo.cs
  38. 33 14
      Demo/Examples/Samples/BookmarkTest/BookmarkTest.cs
  39. 3 3
      Demo/Examples/Samples/BookmarkTest/BookmarkTest.csproj
  40. 3 3
      Demo/Examples/Samples/BookmarkTest/Properties/AssemblyInfo.cs
  41. 5 9
      Demo/Examples/Samples/DocumentCompare/DocumentCompare.cs
  42. 3 3
      Demo/Examples/Samples/DocumentCompare/DocumentCompareTest.csproj
  43. 3 3
      Demo/Examples/Samples/DocumentCompare/Properties/AssemblyInfo.cs
  44. 30 3
      Demo/Examples/Samples/DocumentInfoTest/DocumentInfoTest.csproj
  45. 3 3
      Demo/Examples/Samples/DocumentInfoTest/Properties/AssemblyInfo.cs
  46. 9 13
      Demo/Examples/Samples/EncryptTest/EncryptTest.csproj
  47. 3 3
      Demo/Examples/Samples/EncryptTest/Properties/AssemblyInfo.cs
  48. 1 5
      Demo/Examples/Samples/FlattenTest/FlattenTest.cs
  49. 3 3
      Demo/Examples/Samples/FlattenTest/FlattenTest.csproj
  50. 3 3
      Demo/Examples/Samples/FlattenTest/Properties/AssemblyInfo.cs
  51. 0 6
      Demo/Examples/Samples/HeaderFooterTest/HeaderFooterTest.cs
  52. 2 2
      Demo/Examples/Samples/HeaderFooterTest/HeaderFooterTest.csproj
  53. 5 5
      Demo/Examples/Samples/HeaderFooterTest/Properties/AssemblyInfo.cs
  54. 1 10
      Demo/Examples/Samples/ImageExtractTest/ImageExtractTest.cs
  55. 3 3
      Demo/Examples/Samples/ImageExtractTest/ImageExtractTest.csproj
  56. 3 3
      Demo/Examples/Samples/ImageExtractTest/Properties/AssemblyInfo.cs
  57. 24 0
      Demo/Examples/Samples/InteractiveFormsTest/InteractiveFormsTest.cs
  58. 3 3
      Demo/Examples/Samples/InteractiveFormsTest/InteractiveFormsTest.csproj
  59. 3 3
      Demo/Examples/Samples/InteractiveFormsTest/Properties/AssemblyInfo.cs
  60. 20 20
      Demo/Examples/Samples/LicenseKey.cs
  61. 2 8
      Demo/Examples/Samples/OutlineTest/OutlineTest.cs
  62. 3 3
      Demo/Examples/Samples/OutlineTest/OutlineTest.csproj
  63. 3 3
      Demo/Examples/Samples/OutlineTest/Properties/AssemblyInfo.cs
  64. 1 5
      Demo/Examples/Samples/PDFATest/PDFATest.cs
  65. 3 3
      Demo/Examples/Samples/PDFATest/PDFATest.csproj
  66. 3 3
      Demo/Examples/Samples/PDFATest/Properties/AssemblyInfo.cs
  67. 3 3
      Demo/Examples/Samples/PDFPageTest/PDFPageTest.csproj
  68. 3 3
      Demo/Examples/Samples/PDFPageTest/Properties/AssemblyInfo.cs
  69. 2 2
      Demo/Examples/Samples/PDFRedactTest/PDFRedactTest.csproj
  70. 3 3
      Demo/Examples/Samples/PDFRedactTest/Properties/AssemblyInfo.cs
  71. 3 0
      Demo/Examples/Samples/PDFToImage/PDFToImage.cs
  72. 3 3
      Demo/Examples/Samples/PDFToImage/PDFToImageTest.csproj
  73. 3 3
      Demo/Examples/Samples/PDFToImage/Properties/AssemblyInfo.cs
  74. 3 3
      Demo/Examples/Samples/TextExtractTest/Properties/AssemblyInfo.cs
  75. 0 4
      Demo/Examples/Samples/TextExtractTest/TextExtractTest.cs
  76. 3 3
      Demo/Examples/Samples/TextExtractTest/TextExtractTest.csproj
  77. 3 3
      Demo/Examples/Samples/TextSearchTest/Properties/AssemblyInfo.cs
  78. 1 4
      Demo/Examples/Samples/TextSearchTest/TextSearch.cs
  79. 3 3
      Demo/Examples/Samples/TextSearchTest/TextSearchTest.csproj
  80. 3 3
      Demo/Examples/Samples/WatermarkTest/Properties/AssemblyInfo.cs
  81. 1 7
      Demo/Examples/Samples/WatermarkTest/WatermarkTest.cs
  82. 4 3
      Demo/Examples/Samples/WatermarkTest/WatermarkTest.csproj
  83. 5 22
      Demo/Examples/Viewer/App.xaml.cs
  84. 2 2
      Demo/Examples/Viewer/Properties/AssemblyInfo.cs
  85. 1 1
      Demo/Examples/Viewer/Viewer.csproj
  86. 0 4
      Demo/Examples/license_key_win.xml
  87. 8 0
      Demo/Examples/license_key_windows.xml
  88. BIN
      Demo/Examples/packages/ComPDFKit.NetFramework.1.9.0/lib/ComPDFKit.Viewer.dll

+ 1 - 1
Demo/Examples/Annotations/Annotations.csproj

@@ -117,7 +117,7 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="ComPDFKit_Logo.ico" />
-    <Content Include="..\license_key_win.xml">
+    <Content Include="..\license_key_windows.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

+ 2 - 26
Demo/Examples/Annotations/App.xaml.cs

@@ -1,4 +1,5 @@
 using ComPDFKit.NativeMethod;
+using Compdfkit_Tools.Helper;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -12,29 +13,6 @@ using static ComPDFKit.NativeMethod.CPDFSDKVerifier;
 
 namespace annotation_ctrl_demo
 {
-    public class SDKLicenseHelper
-    {
-        public string key = string.Empty;
-        public string secret = string.Empty;
-        public SDKLicenseHelper()
-        {
-
-            string sdkLicensePath = "license_key_win.xml";
-            Assembly assembly = Assembly.GetExecutingAssembly();
-            XmlDocument xmlDocument = new XmlDocument();
-            xmlDocument.Load(sdkLicensePath);
-            var node = xmlDocument.SelectSingleNode("License");
-            if (node != null)
-            {
-                key = node.Attributes["key"].Value;
-                secret = node.Attributes["secret"].Value;
-            }
-        }
-
-    }
-    /// <summary>
-    /// App.xaml 的交互逻辑
-    /// </summary>
     public partial class App : Application
     {
         protected override void OnStartup(StartupEventArgs e)
@@ -46,9 +24,7 @@ namespace annotation_ctrl_demo
 
         private static bool LicenseVerify()
         {
-            bool result = false;
-
-            result = CPDFSDKVerifier.LoadNativeLibrary();
+            bool result = LoadNativeLibrary();
             if (!result)
                 return false;
             SDKLicenseHelper sdkLicenseHelper = new SDKLicenseHelper();

+ 8 - 38
Demo/Examples/Annotations/Properties/AssemblyInfo.cs

@@ -3,10 +3,7 @@ using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
+ 
 [assembly: AssemblyTitle("Annotations_ComPDFKit")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -15,41 +12,14 @@ using System.Windows;
 [assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
-//请将此类型的 ComVisible 特性设置为 true。
+ 
 [assembly: ComVisible(false)]
-
-//若要开始生成可本地化的应用程序,请设置
-//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
-//例如,如果您在源文件中使用的是美国英语,
-//使用的是美国英语,请将 <UICulture> 设置为 en-US。  然后取消
-//对以下 NeutralResourceLanguage 特性的注释。  更新
-//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
+ 
 
 [assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //主题特定资源词典所处位置
-                                     //(未在页面中找到资源时使用,
-                                     //或应用程序资源字典中找到时使用)
-    ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
-                                              //(未在页面中找到资源时使用,
-                                              //、应用程序或任何主题专用资源字典中找到时使用)
+    ResourceDictionaryLocation.None,  
+    ResourceDictionaryLocation.SourceAssembly  
 )]
-
-
-// 程序集的版本信息由下列四个值组成: 
-//
-//      主版本
-//      次版本
-//      生成号
-//      修订号
-//
-//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
-//通过使用 "*",如下所示:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
+ 
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 27 - 0
Demo/Examples/Compdfkit_Tools/Common/Helper/CommonHelper.cs

@@ -8,9 +8,36 @@ using System.Reflection;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
+using System.Xml;
 
 namespace Compdfkit_Tools.Helper
 {
+    public class SDKLicenseHelper
+    {
+        public string key = string.Empty;
+        public string secret = string.Empty;
+        public SDKLicenseHelper()
+        {
+            string sdkLicensePath = "license_key_windows.xml";
+            XmlDocument xmlDocument = new XmlDocument();
+            xmlDocument.Load(sdkLicensePath);
+
+            XmlNode keyNode = xmlDocument.SelectSingleNode("/license/key");
+            XmlNode secretNode = xmlDocument.SelectSingleNode("/license/secret");
+
+            if (keyNode != null && secretNode != null)
+            {
+                key = keyNode.InnerText;
+                secret = secretNode.InnerText;
+
+            }
+            else
+            {
+                Console.WriteLine("Key or secret element not found in the XML.");
+            }
+        }
+    }
+
     public static class CommonHelper
     {
         /// <summary>

+ 0 - 2
Demo/Examples/Compdfkit_Tools/PDFView/PDFViewControl/PDFViewControl.xaml.cs

@@ -167,8 +167,6 @@ namespace Compdfkit_Tools.PDFControl
                         break;
                 }
             }
-
-
         }
 
         private void PDFView_MouseWheelZoomHandler(object sender, bool e)

+ 1 - 1
Demo/Examples/Compdfkit_Tools/PageEdit/PDFPageEdit/CPDFPageEditControl.xaml

@@ -75,7 +75,7 @@
                  VirtualizingPanel.VirtualizationMode="Standard"
                  VirtualizingPanel.CacheLengthUnit="Page"
                  VirtualizingPanel.CacheLength="1"
-                 VirtualizingPanel.ScrollUnit="Pixel"  
+                 VirtualizingPanel.ScrollUnit="Pixel" d:ItemsSource="{d:SampleData ItemCount=5}"  
             >
 
                 <ListBox.ItemContainerStyle>

+ 2 - 2
Demo/Examples/Compdfkit_Tools/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 2 - 22
Demo/Examples/ContentEditor/App.xaml.cs

@@ -1,4 +1,5 @@
 using ComPDFKit.NativeMethod;
+using Compdfkit_Tools.Helper;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -12,25 +13,6 @@ using static ComPDFKit.NativeMethod.CPDFSDKVerifier;
 
 namespace ContentEditor
 {
-    public class SDKLicenseHelper
-    {
-        public string key = string.Empty;
-        public string secret = string.Empty;
-        public SDKLicenseHelper()
-        {
-            string sdkLicensePath = "license_key_win.xml";
-            Assembly assembly = Assembly.GetExecutingAssembly();
-            XmlDocument xmlDocument = new XmlDocument();
-            xmlDocument.Load(sdkLicensePath);
-            var node = xmlDocument.SelectSingleNode("License");
-            if (node != null)
-            {
-                key = node.Attributes["key"].Value;
-                secret = node.Attributes["secret"].Value;
-            }
-        }
-    }
-
     public partial class App : Application
     {
         protected override void OnStartup(StartupEventArgs e)
@@ -41,9 +23,7 @@ namespace ContentEditor
 
         private static bool LicenseVerify()
         {
-            bool result = false;
-
-            result = CPDFSDKVerifier.LoadNativeLibrary();
+            bool result = LoadNativeLibrary();
             if (!result)
                 return false;
 

+ 1 - 1
Demo/Examples/ContentEditor/ContentEditor.csproj

@@ -118,7 +118,7 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="ComPDFKit_Logo.ico" />
-    <Content Include="..\license_key_win.xml">
+    <Content Include="..\license_key_windows.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>

+ 7 - 38
Demo/Examples/ContentEditor/Properties/AssemblyInfo.cs

@@ -3,10 +3,7 @@ using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
+ 
 [assembly: AssemblyTitle("Content Editor_ComPDFKit")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -15,41 +12,13 @@ using System.Windows;
 [assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
-//请将此类型的 ComVisible 特性设置为 true。
+ 
 [assembly: ComVisible(false)]
 
-//若要开始生成可本地化的应用程序,请设置
-//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
-//例如,如果您在源文件中使用的是美国英语,
-//使用的是美国英语,请将 <UICulture> 设置为 en-US。  然后取消
-//对以下 NeutralResourceLanguage 特性的注释。  更新
-//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
-
 [assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //主题特定资源词典所处位置
-                                     //(未在页面中找到资源时使用,
-                                     //或应用程序资源字典中找到时使用)
-    ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
-                                              //(未在页面中找到资源时使用,
-                                              //、应用程序或任何主题专用资源字典中找到时使用)
+    ResourceDictionaryLocation.None,  
+    ResourceDictionaryLocation.SourceAssembly  
 )]
-
-
-// 程序集的版本信息由下列四个值组成: 
-//
-//      主版本
-//      次版本
-//      生成号
-//      修订号
-//
-//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
-//通过使用 "*",如下所示:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
+ 
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 2 - 23
Demo/Examples/DocsEditor/App.xaml.cs

@@ -1,4 +1,5 @@
 using ComPDFKit.NativeMethod;
+using Compdfkit_Tools.Helper;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -11,26 +12,6 @@ using System.Xml;
 
 namespace DocsEditor
 {
-    public class SDKLicenseHelper
-    {
-        public string key = string.Empty;
-        public string secret = string.Empty;
-        public SDKLicenseHelper()
-        {
-
-            string sdkLicensePath = "license_key_win.xml";
-            Assembly assembly = Assembly.GetExecutingAssembly();
-            XmlDocument xmlDocument = new XmlDocument();
-            xmlDocument.Load(sdkLicensePath);
-            var node = xmlDocument.SelectSingleNode("License");
-            if (node != null)
-            {
-                key = node.Attributes["key"].Value;
-                secret = node.Attributes["secret"].Value;
-            }
-        }
-    }
-
     public partial class App : Application
     {
         protected override void OnStartup(StartupEventArgs e)
@@ -42,9 +23,7 @@ namespace DocsEditor
 
         private static bool LicenseVerify()
         {
-            bool result = false;
-
-            result = CPDFSDKVerifier.LoadNativeLibrary();
+            bool result = CPDFSDKVerifier.LoadNativeLibrary();
             if (!result)
                 return false;
 

+ 1 - 1
Demo/Examples/DocsEditor/DocsEditor.csproj

@@ -115,7 +115,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="..\license_key_win.xml">
+    <Content Include="..\license_key_windows.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
     <Resource Include="ComPDFKit_Logo.ico" />

+ 8 - 38
Demo/Examples/DocsEditor/Properties/AssemblyInfo.cs

@@ -3,10 +3,7 @@ using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
+ 
 [assembly: AssemblyTitle("Docs Editor_ComPDFKit")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -15,41 +12,14 @@ using System.Windows;
 [assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
-//请将此类型的 ComVisible 特性设置为 true。
+ 
 [assembly: ComVisible(false)]
-
-//若要开始生成可本地化的应用程序,请设置
-//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
-//例如,如果您在源文件中使用的是美国英语,
-//使用的是美国英语,请将 <UICulture> 设置为 en-US。  然后取消
-//对以下 NeutralResourceLanguage 特性的注释。  更新
-//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
+ 
 
 [assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //主题特定资源词典所处位置
-                                     //(未在页面中找到资源时使用,
-                                     //或应用程序资源字典中找到时使用)
-    ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
-                                              //(未在页面中找到资源时使用,
-                                              //、应用程序或任何主题专用资源字典中找到时使用)
+    ResourceDictionaryLocation.None,  
+    ResourceDictionaryLocation.SourceAssembly  
 )]
-
-
-// 程序集的版本信息由下列四个值组成: 
-//
-//      主版本
-//      次版本
-//      生成号
-//      修订号
-//
-//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
-//通过使用 "*",如下所示:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
+ 
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 1 - 29
Demo/Examples/Examlpes.sln

@@ -5,7 +5,7 @@ VisualStudioVersion = 17.5.33516.290
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "License", "License", "{43ED4BF9-5941-4F32-A9DC-016E94A0E74E}"
 	ProjectSection(SolutionItems) = preProject
-		license_key_win.xml = license_key_win.xml
+		license_key_windows.xml = license_key_windows.xml
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Viewer", "Viewer\Viewer.csproj", "{A25DD47F-1FDF-48A1-8D0E-8CFF2C066A74}"
@@ -46,10 +46,6 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "PDFToImageTest", "Samples\P
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OutlineTest", "Samples\OutlineTest\OutlineTest.csproj", "{7323B63A-6073-4A22-82F5-29023702F2C1}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComPDFKit.Viewer", "..\..\..\compdfkit\ComPDFKit\ComPDFKitDesktop\ComPDFKit.Viewer\ComPDFKit.Viewer.csproj", "{18EC356D-8130-49D4-B4E6-AC290E1065B7}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ComPDFKit.Desk", "..\..\..\compdfkit\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj", "{56E518AD-C126-4B48-9A09-0A64C87020E4}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DocumentInfoTest", "Samples\DocumentInfoTest\DocumentInfoTest.csproj", "{274E1BD3-627D-46BC-8281-5440D7703EBF}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WatermarkTest", "Samples\WatermarkTest\WatermarkTest.csproj", "{8E440DCB-FCBC-4308-AB3D-50C38D017A40}"
@@ -294,30 +290,6 @@ Global
 		{7323B63A-6073-4A22-82F5-29023702F2C1}.Release|x64.Build.0 = Release|Any CPU
 		{7323B63A-6073-4A22-82F5-29023702F2C1}.Release|x86.ActiveCfg = Release|Any CPU
 		{7323B63A-6073-4A22-82F5-29023702F2C1}.Release|x86.Build.0 = Release|Any CPU
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|x64.ActiveCfg = Debug|x64
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|x64.Build.0 = Debug|x64
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Debug|x86.Build.0 = Debug|Any CPU
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|Any CPU.Build.0 = Release|Any CPU
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|x64.ActiveCfg = Release|x64
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|x64.Build.0 = Release|x64
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|x86.ActiveCfg = Release|Any CPU
-		{18EC356D-8130-49D4-B4E6-AC290E1065B7}.Release|x86.Build.0 = Release|Any CPU
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|x64.ActiveCfg = Debug|x64
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|x64.Build.0 = Debug|x64
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|x86.ActiveCfg = Debug|x86
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Debug|x86.Build.0 = Debug|x86
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|Any CPU.Build.0 = Release|Any CPU
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|x64.ActiveCfg = Release|x64
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|x64.Build.0 = Release|x64
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|x86.ActiveCfg = Release|x86
-		{56E518AD-C126-4B48-9A09-0A64C87020E4}.Release|x86.Build.0 = Release|x86
 		{274E1BD3-627D-46BC-8281-5440D7703EBF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{274E1BD3-627D-46BC-8281-5440D7703EBF}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{274E1BD3-627D-46BC-8281-5440D7703EBF}.Debug|x64.ActiveCfg = Debug|Any CPU

+ 2 - 22
Demo/Examples/Forms/App.xaml.cs

@@ -1,4 +1,5 @@
 using ComPDFKit.NativeMethod;
+using Compdfkit_Tools.Helper;
 using System;
 using System.Collections.Generic;
 using System.Configuration;
@@ -11,26 +12,6 @@ using System.Xml;
 
 namespace Forms
 {
-    public class SDKLicenseHelper
-    {
-        public string key = string.Empty;
-        public string secret = string.Empty;
-        public SDKLicenseHelper()
-        {
-
-            string sdkLicensePath = "license_key_win.xml";
-            Assembly assembly = Assembly.GetExecutingAssembly();
-            XmlDocument xmlDocument = new XmlDocument();
-            xmlDocument.Load(sdkLicensePath);
-            var node = xmlDocument.SelectSingleNode("License");
-            if (node != null)
-            {
-                key = node.Attributes["key"].Value;
-                secret = node.Attributes["secret"].Value;
-            }
-        }
-
-    }
 
     public partial class App : Application
     {
@@ -43,8 +24,7 @@ namespace Forms
 
         private static bool LicenseVerify()
         {
-            bool result = false;
-            result = CPDFSDKVerifier.LoadNativeLibrary();
+            bool result = CPDFSDKVerifier.LoadNativeLibrary();
             if (!result)
                 return false;
 

+ 1 - 1
Demo/Examples/Forms/Forms.csproj

@@ -117,7 +117,7 @@
   </ItemGroup>
   <ItemGroup>
     <Resource Include="ComPDFKit_Logo.ico" />
-    <None Include="..\license_key_win.xml">
+    <None Include="..\license_key_windows.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 8 - 38
Demo/Examples/Forms/Properties/AssemblyInfo.cs

@@ -3,10 +3,7 @@ using System.Resources;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
 using System.Windows;
-
-// 有关程序集的一般信息由以下
-// 控制。更改这些特性值可修改
-// 与程序集关联的信息。
+ 
 [assembly: AssemblyTitle("Forms_ComPDFKit")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
@@ -15,41 +12,14 @@ using System.Windows;
 [assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
-
-// 将 ComVisible 设置为 false 会使此程序集中的类型
-//对 COM 组件不可见。如果需要从 COM 访问此程序集中的类型
-//请将此类型的 ComVisible 特性设置为 true。
+ 
 [assembly: ComVisible(false)]
-
-//若要开始生成可本地化的应用程序,请设置
-//.csproj 文件中的 <UICulture>CultureYouAreCodingWith</UICulture>
-//例如,如果您在源文件中使用的是美国英语,
-//使用的是美国英语,请将 <UICulture> 设置为 en-US。  然后取消
-//对以下 NeutralResourceLanguage 特性的注释。  更新
-//以下行中的“en-US”以匹配项目文件中的 UICulture 设置。
-
-//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
-
+ 
 
 [assembly: ThemeInfo(
-    ResourceDictionaryLocation.None, //主题特定资源词典所处位置
-                                     //(未在页面中找到资源时使用,
-                                     //或应用程序资源字典中找到时使用)
-    ResourceDictionaryLocation.SourceAssembly //常规资源词典所处位置
-                                              //(未在页面中找到资源时使用,
-                                              //、应用程序或任何主题专用资源字典中找到时使用)
+    ResourceDictionaryLocation.None,  
+    ResourceDictionaryLocation.SourceAssembly  
 )]
-
-
-// 程序集的版本信息由下列四个值组成: 
-//
-//      主版本
-//      次版本
-//      生成号
-//      修订号
-//
-//可以指定所有这些值,也可以使用“生成号”和“修订号”的默认值
-//通过使用 "*",如下所示:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
+ 
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 2 - 2
Demo/Examples/PDFATest/PDFATest.csproj

@@ -66,8 +66,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 2 - 28
Demo/Examples/PDFViewer/App.xaml.cs

@@ -1,35 +1,10 @@
 using ComPDFKit.NativeMethod;
-using System;
+using Compdfkit_Tools.Helper;
 using System.Collections.Generic;
-using System.Configuration;
-using System.Data;
-using System.Linq;
-using System.Reflection;
-using System.Threading.Tasks;
 using System.Windows;
-using System.Xml;
 
 namespace PDFViewer
 {
-    public class SDKLicenseHelper
-    {
-        public string key = string.Empty;
-        public string secret = string.Empty;
-        public SDKLicenseHelper()
-        {
-            string sdkLicensePath = "license_key_win.xml";
-            Assembly assembly = Assembly.GetExecutingAssembly();
-            XmlDocument xmlDocument = new XmlDocument();
-            xmlDocument.Load(sdkLicensePath);
-            var node = xmlDocument.SelectSingleNode("License");
-            if (node != null)
-            {
-                key = node.Attributes["key"].Value;  
-                secret = node.Attributes["secret"].Value;
-            }
-        }
-    }
-
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
@@ -48,8 +23,7 @@ namespace PDFViewer
 
         private static bool LicenseVerify()
         {
-            bool result = false;
-            result = CPDFSDKVerifier.LoadNativeLibrary();
+            bool result = CPDFSDKVerifier.LoadNativeLibrary();
             if (!result)
                 return false;
             SDKLicenseHelper sdkLicenseHelper = new SDKLicenseHelper();

BIN
Demo/Examples/PDFViewer/ComPDFKit.Desk.dll


BIN
Demo/Examples/PDFViewer/ComPDFKit.Viewer.dll


+ 7 - 9
Demo/Examples/PDFViewer/PDFViewer.csproj

@@ -41,6 +41,12 @@
     <ApplicationIcon>ComPDFKit_Logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ComPDFKit.Desk, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ComPDFKit.NetFramework.1.9.0\lib\ComPDFKit.Desk.dll</HintPath>
+    </Reference>
+    <Reference Include="ComPDFKit.Viewer, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ComPDFKit.NetFramework.1.9.0\lib\ComPDFKit.Viewer.dll</HintPath>
+    </Reference>
     <Reference Include="Dragablz, Version=0.0.3.223, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>.\Dragablz.dll</HintPath>
@@ -112,7 +118,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\license_key_win.xml">
+    <None Include="..\license_key_windows.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <Resource Include="ComPDFKit_Logo.ico" />
@@ -129,14 +135,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\compdfkit\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
-      <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
-      <Name>ComPDFKit.Desk</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\compdfkit\ComPDFKit\ComPDFKitDesktop\ComPDFKit.Viewer\ComPDFKit.Viewer.csproj">
-      <Project>{18ec356d-8130-49d4-b4e6-ac290e1065b7}</Project>
-      <Name>ComPDFKit.Viewer</Name>
-    </ProjectReference>
     <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
       <Name>Compdfkit_Tools</Name>

+ 2 - 2
Demo/Examples/PDFViewer/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.9.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 1 - 5
Demo/Examples/Samples/AnnotationImportExportTest/AnnotationImportExportTest.cs

@@ -1,10 +1,6 @@
 using ComPDFKit.PDFDocument;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO; 
 
 namespace AnnotationImportExportTest
 {

+ 49 - 3
Demo/Examples/Samples/AnnotationImportExportTest/AnnotationImportExportTest.csproj

@@ -7,13 +7,30 @@
     <ProjectGuid>{E2693237-D8F2-4E1C-B3C3-0B3ACFB73728}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>AnnotationImportExportTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <TargetFrameworkProfile />
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <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.0</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <PublishWizardCompleted>true</PublishWizardCompleted>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -34,6 +51,22 @@
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
+  <PropertyGroup>
+    <ManifestCertificateThumbprint>25DADB233E62F3B3C59C7DCD1B72EE4F90D61C27</ManifestCertificateThumbprint>
+  </PropertyGroup>
+  <PropertyGroup>
+    <ManifestKeyFile>AnnotationImportExportTest_TemporaryKey.pfx</ManifestKeyFile>
+  </PropertyGroup>
+  <PropertyGroup>
+    <GenerateManifests>true</GenerateManifests>
+  </PropertyGroup>
+  <PropertyGroup>
+    <TargetZone>LocalIntranet</TargetZone>
+  </PropertyGroup>
+  <PropertyGroup />
+  <PropertyGroup>
+    <SignManifests>true</SignManifests>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="ComPDFKit.Desk, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
       <HintPath>..\..\packages\ComPDFKit.NetFramework.1.9.0\lib\ComPDFKit.Desk.dll</HintPath>
@@ -70,15 +103,28 @@
       <Link>CommonFivePage.pdf</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="AnnotationImportExportTest_TemporaryKey.pfx" />
     <None Include="App.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\ComPDFKit.NetFramework.1.9.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\..\packages\ComPDFKit.NetFramework.1.9.0\build\ComPDFKit.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

+ 3 - 3
Demo/Examples/Samples/AnnotationImportExportTest/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1"/>
     </startup>
-</configuration>
+</configuration>

+ 3 - 3
Demo/Examples/Samples/AnnotationImportExportTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("AnnotationImportExportTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 0 - 4
Demo/Examples/Samples/AnnotationTest/AnnotationTest.cs

@@ -7,11 +7,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using System.Linq;
 using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
 
 namespace AnnotationTest
 {

+ 30 - 3
Demo/Examples/Samples/AnnotationTest/AnnotationTest.csproj

@@ -7,13 +7,28 @@
     <ProjectGuid>{ED8A0C73-FA4E-4FAC-93F7-27C67A940628}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>AnnotationTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <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.0</ApplicationVersion>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -75,8 +90,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
@@ -86,6 +101,18 @@
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\ComPDFKit.NetFramework.1.9.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\..\packages\ComPDFKit.NetFramework.1.9.0\build\ComPDFKit.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

+ 3 - 3
Demo/Examples/Samples/AnnotationTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("AnnotationTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 2 - 11
Demo/Examples/Samples/BackgroundTest/BackgroundTest.cs

@@ -1,14 +1,9 @@
 using ComPDFKit.PDFDocument;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
+using System.Runtime.InteropServices; 
 
 namespace BackgroundTest
 {
@@ -164,7 +159,7 @@ namespace BackgroundTest
         /// <summary>
         /// Check background type, and remove background. 
         /// </summary>
-        /// <param name="colorBgDocument">Document with clolor background.78</param>
+        /// <param name="colorBgDocument">Document with clolor background.</param>
         /// <param name="imageBgDocument">Document with image background.</param>  
         /// <returns></returns>
         static private bool RemoveBackground(CPDFDocument colorBgDocument, CPDFDocument imageBgDocument)
@@ -184,10 +179,6 @@ namespace BackgroundTest
             Console.WriteLine("Browse the changed file in " + path1);
 
             CPDFBackground imageBackground = imageBgDocument.GetBackground();
-            if(imageBackground.GetBackgroundType()!= C_Background_Type.BG_TYPE_IMAGE)
-            {
-                return false;
-            }
 
             imageBackground.Clear();
             string path2 = outputPath + "\\ClearImageBgTest.pdf";

+ 29 - 2
Demo/Examples/Samples/BackgroundTest/BackgroundTest.csproj

@@ -14,6 +14,21 @@
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <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.0</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -79,11 +94,23 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\ComPDFKit.NetFramework.1.9.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\..\packages\ComPDFKit.NetFramework.1.9.0\build\ComPDFKit.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

+ 3 - 3
Demo/Examples/Samples/BackgroundTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("BackgroundTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 8 - 6
Demo/Examples/Samples/BatesTest/BatesTest.cs

@@ -1,10 +1,7 @@
 using ComPDFKit.PDFDocument;
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO; 
 
 namespace BatesTest
 {
@@ -29,7 +26,6 @@ namespace BatesTest
             Console.WriteLine("Running bates test sample…\r\n");
             SDKLicenseHelper.LicenseVerify();
 
-            CPDFDocument document = CPDFDocument.InitWithFilePath("CommonFivePage.pdf");
 
             if (!Directory.Exists(outputPath))
             {
@@ -37,8 +33,10 @@ namespace BatesTest
             }
 
             #endregion
-            
+
             #region Sample 1: Add bates
+            CPDFDocument document = CPDFDocument.InitWithFilePath("CommonFivePage.pdf");
+
             if (AddBates(document))
             {
                 Console.WriteLine("Add bates done.");
@@ -54,6 +52,8 @@ namespace BatesTest
             #endregion
 
             #region Samles 2: Edit bates
+             document = CPDFDocument.InitWithFilePath("CommonFivePage.pdf");
+
             if (EditBates(document))
             {
                 Console.WriteLine("Edit bates done.");
@@ -70,6 +70,8 @@ namespace BatesTest
             #endregion
 
             #region Sample 3: Clear bates
+            document = CPDFDocument.InitWithFilePath("CommonFivePage.pdf");
+
             if (ClearBates(document))
             {
                 Console.WriteLine("Clear bates done.");

+ 2 - 2
Demo/Examples/Samples/BatesTest/BatesTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{5CE5B624-B2B8-479C-8842-B70591B01124}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>BatesTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -63,7 +63,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
+    <None Include="..\..\license_key_windows.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 1 - 1
Demo/Examples/Samples/BatesTest/LicenseKey.cs

@@ -8,7 +8,7 @@ public class SDKLicenseHelper
 
     public SDKLicenseHelper()
     {
-        string sdkLicensePath = "license_key_win.xml";
+        string sdkLicensePath = "license_key_windows.xml";
         XmlDocument xmlDocument = new XmlDocument();
         xmlDocument.Load(sdkLicensePath);
         var node = xmlDocument.SelectSingleNode("License");

+ 3 - 3
Demo/Examples/Samples/BatesTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("BatesTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 33 - 14
Demo/Examples/Samples/BookmarkTest/BookmarkTest.cs

@@ -1,12 +1,7 @@
 using ComPDFKit.PDFDocument;
-using ComPDFKit.PDFPage;
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Net.NetworkInformation;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace BookmarkTest
 {
@@ -26,6 +21,8 @@ namespace BookmarkTest
                 Directory.CreateDirectory(outputPath);
             }
 
+            #region Sample 1: Access bookmark
+
             if (AccessBookmark(document))
             {
                 Console.WriteLine("Check bookmark list done.");
@@ -39,9 +36,13 @@ namespace BookmarkTest
                 Console.ReadLine();
                 return;
             }
+            document.Release();
             Console.WriteLine("--------------------");
+             
+            #endregion
+
+            #region Sample 2: Create bookmark
 
-            document.Release();
             document = CPDFDocument.InitWithFilePath("ThreeBookmark.pdf");
 
             if (CreateBookmark(document))
@@ -52,9 +53,13 @@ namespace BookmarkTest
             {
                 Console.WriteLine("Add bookmark failed.");
             }
+            document.Release();
             Console.WriteLine("--------------------");
 
-            document.Release();
+            #endregion
+
+            #region Sample 3: Create bookmark
+
             document = CPDFDocument.InitWithFilePath("ThreeBookmark.pdf");
 
             if (RemoveBookmark(document))
@@ -65,11 +70,20 @@ namespace BookmarkTest
             {
                 Console.WriteLine("Remove bookmark done.");
             }
+
+            document.Release();
             Console.WriteLine("--------------------");
+
+            #endregion
+            
             Console.WriteLine("Done!");
             Console.WriteLine("--------------------");
             Console.ReadLine();
         }
+
+        /// <summary>
+        /// Access bookmark
+        /// </summary> 
         static private bool AccessBookmark(CPDFDocument document)
         {
             List<CPDFBookmark> bookmarkList = document.GetBookmarkList();
@@ -80,8 +94,8 @@ namespace BookmarkTest
             else
             {
                 return false;
-            } 
-            if(document.BookmarkForPageIndex(0).Title == "Bookmark1")
+            }
+            if (document.BookmarkForPageIndex(0).Title == "Bookmark1")
             {
                 Console.WriteLine("Access bookmark for a page done.");
             }
@@ -89,10 +103,12 @@ namespace BookmarkTest
             {
                 return false;
             }
-
             return true;
         }
 
+        /// <summary>
+        /// Create bookmark
+        /// </summary> 
         static private bool CreateBookmark(CPDFDocument document)
         {
             var bookmarkCount = document.GetBookmarkList().Count;
@@ -100,11 +116,11 @@ namespace BookmarkTest
             bookmark.Title = "new bookmark";
             bookmark.PageIndex = 4;
             document.AddBookmark(bookmark);
-            if(!(document.GetBookmarkList().Count - bookmarkCount == 1))
+            if (!(document.GetBookmarkList().Count - bookmarkCount == 1))
             {
                 return false;
             }
-            Console.WriteLine("Add bookmark in page {0}. ", bookmark.PageIndex+1);
+            Console.WriteLine("Add bookmark in page {0}. ", bookmark.PageIndex + 1);
             string addBookmarkPath = outputPath + "//AddBookmarkTest.pdf";
             if (document.WriteToFilePath(addBookmarkPath))
             {
@@ -114,14 +130,17 @@ namespace BookmarkTest
             else
             {
                 return false;
-            } 
+            }
         }
 
+        /// <summary>
+        /// Remove bookmark
+        /// </summary> 
         static private bool RemoveBookmark(CPDFDocument document)
         {
             var bookmarkCount = document.GetBookmarkList().Count;
             document.RemoveBookmark(0);
-            if (!(bookmarkCount - document.GetBookmarkList().Count  == 1))
+            if (!(bookmarkCount - document.GetBookmarkList().Count == 1))
             {
                 return false;
             }

+ 3 - 3
Demo/Examples/Samples/BookmarkTest/BookmarkTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{26E617CD-C1D7-4EC2-AC9F-E3F4546B2202}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>BookmarkTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -70,8 +70,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/BookmarkTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("BookmarkTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 5 - 9
Demo/Examples/Samples/DocumentCompare/DocumentCompare.cs

@@ -1,12 +1,7 @@
 using ComPDFKit.Compare;
 using ComPDFKit.PDFDocument;
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
+using System; 
+using System.IO; 
 
 namespace DocumentCompareTest
 {
@@ -50,8 +45,9 @@ namespace DocumentCompareTest
             {
                 Console.WriteLine("Compare document failed.");
             }
-            document1.Release();
-            document2.Release();
+            document3.Release();
+            document4.Release();
+            Console.WriteLine("--------------------");
 
             Console.WriteLine("Done!");
             Console.WriteLine("--------------------");

+ 3 - 3
Demo/Examples/Samples/DocumentCompare/DocumentCompareTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{0BB38D20-C3CF-47D7-8E2E-97195672AB67}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>DocumentCompare</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -77,8 +77,8 @@
     </None>
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/DocumentCompare/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DocumentCompare")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 30 - 3
Demo/Examples/Samples/DocumentInfoTest/DocumentInfoTest.csproj

@@ -7,13 +7,28 @@
     <ProjectGuid>{274E1BD3-627D-46BC-8281-5440D7703EBF}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>DocumentInfoTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>
+    <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>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -66,11 +81,23 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.6.1">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.6.1 %28x86 和 x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\ComPDFKit.NetFramework.1.9.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\..\packages\ComPDFKit.NetFramework.1.9.0\build\ComPDFKit.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

+ 3 - 3
Demo/Examples/Samples/DocumentInfoTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("DocumentInfoTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 9 - 13
Demo/Examples/Samples/EncryptTest/EncryptTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{D225EA72-F34A-4AC6-9016-91F99D30DB81}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>EncryptTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -35,6 +35,12 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="ComPDFKit.Desk, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\ComPDFKit.NetFramework.1.9.0\lib\ComPDFKit.Desk.dll</HintPath>
+    </Reference>
+    <Reference Include="ComPDFKit.Viewer, Version=1.9.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\ComPDFKit.NetFramework.1.9.0\lib\ComPDFKit.Viewer.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Xml.Linq" />
@@ -64,21 +70,11 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\..\compdfkit\ComPDFKit\ComPDFKitCSharp\ComPDFKit.Desk.csproj">
-      <Project>{56e518ad-c126-4b48-9a09-0a64c87020e4}</Project>
-      <Name>ComPDFKit.Desk</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\..\..\..\..\compdfkit\ComPDFKit\ComPDFKitDesktop\ComPDFKit.Viewer\ComPDFKit.Viewer.csproj">
-      <Project>{18ec356d-8130-49d4-b4e6-ac290e1065b7}</Project>
-      <Name>ComPDFKit.Viewer</Name>
-    </ProjectReference>
-  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <Import Project="..\..\packages\ComPDFKit.NetFramework.1.9.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\..\packages\ComPDFKit.NetFramework.1.9.0\build\ComPDFKit.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">

+ 3 - 3
Demo/Examples/Samples/EncryptTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("EncryptTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 1 - 5
Demo/Examples/Samples/FlattenTest/FlattenTest.cs

@@ -1,11 +1,7 @@
 using ComPDFKit.PDFDocument;
 using ComPDFKit.PDFPage;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO; 
 
 namespace FlattenTest
 {

+ 3 - 3
Demo/Examples/Samples/FlattenTest/FlattenTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{34BE4547-F57E-473C-A4D9-2EFEDAC6B87E}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>FlattenTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -66,8 +66,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/FlattenTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("FlattenTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 0 - 6
Demo/Examples/Samples/HeaderFooterTest/HeaderFooterTest.cs

@@ -2,11 +2,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
-using static System.Net.Mime.MediaTypeNames;
 
 namespace HeaderFooterTest
 {
@@ -45,7 +40,6 @@ namespace HeaderFooterTest
             {
                 Console.WriteLine("Add common header and footer failed.");
             }
-            document.Release();
             Console.WriteLine("--------------------");
 
             #endregion

+ 2 - 2
Demo/Examples/Samples/HeaderFooterTest/HeaderFooterTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{5AF53BD9-A085-4550-8F78-98CCFFFDCDA9}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>HeaderFooterTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -63,7 +63,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
+    <None Include="..\..\license_key_windows.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 5 - 5
Demo/Examples/Samples/HeaderFooterTest/Properties/AssemblyInfo.cs

@@ -5,12 +5,12 @@ 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("HeaderFooterTest")]
+[assembly: AssemblyTitle("Samples_ComPDFKit")]
 [assembly: AssemblyDescription("")]
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("HeaderFooterTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyProduct("Samples_ComPDFKit")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 1 - 10
Demo/Examples/Samples/ImageExtractTest/ImageExtractTest.cs

@@ -1,15 +1,6 @@
-using ComPDFKit.Import;
-using ComPDFKit.PDFDocument;
-using ComPDFKit.PDFPage;
+using ComPDFKit.PDFDocument;
 using System;
-using System.Collections.Generic; 
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows;
-using System.Windows.Media;
-using System.Windows.Media.Imaging;
 
 namespace ImageExtractTest
 {

+ 3 - 3
Demo/Examples/Samples/ImageExtractTest/ImageExtractTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{DEAF0496-2E3D-4A76-B24E-0E672B21ED3F}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>ImageExtractTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -69,8 +69,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/ImageExtractTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("ImageExtractTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 24 - 0
Demo/Examples/Samples/InteractiveFormsTest/InteractiveFormsTest.cs

@@ -41,6 +41,10 @@ namespace InteractiveFormsTest
             Console.ReadLine();
         }
 
+        /// <summary>
+        /// Create text field.
+        /// Text field: used to input text
+        /// </summary> 
         static private void CreateTextField(CPDFDocument document)
         {
             CPDFPage page = document.PageAtIndex(0);
@@ -50,6 +54,10 @@ namespace InteractiveFormsTest
             textField.SetWidgetBgRGBColor(new byte[] {240,255,240});
         }
 
+        /// <summary>
+        ///  Create push button.
+        ///  Push button:  Click to perform some actions, such as jumping to a page or website.
+        /// </summary> 
         static private void CreatePushButton(CPDFDocument document)
         {
             CPDFPage page = document.PageAtIndex(0);
@@ -88,6 +96,9 @@ namespace InteractiveFormsTest
             pushButton2.UpdateFormAp();
         }
 
+        /// <summary>
+        /// Create ListBox
+        /// </summary> 
         static private void CreateListBox(CPDFDocument document)
         {
             CPDFPage page = document.PageAtIndex(0);
@@ -99,6 +110,10 @@ namespace InteractiveFormsTest
             listbox.SetWidgetBgRGBColor(new byte[] { 200, 180, 180 });
         }
 
+        /// <summary>
+        /// Create SignatureField
+        /// Provide an area for electronic signatures.
+        /// </summary> 
         static private void CreateSignatureField(CPDFDocument document)
         {
             CPDFPage page = document.PageAtIndex(0);
@@ -109,6 +124,9 @@ namespace InteractiveFormsTest
             signatureField.SetWidgetBgRGBColor(new byte[] { 150, 180, 210 });
         }
 
+        /// <summary>
+        /// Create CheckBox
+        /// </summary>
         static private void CreateCheckBox(CPDFDocument document)
         {
             CPDFPage page = document.PageAtIndex(0);
@@ -128,6 +146,9 @@ namespace InteractiveFormsTest
             checkBox3.SetWidgetBgRGBColor(new byte[] { 150, 180, 210 });
         }
 
+        /// <summary>
+        /// Create RadioButton
+        /// </summary>
         static private void CreateRadioButton(CPDFDocument document)
         {
             CPDFPage page = document.PageAtIndex(0);
@@ -150,6 +171,9 @@ namespace InteractiveFormsTest
             radioButton3.SetWidgetCheckStyle(C_CHECK_STYLE.CK_CIRCLE);
         }
 
+        /// <summary>
+        /// Generate various signatures.
+        /// </summary>
         static private bool CreateForms(CPDFDocument document)
         {
             CreateTextField(document);

+ 3 - 3
Demo/Examples/Samples/InteractiveFormsTest/InteractiveFormsTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{FB4B7306-DECC-457C-8F4C-6CE946F753D6}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>InteractiveFormsTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -67,8 +67,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/InteractiveFormsTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("InteractiveFormsTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 20 - 20
Demo/Examples/Samples/LicenseKey.cs

@@ -1,37 +1,37 @@
 using ComPDFKit.NativeMethod;
+using System;
 using System.Xml;
 
-public class SDKLicenseHelper
+public static class SDKLicenseHelper
 {
-    public string key = string.Empty;
-    public string secret = string.Empty;
+    public static string key = string.Empty;
+    public static string secret = string.Empty; 
 
-    public SDKLicenseHelper()
+    public static bool LicenseVerify()
     {
-        string sdkLicensePath = "license_key_win.xml";
+        string sdkLicensePath = "license_key_windows.xml";
         XmlDocument xmlDocument = new XmlDocument();
         xmlDocument.Load(sdkLicensePath);
-        var node = xmlDocument.SelectSingleNode("License");
-        if (node != null)
-        {
-            key = node.Attributes["key"].Value;
-            secret = node.Attributes["secret"].Value;
-        }
-    }
 
-    public static bool LicenseVerify()
-    {
-        bool result = false;
+        XmlNode keyNode = xmlDocument.SelectSingleNode("/license/key");
+        XmlNode secretNode = xmlDocument.SelectSingleNode("/license/secret");
 
-        result = CPDFSDKVerifier.LoadNativeLibrary();
+        if (keyNode != null && secretNode != null)
+        {
+            key = keyNode.InnerText;
+            secret = secretNode.InnerText; 
+        }
+        else
+        {
+            Console.WriteLine("Key or secret element not found in the XML.");
+        }
+        bool result = CPDFSDKVerifier.LoadNativeLibrary();
         if (!result)
             return false;
 
-        SDKLicenseHelper sdkLicenseHelper = new SDKLicenseHelper();
-
-        LicenseErrorCode verifyResult = CPDFSDKVerifier.LicenseVerify(sdkLicenseHelper.key, sdkLicenseHelper.secret);
+        LicenseErrorCode verifyResult = CPDFSDKVerifier.LicenseVerify(key, secret);
         if (verifyResult != LicenseErrorCode.LICENSE_ERR_SUCCESS)
             return false;
         return result;
     }
-}
+}

+ 2 - 8
Demo/Examples/Samples/OutlineTest/OutlineTest.cs

@@ -1,10 +1,7 @@
 using ComPDFKit.PDFDocument;
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO; 
 
 namespace OutlineTest
 {
@@ -107,7 +104,6 @@ namespace OutlineTest
         /// <summary>
         /// Traverse outline and print it as a list
         /// </summary>
-        /// <param name="outlineList"></param>
         static private void TraverseOutline(List<CPDFOutline> outlineList)
         {
             foreach (var outline in outlineList)
@@ -188,10 +184,8 @@ namespace OutlineTest
         }
 
         /// <summary>
-        /// 
+        /// Remove outline
         /// </summary>
-        /// <param name="document"></param>
-        /// <returns></returns>
         static private bool RemoveOutline(CPDFDocument document)
         { 
             document.GetOutlineList()[0].RemoveFromParent(document);

+ 3 - 3
Demo/Examples/Samples/OutlineTest/OutlineTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{7323B63A-6073-4A22-82F5-29023702F2C1}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>OutlineTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -66,8 +66,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/OutlineTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("OutlineTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 1 - 5
Demo/Examples/Samples/PDFATest/PDFATest.cs

@@ -1,10 +1,6 @@
 using ComPDFKit.PDFDocument;
 using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO; 
 
 namespace PDFATest
 {

+ 3 - 3
Demo/Examples/Samples/PDFATest/PDFATest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{463C349B-D895-4191-B1FD-C507B16B6A8C}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>PDFATest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -66,8 +66,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/PDFATest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("PDFATest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 3 - 3
Demo/Examples/Samples/PDFPageTest/PDFPageTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{B776A04B-C674-4A8B-88FC-2431034E8F78}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>PDFPageTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -70,8 +70,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/PDFPageTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("PDFPageTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 2 - 2
Demo/Examples/Samples/PDFRedactTest/PDFRedactTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{B18AD53B-9550-489B-A814-E2783D865D9C}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>PDFRedactTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -65,7 +65,7 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
+    <None Include="..\..\license_key_windows.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/PDFRedactTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("PDFRedactTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 3 - 0
Demo/Examples/Samples/PDFToImage/PDFToImage.cs

@@ -46,6 +46,9 @@ namespace PDFToImageTest
             } 
         }
 
+        /// <summary>
+        /// Convert PDF to image
+        /// </summary>
         static private bool PDFPageToImage(CPDFDocument document)
         {
             for (int i = 0; i < document.PageCount; i++)

+ 3 - 3
Demo/Examples/Samples/PDFToImage/PDFToImageTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{82A11207-3CA9-47D2-9F1C-94FE057DABFE}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>PDFToImage</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -68,8 +68,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/PDFToImage/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("PDFToImage")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 3 - 3
Demo/Examples/Samples/TextExtractTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("TextExtractTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 0 - 4
Demo/Examples/Samples/TextExtractTest/TextExtractTest.cs

@@ -1,10 +1,6 @@
 using ComPDFKit.PDFDocument;
 using System;
-using System.Collections.Generic;
 using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
 
 namespace TextExtractTest
 {

+ 3 - 3
Demo/Examples/Samples/TextExtractTest/TextExtractTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{7D255150-76CB-4A65-AFEA-F88778ABF03B}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>TextExtractTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -66,8 +66,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/TextSearchTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("TextSearchTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 1 - 4
Demo/Examples/Samples/TextSearchTest/TextSearch.cs

@@ -4,10 +4,7 @@ using ComPDFKit.PDFDocument;
 using ComPDFKit.PDFPage;
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using System.IO; 
 using System.Windows;
 
 namespace TextSearchTest

+ 3 - 3
Demo/Examples/Samples/TextSearchTest/TextSearchTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{DD2E08EE-0E64-4AB9-B8DC-03DE7E8B4E04}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>TextSearchTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -67,8 +67,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 3 - 3
Demo/Examples/Samples/WatermarkTest/Properties/AssemblyInfo.cs

@@ -10,7 +10,7 @@ using System.Runtime.InteropServices;
 [assembly: AssemblyConfiguration("")]
 [assembly: AssemblyCompany("")]
 [assembly: AssemblyProduct("WatermarkTest")]
-[assembly: AssemblyCopyright("Copyright ©  2023")]
+[assembly: AssemblyCopyright("Copyright © 2014-2023 PDF Technologies, Inc. All Rights Reserved.")]
 [assembly: AssemblyTrademark("")]
 [assembly: AssemblyCulture("")]
 
@@ -32,5 +32,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 1 - 7
Demo/Examples/Samples/WatermarkTest/WatermarkTest.cs

@@ -1,15 +1,10 @@
 using ComPDFKit.PDFDocument;
 using ComPDFKit.PDFWatermark;
 using System;
-using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using System.Linq;
-using System.Runtime.InteropServices;
-using System.Text;
-using System.Threading.Tasks;
-using System.Xml.Linq;
+using System.Runtime.InteropServices; 
 
 namespace WatermarkTest
 {
@@ -28,7 +23,6 @@ namespace WatermarkTest
                 Directory.CreateDirectory(outputPath);
             }
             #endregion
-
             #region Sample 1: Add text watermark.
 
             if (AddTextWatermark(document))

+ 4 - 3
Demo/Examples/Samples/WatermarkTest/WatermarkTest.csproj

@@ -7,7 +7,7 @@
     <ProjectGuid>{8E440DCB-FCBC-4308-AB3D-50C38D017A40}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <RootNamespace>WatermarkTest</RootNamespace>
-    <AssemblyName>Viewer_ComPDFKit</AssemblyName>
+    <AssemblyName>Samples_ComPDFKit</AssemblyName>
     <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
@@ -24,6 +24,7 @@
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -71,8 +72,8 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\..\license_key_win.xml">
-      <Link>license_key_win.xml</Link>
+    <None Include="..\..\license_key_windows.xml">
+      <Link>license_key_windows.xml</Link>
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>

+ 5 - 22
Demo/Examples/Viewer/App.xaml.cs

@@ -1,4 +1,5 @@
 using ComPDFKit.NativeMethod;
+using Compdfkit_Tools.Helper;
 using System.IO;
 using System.Reflection;
 using System.Windows;
@@ -7,25 +8,6 @@ using static ComPDFKit.NativeMethod.CPDFSDKVerifier;
 
 namespace Viewer
 {
-    public class SDKLicenseHelper
-    {
-        public string key = string.Empty;
-        public string secret = string.Empty;
-        public SDKLicenseHelper()
-        {
-            string sdkLicensePath = "license_key_win.xml";
-            XmlDocument xmlDocument = new XmlDocument();
-            xmlDocument.Load(sdkLicensePath);
-            var node = xmlDocument.SelectSingleNode("License");
-            if (node != null)
-            {
-                key = node.Attributes["key"].Value;
-                secret = node.Attributes["secret"].Value;
-            }
-        }
-
-    }
-
     /// <summary>
     /// Interaction logic for App.xaml
     /// </summary>
@@ -41,9 +23,7 @@ namespace Viewer
 
         private static bool LicenseVerify()
         {
-            bool result = false;
-
-            result = CPDFSDKVerifier.LoadNativeLibrary();
+            bool result = LoadNativeLibrary();
             if (!result)
                 return false;
 
@@ -56,3 +36,6 @@ namespace Viewer
         }
     }
 }
+
+
+

+ 2 - 2
Demo/Examples/Viewer/Properties/AssemblyInfo.cs

@@ -51,5 +51,5 @@ using System.Windows;
 // You can specify all the values or you can default the Build and Revision Numbers
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.9.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
+[assembly: AssemblyVersion("1.9.1.0")]
+[assembly: AssemblyFileVersion("1.9.1.0")]

+ 1 - 1
Demo/Examples/Viewer/Viewer.csproj

@@ -116,7 +116,7 @@
     <None Include="App.config" />
   </ItemGroup>
   <ItemGroup>
-    <None Include="..\license_key_win.xml">
+    <None Include="..\license_key_windows.xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
     <Resource Include="ComPDFKit_Logo.ico" />

File diff suppressed because it is too large
+ 0 - 4
Demo/Examples/license_key_win.xml


File diff suppressed because it is too large
+ 8 - 0
Demo/Examples/license_key_windows.xml


BIN
Demo/Examples/packages/ComPDFKit.NetFramework.1.9.0/lib/ComPDFKit.Viewer.dll