Windows - v2.0.0 update

Author: youna12345

ComPDFKit for Windows/Examples/Annotations/Annotations.csproj

@@ -41,11 +41,15 @@
     <ApplicationIcon>ComPDFKit_Logo.ico</ApplicationIcon>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="ComPDFKit.Desk, Version=1.13.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ComPDFKit.NetFramework.1.13.0\lib\ComPDFKit.Desk.dll</HintPath>
+    <ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
+      <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
+      <Name>Compdfkit.Controls</Name>
+    </ProjectReference>
+    <Reference Include="ComPDFKit.NET, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ComPDFKit.NetFramework.2.0.0\lib\ComPDFKit.NET.dll</HintPath>
     </Reference>
-    <Reference Include="ComPDFKit.Viewer, Version=1.13.0.0, Culture=neutral, processorArchitecture=MSIL">
-      <HintPath>..\packages\ComPDFKit.NetFramework.1.13.0\lib\ComPDFKit.Viewer.dll</HintPath>
+    <Reference Include="ComPDFKit.Viewer, Version=2.0.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\ComPDFKit.NetFramework.2.0.0\lib\ComPDFKit.Viewer.dll</HintPath>
     </Reference>
     <Reference Include="PresentationFramework.Aero2, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\packages\PresentationFramework.Aero2.1.0.1\lib\PresentationFramework.Aero2.dll</HintPath>
@@ -100,9 +104,13 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Compdfkit_Tools\Compdfkit_Tools.csproj">
+    <ProjectReference Include="..\Compdfkit.Controls\Compdfkit.Controls.csproj">
       <Project>{9363bcb1-3a67-446a-8093-5708b86bf418}</Project>
-      <Name>Compdfkit_Tools</Name>
+      <Name>Compdfkit.Controls</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\ComPDFKit.Tool\ComPDFKit.Tool.csproj">
+      <Project>{a061ee7a-6704-4bd9-86ee-48ed5df75e2f}</Project>
+      <Name>ComPDFKit.Tool</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -119,11 +127,11 @@
     </Content>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
-  <Import Project="..\packages\ComPDFKit.NetFramework.1.13.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\packages\ComPDFKit.NetFramework.1.13.0\build\ComPDFKit.NetFramework.targets')" />
+  <Import Project="..\packages\ComPDFKit.NetFramework.2.0.0\build\ComPDFKit.NetFramework.targets" Condition="Exists('..\packages\ComPDFKit.NetFramework.2.0.0\build\ComPDFKit.NetFramework.targets')" />
   <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
     <PropertyGroup>
-      <ErrorText>This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them.  For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}.</ErrorText>
+      <ErrorText>这台计算机上缺少此项目引用的 NuGet 程序包。使用“NuGet 程序包还原”可下载这些程序包。有关更多信息，请参见 http://go.microsoft.com/fwlink/?LinkID=322105。缺少的文件是 {0}。</ErrorText>
     </PropertyGroup>
-    <Error Condition="!Exists('..\packages\ComPDFKit.NetFramework.1.13.0\build\ComPDFKit.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ComPDFKit.NetFramework.1.13.0\build\ComPDFKit.NetFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\ComPDFKit.NetFramework.2.0.0\build\ComPDFKit.NetFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ComPDFKit.NetFramework.2.0.0\build\ComPDFKit.NetFramework.targets'))" />
   </Target>
 </Project>

ComPDFKit for Windows/Examples/Annotations/App.xaml.cs

@@ -1,6 +1,6 @@
 using System.Globalization;
 using ComPDFKit.NativeMethod;
-using Compdfkit_Tools.Helper;
+using ComPDFKit.Controls.Helper;
 using System.Reflection;
 using System.Threading;
 using System.Windows; 

ComPDFKit for Windows/Examples/Annotations/MainWindow.xaml

@@ -4,17 +4,17 @@
         xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
         xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
         xmlns:local="clr-namespace:AnnotationViewControl"
-        xmlns:pdfControl="clr-namespace:Compdfkit_Tools.PDFControl;assembly=ComPDFKit_Tools"
-        xmlns:common="clr-namespace:Compdfkit_Tools.Common;assembly=ComPDFKit_Tools"
+        xmlns:pdfControl="clr-namespace:ComPDFKit.Controls.PDFControl;assembly=ComPDFKit.Controls"
+        xmlns:common="clr-namespace:ComPDFKit.Controls.Common;assembly=ComPDFKit.Controls"
         mc:Ignorable="d"
         Loaded="MainWindow_Loaded"
         Title="{Binding AppInfo}" Height="720" Width="1080"  WindowStartupLocation="CenterScreen">
     <Window.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
-                <ResourceDictionary Source="pack://application:,,,/Compdfkit_Tools;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/ComPDFKit.Controls;component/Asset/Styles/ToggleButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/ComPDFKit.Controls;component/Asset/Styles/ButtonStyle.xaml"></ResourceDictionary>
+                <ResourceDictionary Source="pack://application:,,,/ComPDFKit.Controls;component/Asset/Styles/ComboBoxStyle.xaml"></ResourceDictionary>
             </ResourceDictionary.MergedDictionaries>
             <common:DocInfoResourceConverter x:Key="DocInfoResourceConverter"></common:DocInfoResourceConverter>
         </ResourceDictionary>