v1.5.3

k-ujihara · Apr 29, 2019 · 84db1db · 84db1db
1 parent 90d75ec
commit 84db1db
Show file tree

Hide file tree

Showing 11 changed files with 5,996 additions and 42 deletions.
diff --git a/Documentation/Content/VersionHistory/v1.5.3.0.aml b/Documentation/Content/VersionHistory/v1.5.3.0.aml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>
+<topic id="FFF65979-1994-4568-B591-02812B45B180" revisionNumber="1">
+  <developerConceptualDocument xmlns="http://ddue.schemas.microsoft.com/authoring/2003/5" xmlns:xlink="http://www.w3.org/1999/xlink">
+    <introduction>
+      <para>
+        Version 1.5.3 was released on 2019-04-29.
+      </para>
+    </introduction>
+
+    <section>
+      <title>Changes in This Release</title>
+      <content>
+        <list class="bullet">
+          <listItem>
+            <para>
+              This release is based on This release is based on
+              <externalLink>
+                <linkText>cdk 2018-12-08 snapshot</linkText>
+                <linkUri>https://github.com/cdk/cdk/tree/a75ec0065e39525a86f7f613ce6a6b0fe24b2d35</linkUri>
+              </externalLink>.
+            </para>
+          </listItem>
+          <listItem>
+            <para>Move several legacy classes to Legacy assembly.</para>
+          </listItem>
+          <listItem>
+            <para>Remove builder info from Query* classes.</para>
+          </listItem>
+          <listItem>
+            <para>Rename Pattern.Find* methods to Create*Finder.</para>
+          </listItem>
+          <listItem>
+            <para>Fixed BondCountDescriptor and AtomPairs2DFingerprinter class.</para>
+          </listItem>
+        </list>
+      </content>
+    </section>
+
+    <relatedTopics>
+      <link xlink:href="38e429c1-4197-40a9-a1ee-8b5f4c592a1c" />
+    </relatedTopics>
+
+  </developerConceptualDocument>
+</topic>
diff --git a/Documentation/ContentLayout.content b/Documentation/ContentLayout.content
@@ -9,7 +9,8 @@
     <HelpKeywords>
       <HelpKeyword index="K" term="version, history" />
     </HelpKeywords>
-    <Topic id="2596a4ac-1470-4cbf-a672-b98243cd4347" visible="True" isSelected="true" title="Version 1.5.1" />
+    <Topic id="FFF65979-1994-4568-B591-02812B45B180" visible="True" isSelected="true" title="Version 1.5.3" />
+    <Topic id="2596a4ac-1470-4cbf-a672-b98243cd4347" visible="True" title="Version 1.5.1" />
     <Topic id="bb4fe023-dcc8-4325-9925-2f36b1dd4de4" visible="True" title="Version 1.5.0" />
     <Topic id="2EF588D9-B863-4828-A7FD-F86B794FE55B" visible="True" title="Version 1.3.1" />
     <Topic id="4DE10F64-7087-4EDD-9982-F0FC13F66841" visible="True" title="Version 1.3.0" />

diff --git a/Documentation/Documentation.shfbproj b/Documentation/Documentation.shfbproj
@@ -124,6 +124,7 @@
     <Folder Include="media" />
   </ItemGroup>
   <ItemGroup>
+    <None Include="Content\VersionHistory\v1.5.3.0.aml" />
     <None Include="Content\VersionHistory\v1.5.0.1.aml" />
     <None Include="Content\VersionHistory\v1.2.0.0.aml" />
     <None Include="Content\VersionHistory\v1.1.0.0.aml" />

diff --git a/NCDK.Display/NCDK.Display.csproj b/NCDK.Display/NCDK.Display.csproj
@@ -3,10 +3,10 @@
     <OutputType>Library</OutputType>
     <TargetFramework>net461</TargetFramework>
 
-    <AssemblyVersion>1.5.1.0</AssemblyVersion>
+    <AssemblyVersion>1.5.3.0</AssemblyVersion>
     <FileVersion>1.5.1.0</FileVersion>
     <Version>1.5.3</Version>
-    <Copyright>Copyright © 2016-2018 Kazuya Ujihara</Copyright>
+    <Copyright>Copyright © 2016-2019 Kazuya Ujihara</Copyright>
 
     <PackageId>NCDK.Display</PackageId>
     <Product>NCDK.Display: Depiction module of NCDK</Product>

diff --git a/NCDK.Display/NCDK.Display.nuspec b/NCDK.Display/NCDK.Display.nuspec
@@ -2,15 +2,15 @@
 <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
   <metadata>
     <id>NCDK.Display</id>
-    <version>1.5.3-alpha</version>
+    <version>1.5.3</version>
     <title>NCDK.Display: Depiction module of NCDK</title>
     <authors>Kazuya Ujihara</authors>
     <owners>kazuya</owners>
     <licenseUrl>https://github.com/kazuyaujihara/NCDK/blob/master/LICENSE</licenseUrl>
     <projectUrl>https://github.com/kazuyaujihara/NCDK</projectUrl>
     <requireLicenseAcceptance>false</requireLicenseAcceptance>
     <description>Depiction module of NCDK</description>
-    <releaseNotes>This release is based on https://github.com/cdk/cdk/tree/6fade7b5470669955835046d9fb09c48f658efde snapshot.</releaseNotes>
+    <releaseNotes>This release is based on https://github.com/cdk/cdk/tree/a75ec0065e39525a86f7f613ce6a6b0fe24b2d35 snapshot.</releaseNotes>
     <copyright>Copyright © 2016-2018 Kazuya Ujihara</copyright>
     <tags>cdk cheminformatics chemistry toolkit</tags>
 	<frameworkAssemblies>
@@ -20,7 +20,7 @@
       <frameworkAssembly assemblyName="WindowsBase" />
     </frameworkAssemblies>
     <dependencies>
-      <dependency id="NCDK" version="1.5.1" />
+      <dependency id="NCDK" version="1.5.3" />
     </dependencies>
   </metadata>
   <files>

diff --git a/NCDK.Document.sln b/NCDK.Document.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
 VisualStudioVersion = 15.0.27130.2010
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NCDK", "NCDK\NCDK.csproj", "{B0B5EACF-5F39-42D0-BACD-1FF559CCC8B2}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCDK", "NCDK\NCDK.csproj", "{B0B5EACF-5F39-42D0-BACD-1FF559CCC8B2}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3ED0556C-42B8-4FEF-9606-B0474A2E69D2}"
 	ProjectSection(SolutionItems) = preProject
@@ -12,21 +12,25 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		IncludeExamples.ttinclude = IncludeExamples.ttinclude
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NCDK.Display", "NCDK.Display\NCDK.Display.csproj", "{60B8BEBC-9968-44A7-AB0B-11C03116579D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCDK.Display", "NCDK.Display\NCDK.Display.csproj", "{60B8BEBC-9968-44A7-AB0B-11C03116579D}"
 EndProject
 Project("{7CF6DF6D-3B04-46F8-A40B-537D21BCA0B4}") = "Documentation", "Documentation\Documentation.shfbproj", "{AC088342-626A-4091-AAA4-90E391265E99}"
 	ProjectSection(ProjectDependencies) = postProject
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693} = {5634D0C3-3151-4820-ACEB-7BF02A2F1693}
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD} = {8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}
 		{B0B5EACF-5F39-42D0-BACD-1FF559CCC8B2} = {B0B5EACF-5F39-42D0-BACD-1FF559CCC8B2}
 	EndProjectSection
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleCodes", "ExampleCodes\ExampleCodes.csproj", "{5634D0C3-3151-4820-ACEB-7BF02A2F1693}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ExampleCodes", "ExampleCodes\ExampleCodes.csproj", "{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NCDKTests", "NCDKTests\NCDKTests.csproj", "{20CDE36F-227D-4181-9D49-538581A3ADF0}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCDKTests", "NCDKTests\NCDKTests.csproj", "{20CDE36F-227D-4181-9D49-538581A3ADF0}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "NCDK.DisplayTests", "NCDK.DisplayTests\NCDK.DisplayTests.csproj", "{5C750906-0264-482A-8E7D-6C5EB123F53C}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCDK.DisplayTests", "NCDK.DisplayTests\NCDK.DisplayTests.csproj", "{5C750906-0264-482A-8E7D-6C5EB123F53C}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MolViewer", "MolViewer\MolViewer.csproj", "{D7CA78A9-2F56-4FDD-883B-37C237569FAA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MolViewer", "MolViewer\MolViewer.csproj", "{6D6E44EC-A467-461F-AF6B-83A9D575EF76}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCDK.Legacy", "NCDK.Legacy\NCDK.Legacy.csproj", "{13552FDA-815A-4C9B-955D-A36116C6F715}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NCDK.LegacyTests", "NCDK.LegacyTests\NCDK.LegacyTests.csproj", "{17574C65-AEFA-4626-A66E-9B0C12C18F0C}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -74,18 +78,18 @@ Global
 		{AC088342-626A-4091-AAA4-90E391265E99}.Release|x64.Build.0 = Release|Any CPU
 		{AC088342-626A-4091-AAA4-90E391265E99}.Release|x86.ActiveCfg = Release|Any CPU
 		{AC088342-626A-4091-AAA4-90E391265E99}.Release|x86.Build.0 = Release|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Debug|x64.Build.0 = Debug|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Debug|x86.Build.0 = Debug|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Release|Any CPU.Build.0 = Release|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Release|x64.ActiveCfg = Release|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Release|x64.Build.0 = Release|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Release|x86.ActiveCfg = Release|Any CPU
-		{5634D0C3-3151-4820-ACEB-7BF02A2F1693}.Release|x86.Build.0 = Release|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Debug|x64.Build.0 = Debug|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Debug|x86.Build.0 = Debug|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Release|Any CPU.Build.0 = Release|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Release|x64.ActiveCfg = Release|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Release|x64.Build.0 = Release|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Release|x86.ActiveCfg = Release|Any CPU
+		{8E0BEC7D-2EE7-4141-8AD8-C51C8737DDFD}.Release|x86.Build.0 = Release|Any CPU
 		{20CDE36F-227D-4181-9D49-538581A3ADF0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{20CDE36F-227D-4181-9D49-538581A3ADF0}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{20CDE36F-227D-4181-9D49-538581A3ADF0}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -110,18 +114,42 @@ Global
 		{5C750906-0264-482A-8E7D-6C5EB123F53C}.Release|x64.Build.0 = Release|Any CPU
 		{5C750906-0264-482A-8E7D-6C5EB123F53C}.Release|x86.ActiveCfg = Release|Any CPU
 		{5C750906-0264-482A-8E7D-6C5EB123F53C}.Release|x86.Build.0 = Release|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Debug|x64.Build.0 = Debug|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Debug|x86.Build.0 = Debug|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Release|Any CPU.Build.0 = Release|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Release|x64.ActiveCfg = Release|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Release|x64.Build.0 = Release|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Release|x86.ActiveCfg = Release|Any CPU
-		{D7CA78A9-2F56-4FDD-883B-37C237569FAA}.Release|x86.Build.0 = Release|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Debug|x64.Build.0 = Debug|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Debug|x86.Build.0 = Debug|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Release|Any CPU.Build.0 = Release|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Release|x64.ActiveCfg = Release|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Release|x64.Build.0 = Release|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Release|x86.ActiveCfg = Release|Any CPU
+		{6D6E44EC-A467-461F-AF6B-83A9D575EF76}.Release|x86.Build.0 = Release|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Debug|x64.Build.0 = Debug|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Debug|x86.Build.0 = Debug|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Release|Any CPU.Build.0 = Release|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Release|x64.ActiveCfg = Release|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Release|x64.Build.0 = Release|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Release|x86.ActiveCfg = Release|Any CPU
+		{13552FDA-815A-4C9B-955D-A36116C6F715}.Release|x86.Build.0 = Release|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Debug|x64.Build.0 = Debug|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Debug|x86.Build.0 = Debug|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Release|Any CPU.Build.0 = Release|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Release|x64.ActiveCfg = Release|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Release|x64.Build.0 = Release|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Release|x86.ActiveCfg = Release|Any CPU
+		{17574C65-AEFA-4626-A66E-9B0C12C18F0C}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/NCDK.Legacy/NCDK.Legacy.csproj b/NCDK.Legacy/NCDK.Legacy.csproj
@@ -18,6 +18,7 @@
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
     <NoWarn>1701;1702;0612</NoWarn>
+    <DocumentationFile>C:\Users\ujiha\source\repos\NCDK\NCDK.Legacy\NCDK.Legacy.xml</DocumentationFile>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">