From b579184e5d9d5f0a851ada6dc3a09c1680e531ed Mon Sep 17 00:00:00 2001 From: Mike Williams-UK Date: Wed, 8 Jan 2020 13:16:04 +0000 Subject: [PATCH] Merged PR 317: Create version 3.0.31 - Copyright 2020 - Insert and Web Search buttons wrongly enabled when a structure is selected - Ensure Add-in is dumb when word is embedded in another document - Null pointer exception in the loading of user options Related work items: #643 --- .github/ISSUE_TEMPLATE/bug_report.md | 31 ++ .github/ISSUE_TEMPLATE/feature_request.md | 24 ++ .github/PULL_REQUEST_TEMPLATE.md | 36 ++ CODE_OF_CONDUCT.md | 76 ++++ CONTRIBUTING.md | 88 ++++ src/Chem4Word.V3/AssemblyReflectionManager.cs | 2 +- src/Chem4Word.V3/Chem4WordV3.cs | 378 ++++++++++-------- src/Chem4Word.V3/Data/Chem4Word-Versions.xml | 15 +- src/Chem4Word.V3/Data/This-Version.xml | 4 +- src/Chem4Word.V3/Data/index.html | 4 + src/Chem4Word.V3/Database/Library.cs | 8 +- src/Chem4Word.V3/Helpers/C4wAddInInfo.cs | 2 +- src/Chem4Word.V3/Helpers/ChemistryHelper.cs | 2 +- src/Chem4Word.V3/Helpers/ConfigWatcher.cs | 2 +- .../Helpers/CustomXMLPartHelper.cs | 2 +- src/Chem4Word.V3/Helpers/FormulaHelper.cs | 2 +- src/Chem4Word.V3/Helpers/ReferenceKeeper.cs | 2 +- src/Chem4Word.V3/Helpers/RegistryHelper.cs | 2 +- src/Chem4Word.V3/Helpers/TargetWord.cs | 2 +- src/Chem4Word.V3/Helpers/TaskPaneHelper.cs | 2 +- src/Chem4Word.V3/Helpers/UpdateHelper.cs | 14 +- src/Chem4Word.V3/Helpers/Upgrader.cs | 12 +- src/Chem4Word.V3/Helpers/WaitCursor.cs | 2 +- .../Library/DefaultNameConverter.cs | 2 +- src/Chem4Word.V3/Library/LibraryHost.cs | 2 +- src/Chem4Word.V3/Library/LibraryItem.cs | 2 +- .../Library/LibraryItemControl.xaml.cs | 2 +- src/Chem4Word.V3/Library/LibraryModel.cs | 2 +- src/Chem4Word.V3/Library/LibraryValidation.cs | 2 +- .../Library/LibraryViewControl.xaml.cs | 2 +- src/Chem4Word.V3/Library/LibraryViewModel.cs | 2 +- .../Library/NameValidationRule.cs | 2 +- src/Chem4Word.V3/Library/TagBlock.xaml.cs | 2 +- src/Chem4Word.V3/Library/TagEditor.cs | 2 +- .../Navigator/DoNothingConverter.cs | 2 +- src/Chem4Word.V3/Navigator/FormulaBlock.cs | 2 +- src/Chem4Word.V3/Navigator/NavigatorHost.cs | 2 +- src/Chem4Word.V3/Navigator/NavigatorItem.cs | 2 +- .../Navigator/NavigatorItemControl.xaml.cs | 2 +- src/Chem4Word.V3/Navigator/NavigatorModel.cs | 2 +- .../Navigator/NavigatorSupport.cs | 2 +- .../Navigator/NavigatorViewControl.xaml.cs | 2 +- .../Navigator/NavigatorViewModel.cs | 2 +- src/Chem4Word.V3/Options.cs | 2 +- src/Chem4Word.V3/Properties/Annotations.cs | 2 +- src/Chem4Word.V3/Properties/AssemblyInfo.cs | 8 +- .../Ribbon/Chem4WordRibbon.Designer.cs | 9 + src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs | 205 ++++++---- src/Chem4Word.V3/Tags/TagBox.xaml.cs | 2 +- src/Chem4Word.V3/UI/About.cs | 2 +- src/Chem4Word.V3/UI/AutomaticUpdate.cs | 2 +- src/Chem4Word.V3/UI/EditLabels.cs | 2 +- src/Chem4Word.V3/UI/ImportErrors.cs | 2 +- src/Chem4Word.V3/UI/PlugInComboItem.cs | 2 +- src/Chem4Word.V3/UI/UpdateFailure.cs | 2 +- .../UI/UserControls/UcEditFormula.cs | 2 +- .../UI/UserControls/UcEditName.cs | 2 +- .../UI/UserControls/UcMoleculeLabelEditor.cs | 2 +- .../UI/WPF/SettingsControl.xaml.cs | 2 +- src/Chem4Word.V3/UI/WPF/SettingsHost.cs | 2 +- src/Chem4Word.V3/UI/XmlViewer.cs | 2 +- .../WebServices/ChemicalProperties.cs | 2 +- .../WebServices/ChemicalServices.cs | 2 +- .../WebServices/ChemicalServicesResult.cs | 2 +- src/Chem4WordTests/ControlTestForm.cs | 2 +- .../Converters/PersistenceTests.cs | 2 +- src/Chem4WordTests/Properties/AssemblyInfo.cs | 8 +- src/Chem4WordTests/ResourceHelper.cs | 2 +- src/Chemistry/Chem4Word.Model/Atom.cs | 2 +- src/Chemistry/Chem4Word.Model/Bond.cs | 2 +- src/Chemistry/Chem4Word.Model/ChemicalName.cs | 2 +- .../Chem4Word.Model/ChemistryContainer.cs | 2 +- .../Chem4Word.Model/Converters/CML/CML.cs | 2 +- .../Converters/CML/CMLConverter.cs | 2 +- .../Chem4Word.Model/Converters/IConverter.cs | 2 +- .../Converters/Json/JSONConverter.cs | 2 +- .../Chem4Word.Model/Converters/MDL/Counts.cs | 2 +- .../Converters/MDL/CtabProcessor.cs | 2 +- .../Converters/MDL/DataProcessor.cs | 2 +- .../Converters/MDL/MDLConstants.cs | 2 +- .../Converters/MDL/PropertyType.cs | 2 +- .../Converters/MDL/SdFileBase.cs | 2 +- .../Converters/MDL/SdFileConverter.cs | 2 +- .../Converters/MDL/SdfState.cs | 2 +- src/Chemistry/Chem4Word.Model/Element.cs | 2 +- src/Chemistry/Chem4Word.Model/ElementBase.cs | 2 +- src/Chemistry/Chem4Word.Model/Enums/Enums.cs | 2 +- src/Chemistry/Chem4Word.Model/Formula.cs | 2 +- .../Chem4Word.Model/FunctionalGroup.cs | 2 +- .../Chem4Word.Model/FunctionalGroups.cs | 2 +- .../Chem4Word.Model/Geometry/Geometry.cs | 2 +- .../Chem4Word.Model/Geometry/Packer.cs | 2 +- .../Chem4Word.Model/Geometry/Seperator.cs | 2 +- src/Chemistry/Chem4Word.Model/Globals.cs | 2 +- src/Chemistry/Chem4Word.Model/Model.cs | 2 +- src/Chemistry/Chem4Word.Model/Molecule.cs | 2 +- .../Chem4Word.Model/MoleculeUtils.cs | 2 +- .../Chem4Word.Model/PeriodicTable.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- src/Chemistry/Chem4Word.Model/Reaction.cs | 2 +- src/Chemistry/Chem4Word.Model/Ring.cs | 2 +- src/Chemistry/Chem4Word.Model/Utils.cs | 2 +- .../AdjustScaleToFitContentBehavior.cs | 2 +- .../Chem4Word.Controls/Display.xaml.cs | 2 +- .../Chem4Word.Controls/DisplayControl.xaml.cs | 2 +- .../Chem4Word.Controls/DoNothingConverter.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../Chem4Word.ViewModel/AtomGeometry.cs | 2 +- .../Controls/Chem4Word.ViewModel/AtomShape.cs | 2 +- .../Chem4Word.ViewModel/BondGeometry.cs | 2 +- .../Controls/Chem4Word.ViewModel/BondShape.cs | 2 +- .../Chem4Word.ViewModel/CanvasAutoSize.cs | 2 +- .../Controls/Chem4Word.ViewModel/Globals.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../Chem4Word.ViewModel/VisualTreeHelpers.cs | 2 +- .../Chem4Word.Core/Helpers/CohenSutherland.cs | 2 +- .../Chem4Word.Core/Helpers/Constants.cs | 35 +- .../Chem4Word.Core/Helpers/ResourceHelper.cs | 2 +- src/Common/Chem4Word.Core/Helpers/SafeDate.cs | 53 ++- .../Chem4Word.Core/Helpers/SafeDouble.cs | 2 +- .../Chem4Word.Core/Properties/AssemblyInfo.cs | 8 +- .../UI/Controls/CustomProgressBar.cs | 2 +- .../UI/Controls/TabControlEx.cs | 2 +- .../Chem4Word.Core/UI/Controls/Win32.cs | 2 +- .../Chem4Word.Core/UI/Forms/MolFileViewer.cs | 2 +- .../Chem4Word.Core/UI/Forms/Progress.cs | 2 +- .../Chem4Word.Core/UI/Forms/ReportError.cs | 2 +- .../Chem4Word.Core/UI/Wpf/WpfEventArgs.cs | 2 +- src/Common/Chem4Word.Core/UserInteractions.cs | 2 +- src/Common/Telemetry/AzureServiceBusWriter.cs | 2 +- .../Telemetry/Properties/AssemblyInfo.cs | 8 +- src/Common/Telemetry/ServiceBusMessage.cs | 2 +- src/Common/Telemetry/SystemHelper.cs | 68 +++- src/Common/Telemetry/TelemetryWriter.cs | 2 +- src/Common/Telemetry/WmiHelper.cs | 2 +- src/Installer/Chem4WordSetup/Constants.cs | 2 +- src/Installer/Chem4WordSetup/Program.cs | 2 +- .../Chem4WordSetup/Properties/AssemblyInfo.cs | 8 +- .../Chem4WordSetup/RegistryHelper.cs | 2 +- src/Installer/Chem4WordSetup/Setup.cs | 2 +- src/Installer/Chem4WordSetup/TaskIndicator.cs | 2 +- src/Installer/Chem4WordUpdater/Constants.cs | 2 +- src/Installer/Chem4WordUpdater/Program.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../Chem4WordUpdater/RegistryHelper.cs | 2 +- src/Installer/Chem4WordUpdater/Updater.cs | 2 +- .../WiX.CustomAction/CustomAction.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- src/Installer/WiXInstaller/Product.wxs | 2 +- .../WiXInstaller/WiX-Installer.wixproj | 2 +- src/Notes/Releases.txt | 2 +- src/PlugIns/Contracts/IChem4WordCommon.cs | 2 +- src/PlugIns/Contracts/IChem4WordEditor.cs | 2 +- src/PlugIns/Contracts/IChem4WordRenderer.cs | 2 +- src/PlugIns/Contracts/IChem4WordSearcher.cs | 2 +- src/PlugIns/Contracts/IChem4WordTelemetry.cs | 2 +- .../Contracts/Properties/AssemblyInfo.cs | 8 +- .../ChemDoodleWeb.702/ChemDoodleWeb.cs | 2 +- .../Editors/ChemDoodleWeb.702/Editor.cs | 2 +- .../Editors/ChemDoodleWeb.702/Options.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../Editors/ChemDoodleWeb.702/Settings.cs | 2 +- .../Editors/ChemDoodleWeb.800/Editor.cs | 2 +- .../Editors/ChemDoodleWeb.800/EditorHost.cs | 2 +- .../Editors/ChemDoodleWeb.800/Options.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../Editors/ChemDoodleWeb.800/Settings.cs | 2 +- .../ChemDoodleWeb.800/WpfChemDoodle.xaml.cs | 2 +- src/PlugIns/Editors/SimpleWpfEditor/Editor.cs | 2 +- .../SimpleWpfEditor/EditorControl.xaml.cs | 2 +- .../Editors/SimpleWpfEditor/EditorHost.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../Renderers/OoXmlV3/CoordinateTool.cs | 2 +- src/PlugIns/Renderers/OoXmlV3/GeometryTool.cs | 2 +- .../OoXmlV3/OOXML/Atoms/AtomLabelCharacter.cs | 2 +- .../OOXML/Atoms/AtomLabelPositioner.cs | 2 +- .../OoXmlV3/OOXML/Atoms/AtomLabelRenderer.cs | 2 +- .../Renderers/OoXmlV3/OOXML/Bonds/BondLine.cs | 2 +- .../OoXmlV3/OOXML/Bonds/BondLinePositioner.cs | 2 +- .../OoXmlV3/OOXML/Bonds/BondLineRenderer.cs | 2 +- .../Renderers/OoXmlV3/OOXML/OoXmlFile.cs | 2 +- .../Renderers/OoXmlV3/OOXML/OoXmlHelper.cs | 2 +- .../Renderers/OoXmlV3/OOXML/OoXmlRenderer.cs | 2 +- src/PlugIns/Renderers/OoXmlV3/Options.cs | 2 +- .../OoXmlV3/Properties/AssemblyInfo.cs | 8 +- src/PlugIns/Renderers/OoXmlV3/Renderer.cs | 2 +- src/PlugIns/Renderers/OoXmlV3/Settings.cs | 2 +- .../Renderers/OoXmlV3/TTF/TtfCharacter.cs | 2 +- .../Renderers/OoXmlV3/TTF/TtfContour.cs | 2 +- src/PlugIns/Renderers/OoXmlV3/TTF/TtfPoint.cs | 2 +- .../Constants.cs | 2 +- .../Chem4Word.Searcher.ChEBIPlugin/Options.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../SearchChEBI.cs | 2 +- .../Searcher.cs | 2 +- .../Settings.cs | 2 +- .../WaitCursor.cs | 2 +- .../Options.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../Searcher.cs | 2 +- .../Settings.cs | 2 +- .../Constants.cs | 2 +- .../Chem4Word.Searcher.OpsinPlugIn/Options.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../SearchOpsin.cs | 2 +- .../Searcher.cs | 2 +- .../Settings.cs | 2 +- .../Constants.cs | 2 +- .../Options.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- .../SearchPubChem.cs | 2 +- .../Searcher.cs | 2 +- .../Settings.cs | 2 +- src/Scripts/Install-Dev-Certificate.ps1 | 6 +- src/Scripts/SetAssemblyVersion.ps1 | 2 +- src/Scripts/SignFiles.cmd | 2 +- src/Shared/FolderHelper.cs | 2 +- src/Shared/OfficeHelper.cs | 18 +- src/Shared/RegistryWOW6432.cs | 2 +- .../WindowsForms-TestHarness/FlexForm.cs | 2 +- .../WindowsForms-TestHarness/Form1.cs | 2 +- .../WindowsForms-TestHarness/Program.cs | 2 +- .../Properties/AssemblyInfo.cs | 8 +- 223 files changed, 1056 insertions(+), 556 deletions(-) create mode 100644 .github/ISSUE_TEMPLATE/bug_report.md create mode 100644 .github/ISSUE_TEMPLATE/feature_request.md create mode 100644 .github/PULL_REQUEST_TEMPLATE.md create mode 100644 CODE_OF_CONDUCT.md create mode 100644 CONTRIBUTING.md diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 00000000..0c79a2ef --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,31 @@ +--- +name: Bug report +about: Create a report to help us improve +title: '' +labels: '' +assignees: '' + +--- + +**Describe the bug** +A clear and concise description [in English] of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description [in English] of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Desktop (please complete the following information):** + - OS: [e.g. Windows 7/8.1/10 Home/Professional] + - Word Version [e.g. 2016/O365/2019 Home/Business/Professional] + +**Additional context** +Add any other context about the problem here. diff --git a/.github/ISSUE_TEMPLATE/feature_request.md b/.github/ISSUE_TEMPLATE/feature_request.md new file mode 100644 index 00000000..53a5f6fc --- /dev/null +++ b/.github/ISSUE_TEMPLATE/feature_request.md @@ -0,0 +1,24 @@ +--- +name: Feature request +about: Suggest an idea for this project +title: '' +labels: '' +assignees: '' + +--- + +**Is your feature request related to a problem? Please describe.** + +A clear and concise description [in English] of what the problem is. Ex. I'm always frustrated when [...] + +**Describe the solution you'd like** + +A clear and concise description [in English] of what you want to happen. + +**Describe alternatives you've considered** + +A clear and concise description [in English] of any alternative solutions or features you've considered. + +**Additional context** + +Add any other context or screenshots about the feature request here. diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md new file mode 100644 index 00000000..081f5e8b --- /dev/null +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -0,0 +1,36 @@ +# Description + +Please include a summary of the change and which issue is fixed. Please also include relevant motivation and context. List any dependencies that are required for this change. + +Fixes # (issue) + +## Type of change + +Please delete options that are not relevant. + +- [ ] Bug fix (non-breaking change which fixes an issue) +- [ ] New feature (non-breaking change which adds functionality) +- [ ] Breaking change (fix or feature that would cause existing functionality to not work as expected) +- [ ] This change requires a documentation update + +# How Has This Been Tested? + +Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration + +- [ ] Test A +- [ ] Test B + +**Test Configuration**: +* OS version: +* Word Version: + +# Checklist: + +- [ ] My code follows the style guidelines of this project +- [ ] I have performed a self-review of my own code +- [ ] I have commented my code in hard-to-understand areas +- [ ] I have made corresponding changes to the documentation +- [ ] My changes generate no new warnings +- [ ] I have added tests that prove my fix is effective or that my feature works +- [ ] New and existing unit tests pass locally with my changes +- [ ] Any dependent changes have been merged and published in downstream modules diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md new file mode 100644 index 00000000..f52309ea --- /dev/null +++ b/CODE_OF_CONDUCT.md @@ -0,0 +1,76 @@ +# Contributor Covenant Code of Conduct + +## Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, sex characteristics, gender identity and expression, +level of experience, education, socio-economic status, nationality, personal +appearance, race, religion, or sexual identity and orientation. + +## Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or + advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +## Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +## Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +## Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at info@chem4word.co.uk. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +## Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at https://www.contributor-covenant.org/version/1/4/code-of-conduct.html + +[homepage]: https://www.contributor-covenant.org + +For answers to common questions about this code of conduct, see +https://www.contributor-covenant.org/faq diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md new file mode 100644 index 00000000..0206458a --- /dev/null +++ b/CONTRIBUTING.md @@ -0,0 +1,88 @@ +# Contributing + +When contributing to this repository, please first discuss the change you wish to make via issue, +email, or any other method with the owners of this repository before making a change. + +Please note we have a code of conduct, please follow it in all your interactions with the project. + +## Pull Request Process + +1. Ensure any install or build dependencies are removed before the end of the layer when doing a + build. +2. You may merge the Pull Request in once you have the sign-off of two other developers, or if you + do not have permission to do that, you may request the second reviewer to merge it for you. + +## Code of Conduct + +### Our Pledge + +In the interest of fostering an open and welcoming environment, we as +contributors and maintainers pledge to making participation in our project and +our community a harassment-free experience for everyone, regardless of age, body +size, disability, ethnicity, gender identity and expression, level of experience, +nationality, personal appearance, race, religion, or sexual identity and +orientation. + +### Our Standards + +Examples of behavior that contributes to creating a positive environment +include: + +* Using welcoming and inclusive language +* Being respectful of differing viewpoints and experiences +* Gracefully accepting constructive criticism +* Focusing on what is best for the community +* Showing empathy towards other community members + +Examples of unacceptable behavior by participants include: + +* The use of sexualized language or imagery and unwelcome sexual attention or +advances +* Trolling, insulting/derogatory comments, and personal or political attacks +* Public or private harassment +* Publishing others' private information, such as a physical or electronic + address, without explicit permission +* Other conduct which could reasonably be considered inappropriate in a + professional setting + +### Our Responsibilities + +Project maintainers are responsible for clarifying the standards of acceptable +behavior and are expected to take appropriate and fair corrective action in +response to any instances of unacceptable behavior. + +Project maintainers have the right and responsibility to remove, edit, or +reject comments, commits, code, wiki edits, issues, and other contributions +that are not aligned to this Code of Conduct, or to ban temporarily or +permanently any contributor for other behaviors that they deem inappropriate, +threatening, offensive, or harmful. + +### Scope + +This Code of Conduct applies both within project spaces and in public spaces +when an individual is representing the project or its community. Examples of +representing a project or community include using an official project e-mail +address, posting via an official social media account, or acting as an appointed +representative at an online or offline event. Representation of a project may be +further defined and clarified by project maintainers. + +### Enforcement + +Instances of abusive, harassing, or otherwise unacceptable behavior may be +reported by contacting the project team at info@chem4word.co.uk. All +complaints will be reviewed and investigated and will result in a response that +is deemed necessary and appropriate to the circumstances. The project team is +obligated to maintain confidentiality with regard to the reporter of an incident. +Further details of specific enforcement policies may be posted separately. + +Project maintainers who do not follow or enforce the Code of Conduct in good +faith may face temporary or permanent repercussions as determined by other +members of the project's leadership. + +### Attribution + +This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4, +available at [http://contributor-covenant.org/version/1/4][version] + +[homepage]: http://contributor-covenant.org +[version]: http://contributor-covenant.org/version/1/4/ diff --git a/src/Chem4Word.V3/AssemblyReflectionManager.cs b/src/Chem4Word.V3/AssemblyReflectionManager.cs index 7e233f7b..fdeae654 100644 --- a/src/Chem4Word.V3/AssemblyReflectionManager.cs +++ b/src/Chem4Word.V3/AssemblyReflectionManager.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Chem4WordV3.cs b/src/Chem4Word.V3/Chem4WordV3.cs index 79654909..cc270766 100644 --- a/src/Chem4Word.V3/Chem4WordV3.cs +++ b/src/Chem4Word.V3/Chem4WordV3.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -42,7 +42,6 @@ public partial class Chem4WordV3 { // Internal variables for class private static readonly string _product = Assembly.GetExecutingAssembly().FullName.Split(',')[0]; - private static readonly string _class = MethodBase.GetCurrentMethod().DeclaringType?.Name; public static CustomRibbon Ribbon; @@ -61,6 +60,8 @@ public partial class Chem4WordV3 private bool _chemistrySelected = false; private bool _markAsChemistryHandled = false; + private bool _plugInsLoaded = false; + private int _rightClickEvents; private ConfigWatcher _configWatcher; @@ -72,9 +73,9 @@ public partial class Chem4WordV3 public Options SystemOptions; public TelemetryWriter Telemetry; - public List Editors; - public List Renderers; - public List Searchers; + public List Editors = new List(); + public List Renderers = new List(); + public List Searchers = new List(); public Dictionary LibraryNames = null; @@ -178,46 +179,60 @@ public int WordVersion return version; } } + public static void SetGlobalRibbon(CustomRibbon ribbon) + { + Ribbon = ribbon; + } private void C4WAddIn_Startup(object sender, EventArgs e) { string module = $"{MethodBase.GetCurrentMethod().Name}()"; - string message = $"{module} started at {DateTime.Now}"; - Debug.WriteLine(message); - StartUpTimings.Add(message); + var cmd = Environment.CommandLine.ToLower(); + if (Ribbon != null && !cmd.Contains("-embedding")) + { + string message = $"{module} started at {SafeDate.ToLongDate(DateTime.Now)}"; + Debug.WriteLine(message); + StartUpTimings.Add(message); - Stopwatch sw = new Stopwatch(); - sw.Start(); + Stopwatch sw = new Stopwatch(); + sw.Start(); - PerformStartUpActions(); + PerformStartUpActions(); - sw.Stop(); - message = $"{module} took {sw.ElapsedMilliseconds.ToString("#,000")}ms"; - Debug.WriteLine(message); - StartUpTimings.Add(message); + sw.Stop(); + message = $"{module} took {sw.ElapsedMilliseconds.ToString("#,000")}ms"; + StartUpTimings.Add(message); + Debug.WriteLine(message); + } } private void C4WAddIn_Shutdown(object sender, EventArgs e) { string module = $"{_product}.{_class}.{MethodBase.GetCurrentMethod().Name}()"; - PerformShutDownActions(); + if (Ribbon != null) + { + PerformShutDownActions(); + } } private void SlowOperations() { string module = $"{MethodBase.GetCurrentMethod().Name}()"; - string message = $"{module} started at {DateTime.Now}"; + string message = $"{module} started at {SafeDate.ToLongDate(DateTime.Now)}"; Debug.WriteLine(message); StartUpTimings.Add(message); Stopwatch sw = new Stopwatch(); sw.Start(); - Helper = new SystemHelper(); - Helper.StartUpTimings = StartUpTimings; + Thread thread = new Thread(LoadPluginsOnThread); + thread.SetApartmentState(ApartmentState.STA); + thread.Start(); + + Helper = new SystemHelper(StartUpTimings); ServicePointManager.DefaultConnectionLimit = 100; ServicePointManager.UseNagleAlgorithm = false; @@ -225,9 +240,6 @@ private void SlowOperations() ServicePointManager.SecurityProtocol = SecurityProtocolType.Tls12; - // Set parameter mustBeSigned true if assemblies must be signed by us - LoadPlugIns(false); - _configWatcher = new ConfigWatcher(AddInInfo.ProductAppDataPath); Telemetry = new TelemetryWriter(true, Helper); @@ -253,7 +265,7 @@ private void PerformStartUpActions() UpdateHelper.ReadThisVersion(Assembly.GetExecutingAssembly()); ShowOrHideUpdateShield(); - if (Globals.Chem4WordV3.VersionsBehind < Constants.MaximunVersionsBehind) + if (VersionsBehind < Constants.MaximunVersionsBehind) { Word.Application app = Application; @@ -344,6 +356,7 @@ public void LoadOptions() string padPath = AddInInfo.ProductAppDataPath; string fileName = $"{AddInInfo.ProductName}.json"; string optionsFile = Path.Combine(padPath, fileName); + if (File.Exists(optionsFile)) { try @@ -378,9 +391,28 @@ public void LoadOptions() } } - string betaValue = ThisVersion.Root?.Element("IsBeta")?.Value; - bool isBeta = betaValue != null && bool.Parse(betaValue); + bool isBeta = true; + try + { + if (ThisVersion != null) + { + string betaValue = ThisVersion.Root?.Element("IsBeta")?.Value; + isBeta = betaValue != null && bool.Parse(betaValue); + } + } + catch + { + // Assume isBeta + } + + // Belt and braces ... + if (SystemOptions == null) + { + SystemOptions = new Options(); + SystemOptions.RestoreDefaults(); + } + // ... as we are seeing some errors here ? // Re-Initialize Telemetry with granted permissions Telemetry = new TelemetryWriter(isBeta || SystemOptions.TelemetryEnabled, Helper); @@ -415,12 +447,15 @@ public void LoadOptions() } else { - var editor = GetEditorPlugIn(SystemOptions.SelectedEditorPlugIn); - if (editor == null) + if (Editors.Count > 0) { - SystemOptions.SelectedEditorPlugIn = Constants.DefaultEditorPlugIn702; - Telemetry.Write(module, "Information", $"Setting editor to {SystemOptions.SelectedEditorPlugIn}"); - settingsChanged = true; + var editor = GetEditorPlugIn(SystemOptions.SelectedEditorPlugIn); + if (editor == null) + { + SystemOptions.SelectedEditorPlugIn = Constants.DefaultEditorPlugIn702; + Telemetry.Write(module, "Information", $"Setting editor to {SystemOptions.SelectedEditorPlugIn}"); + settingsChanged = true; + } } } @@ -430,12 +465,15 @@ public void LoadOptions() } else { - var renderer = GetRendererPlugIn(SystemOptions.SelectedRendererPlugIn); - if (renderer == null) + if (Renderers.Count > 0) { - SystemOptions.SelectedRendererPlugIn = Constants.DefaultRendererPlugIn; - Telemetry.Write(module, "Information", $"Setting renderer to {SystemOptions.SelectedRendererPlugIn}"); - settingsChanged = true; + var renderer = GetRendererPlugIn(SystemOptions.SelectedRendererPlugIn); + if (renderer == null) + { + SystemOptions.SelectedRendererPlugIn = Constants.DefaultRendererPlugIn; + Telemetry.Write(module, "Information", $"Setting renderer to {SystemOptions.SelectedRendererPlugIn}"); + settingsChanged = true; + } } } @@ -507,10 +545,31 @@ private void PerformShutDownActions() } } + private void LoadPluginsOnThread() + { + LoadPlugIns(false); + if (Ribbon != null) + { + _plugInsLoaded = true; + if (VersionsBehind >= Constants.MaximunVersionsBehind) + { + SetButtonStates(ButtonState.Disabled); + ChemistryProhibitedReason = Constants.Chem4WordTooOld; + } + else + { + OnWindowSelectionChange(Application.Selection); + } + } + } + private void LoadPlugIns(bool mustBeSigned) { string module = $"{MethodBase.GetCurrentMethod().Name}()"; // http://www.codeproject.com/Articles/453778/Loading-Assemblies-from-Anywhere-into-a-New-AppDom + string message = $"{module} started at {SafeDate.ToLongDate(DateTime.Now)}"; + StartUpTimings.Add(message); + Debug.WriteLine(message); Stopwatch sw = new Stopwatch(); sw.Start(); @@ -600,15 +659,6 @@ private void LoadPlugIns(bool mustBeSigned) #endregion Find Our PlugIns - if (plugInsFound.Count == 0) - { - UserInteractions.StopUser("No Plug-Ins Loaded"); - } - - Editors = new List(); - Renderers = new List(); - Searchers = new List(); - Type editorType = typeof(IChem4WordEditor); Type rendererType = typeof(IChem4WordRenderer); Type searcherType = typeof(IChem4WordSearcher); @@ -705,7 +755,8 @@ private void LoadPlugIns(bool mustBeSigned) } sw.Stop(); - string message = $"{module} examining {filesFound} files took {sw.ElapsedMilliseconds.ToString("#,000")}ms"; + + message = $"{module} examining {filesFound} files took {sw.ElapsedMilliseconds.ToString("#,000")}ms"; Debug.WriteLine(message); StartUpTimings.Add(message); } @@ -892,13 +943,15 @@ public void DisableContentControlEvents(Word.Document doc) private void SetButtonStates(ButtonState state) { - if (Ribbon != null) + if (Ribbon != null && _plugInsLoaded) { - //Debug.WriteLine(state.ToString()); - // Not needed, just here for completeness - Ribbon.ChangeOptions.Enabled = true; + // Always enabled Ribbon.HelpMenu.Enabled = true; + bool plugInsLoaded = Editors.Count + Renderers.Count + Searchers.Count > 0; + // Enabled once any PlugIns are loaded + Ribbon.ChangeOptions.Enabled = plugInsLoaded; + switch (state) { case ButtonState.Disabled: @@ -919,7 +972,7 @@ private void SetButtonStates(ButtonState state) break; case ButtonState.CanEdit: - Ribbon.EditStructure.Enabled = true; + Ribbon.EditStructure.Enabled = plugInsLoaded && Editors.Count > 0; Ribbon.EditStructure.Label = "Edit"; Ribbon.EditLabels.Enabled = true; Ribbon.ViewCml.Enabled = true; @@ -935,7 +988,7 @@ private void SetButtonStates(ButtonState state) break; case ButtonState.CanInsert: - Ribbon.EditStructure.Enabled = true; + Ribbon.EditStructure.Enabled = false; Ribbon.EditStructure.Label = "Draw"; Ribbon.EditLabels.Enabled = false; Ribbon.ViewCml.Enabled = false; @@ -944,7 +997,7 @@ private void SetButtonStates(ButtonState state) Ribbon.ShowAsMenu.Enabled = false; Ribbon.ShowNavigator.Enabled = true; Ribbon.ShowLibrary.Enabled = true; - Ribbon.WebSearchMenu.Enabled = true; + Ribbon.WebSearchMenu.Enabled = plugInsLoaded && Searchers.Count > 0; Ribbon.SaveToLibrary.Enabled = false; Ribbon.ArrangeMolecules.Enabled = false; Ribbon.ButtonsDisabled.Enabled = false; @@ -955,45 +1008,52 @@ private void SetButtonStates(ButtonState state) public void ShowOrHideUpdateShield() { - switch (VersionsBehind) + if (Ribbon != null) { - case 0: - Ribbon.Update.Visible = false; - Ribbon.Update.Image = Properties.Resources.Shield_Good; - ChemistryProhibitedReason = ""; - break; + switch (VersionsBehind) + { + case 0: + Ribbon.Update.Visible = false; + Ribbon.Update.Enabled = false; + Ribbon.Update.Image = Properties.Resources.Shield_Good; + ChemistryProhibitedReason = ""; + break; - case 1: - case 2: - case 3: - Ribbon.Update.Visible = true; - Ribbon.Update.Image = Properties.Resources.Shield_Warning; - Ribbon.Update.Label = "Update Advised"; - Ribbon.Update.ScreenTip = "Please update"; - Ribbon.Update.SuperTip = $"You are {VersionsBehind} versions behind."; - ChemistryProhibitedReason = ""; - break; + case 1: + case 2: + case 3: + Ribbon.Update.Visible = true; + Ribbon.Update.Enabled = true; + Ribbon.Update.Image = Properties.Resources.Shield_Warning; + Ribbon.Update.Label = "Update Advised"; + Ribbon.Update.ScreenTip = "Please update"; + Ribbon.Update.SuperTip = $"You are {VersionsBehind} versions behind."; + ChemistryProhibitedReason = ""; + break; - case 4: - case 5: - case 6: - Ribbon.Update.Visible = true; - Ribbon.Update.Image = Properties.Resources.Shield_Danger; - Ribbon.Update.Label = "Update Essential"; - Ribbon.Update.ScreenTip = "Please update"; - Ribbon.Update.SuperTip = $"You are {VersionsBehind} versions behind."; - ChemistryProhibitedReason = ""; - break; + case 4: + case 5: + case 6: + Ribbon.Update.Visible = true; + Ribbon.Update.Enabled = true; + Ribbon.Update.Image = Properties.Resources.Shield_Danger; + Ribbon.Update.Label = "Update Essential"; + Ribbon.Update.ScreenTip = "Please update"; + Ribbon.Update.SuperTip = $"You are {VersionsBehind} versions behind."; + ChemistryProhibitedReason = ""; + break; - default: - Ribbon.Update.Visible = true; - Ribbon.Update.Image = Properties.Resources.Shield_Danger; - Ribbon.Update.Label = "Update to use Chem4Word again"; - Ribbon.Update.ScreenTip = "You must update to continue using Chem4Word"; - Ribbon.Update.SuperTip = $"You are {VersionsBehind} versions behind and Chem4Word has been disabled because it is too many versions old."; - SetButtonStates(ButtonState.Disabled); - ChemistryProhibitedReason = "Chem4Word is too many versions old."; - break; + default: + Ribbon.Update.Visible = true; + Ribbon.Update.Enabled = true; + Ribbon.Update.Image = Properties.Resources.Shield_Danger; + Ribbon.Update.Label = "Update to use Chem4Word again"; + Ribbon.Update.ScreenTip = "You must update to continue using Chem4Word"; + Ribbon.Update.SuperTip = $"You are {VersionsBehind} versions behind and Chem4Word has been disabled because it is too many versions old."; + SetButtonStates(ButtonState.Disabled); + ChemistryProhibitedReason = Constants.Chem4WordTooOld; + break; + } } } @@ -1008,64 +1068,65 @@ public void SelectChemistry(Word.Selection sel) try { - Word.Document doc = sel.Application.ActiveDocument; - int ccCount = sel.ContentControls.Count; - //Debug.WriteLine($"SelectChemistry() Document: {doc.Name} Selection from {sel.Range.Start} to {sel.Range.End}"); - //Debug.WriteLine($"SelectChemistry() Document: {doc.Name} Selection has {sel.ContentControls.Count} CCs"); - - foreach (Word.ContentControl cc in doc.ContentControls) + if (sel != null) { - //Debug.WriteLine($"CC '{cc.Tag}' Range from {cc.Range.Start} to {cc.Range.End}"); + Word.Document doc = sel.Application.ActiveDocument; + int ccCount = sel.ContentControls.Count; - // Already Selected - if (sel.Range.Start == cc.Range.Start - 1 && sel.Range.End == cc.Range.End + 1) + foreach (Word.ContentControl cc in doc.ContentControls) { - if (cc.Title != null && cc.Title.Equals(Constants.ContentControlTitle)) + // Already Selected + if (sel.Range.Start == cc.Range.Start - 1 && sel.Range.End == cc.Range.End + 1) { - //Debug.WriteLine($" Existing Selected Chemistry"); - NavigatorSupport.SelectNavigatorItem(CustomXmlPartHelper.GuidFromTag(cc.Tag)); - chemistrySelected = true; + if (cc.Title != null && cc.Title.Equals(Constants.ContentControlTitle)) + { + NavigatorSupport.SelectNavigatorItem(CustomXmlPartHelper.GuidFromTag(cc.Tag)); + chemistrySelected = true; + } + break; } - break; - } - // Inside CC - if (sel.Range.Start >= cc.Range.Start && sel.Range.End <= cc.Range.End) - { - if (cc.Title != null && cc.Title.Equals(Constants.ContentControlTitle)) + // Inside CC + if (sel.Range.Start >= cc.Range.Start && sel.Range.End <= cc.Range.End) { - //Debug.WriteLine($" SelectChemistry() Selecting CC at {cc.Range.Start - 1} to {cc.Range.End + 1}"); - doc.Application.Selection.SetRange(cc.Range.Start - 1, cc.Range.End + 1); -#if DEBUG - //Word.Selection s = doc.Application.Selection; - //Debug.WriteLine($" SelectChemistry() New Selected Range is {s.Range.Start - 1} to {s.Range.End + 1}"); -#endif - NavigatorSupport.SelectNavigatorItem(CustomXmlPartHelper.GuidFromTag(cc.Tag)); - chemistrySelected = true; + if (cc.Title != null && cc.Title.Equals(Constants.ContentControlTitle)) + { + doc.Application.Selection.SetRange(cc.Range.Start - 1, cc.Range.End + 1); + NavigatorSupport.SelectNavigatorItem(CustomXmlPartHelper.GuidFromTag(cc.Tag)); + chemistrySelected = true; + } + break; } - break; } - } - if (chemistrySelected) - { - Ribbon.ActivateChemistryTab(); - SetButtonStates(ButtonState.CanEdit); - } - else - { - if (ccCount == 0) + if (VersionsBehind >= Constants.MaximunVersionsBehind) { - SetButtonStates(ButtonState.CanInsert); + SetButtonStates(ButtonState.Disabled); + ChemistryProhibitedReason = Constants.Chem4WordTooOld; } else { - SetButtonStates(ButtonState.NoDocument); - ChemistryProhibitedReason = "more than a single content control selected"; + if (chemistrySelected) + { + Ribbon.ActivateChemistryTab(); + SetButtonStates(ButtonState.CanEdit); + } + else + { + if (ccCount == 0) + { + SetButtonStates(ButtonState.CanInsert); + } + else + { + SetButtonStates(ButtonState.NoDocument); + ChemistryProhibitedReason = "more than a single content control selected"; + } + } } - } - _chemistrySelected = chemistrySelected; + _chemistrySelected = chemistrySelected; + } } catch (Exception e) { @@ -1123,16 +1184,14 @@ private void OnCommandBarButtonClick(CommandBarButton ctrl, ref bool cancelDefau } _rightClickEvents++; - //Debug.WriteLine($"{module} Event#{_rightClickEvents} Handled: {_markAsChemistryHandled}"); ClearChemistryContextMenus(); if (!_markAsChemistryHandled) { - //Debug.WriteLine($"Convert '{ctrl.Tag}' to Chemistry"); TargetWord tw = JsonConvert.DeserializeObject(ctrl.Tag); var lib = new Database.Library(); - string cml = lib.GetChemistryByID(tw.ChemistryId); + string cml = lib.GetChemistryById(tw.ChemistryId); if (cml == null) { @@ -1188,8 +1247,6 @@ private void OnCommandBarButtonClick(CommandBarButton ctrl, ref bool cancelDefau app.ScreenUpdating = false; DisableContentControlEvents(doc); - //Debug.WriteLine($"'{tw.ChemicalName}' {tw.Start} > {tw.End}"); - app.Options.SmartCutPaste = false; int insertionPoint = tw.Start; doc.Range(tw.Start, tw.Start + tw.ChemicalName.Length).Delete(); @@ -1203,8 +1260,8 @@ private void OnCommandBarButtonClick(CommandBarButton ctrl, ref bool cancelDefau } catch (Exception e) { - Console.WriteLine(e); - throw; + Telemetry.Write(module, "Exception", e.Message); + Telemetry.Write(module, "Exception", e.StackTrace); } finally { @@ -1301,7 +1358,6 @@ private void HandleRightClick(Word.Selection sel) ChemistryId = kvp.Value, End = start + idx + kvp.Key.Length }; - //Debug.WriteLine(tw.ToString()); selectedWords.Add(tw); } } @@ -1425,7 +1481,13 @@ private void OnNewDocument(Word.Document doc) try { - //Debug.WriteLine($"{module.Replace("()", $"({doc.Name})")}"); + if (Ribbon != null) + { + if (SystemOptions == null) + { + LoadOptions(); + } + } } catch (Exception ex) { @@ -1461,15 +1523,12 @@ private void OnDocumentChange() { // This only happens when document is in protected mode Debug.WriteLine($"Module: {module}; Exception: {ex1.Message}"); - //Telemetry.Write(module, "Information", $"Exception: {ex1.Message}"); } if (doc != null) { bool docxMode = doc.CompatibilityMode >= (int)Word.WdCompatibilityMode.wdWord2010; - //Debug.WriteLine($"{module.Replace("()", $"({doc.Name})")}"); - // Call disable first to ensure events not registered multiple times DisableContentControlEvents(doc); @@ -1628,10 +1687,12 @@ private void OnDocumentOpen(Word.Document doc) try { - //Debug.WriteLine($"{module.Replace("()", $"({doc.Name})")}"); - if (SystemOptions == null) + if (Ribbon != null) { - LoadOptions(); + if (SystemOptions == null) + { + LoadOptions(); + } } } catch (Exception ex) @@ -1664,8 +1725,6 @@ private void OnDocumentBeforeSave(Word.Document doc, ref bool saveAsUi, ref bool try { - //Debug.WriteLine($"{module.Replace("()", $"({doc.Name})")}"); - if (SystemOptions == null) { LoadOptions(); @@ -1719,8 +1778,6 @@ private void OnDocumentBeforeClose(Word.Document doc, ref bool cancel) try { - //Debug.WriteLine($"{module.Replace("()", $"({doc.Name})")}"); - if (SystemOptions == null) { LoadOptions(); @@ -1792,19 +1849,6 @@ private void OnWindowSelectionChange(Word.Selection sel) try { - //try - //{ - // if (sel != null) - // { - // Debug.WriteLine($"{module.Replace("()", $"({sel.Document.Name})")}"); - // Debug.WriteLine($" OnWindowSelectionChange() Selection from {sel.Range.Start} to {sel.Range.End} CC's {sel.ContentControls.Count}"); - // } - //} - //catch - //{ - // // - //} - if (EventsEnabled) { EventsEnabled = false; @@ -1866,7 +1910,7 @@ public void EvaluateChemistryAllowed() ChemistryProhibitedReason = "document is readonly."; } - if (doc != null) + if (allowed && doc != null) { if (doc.CompatibilityMode < (int)Word.WdCompatibilityMode.wdWord2010) { @@ -1889,13 +1933,13 @@ public void EvaluateChemistryAllowed() } Word.Selection sel = Application.Selection; - if (sel.OMaths.Count > 0) + if (allowed && sel.OMaths.Count > 0) { ChemistryProhibitedReason = "selection is in an Equation."; allowed = false; } - if (sel.Tables.Count > 0) + if (allowed && sel.Tables.Count > 0) { try { @@ -1911,6 +1955,12 @@ public void EvaluateChemistryAllowed() } } + if (allowed && doc.IsSubdocument) + { + ChemistryProhibitedReason = "current document is a sub document."; + allowed = false; + } + if (allowed) { try diff --git a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml index 41a88b5d..a0aa2022 100644 --- a/src/Chem4Word.V3/Data/Chem4Word-Versions.xml +++ b/src/Chem4Word.V3/Data/Chem4Word-Versions.xml @@ -2,15 +2,26 @@ f3c4f4db-2fff-46db-b14a-feb8e09f7742 + + 3.0.31 Release 19 + false + 08-Jan-2020 + + Bug Fix; Insert and Web Search buttons wrongly enabled when structure is selected + Bug Fix; Ensure Add-in is dumb when word is embedded in another document + Bug Fix; Null pointer exception in loading of user options + Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating. + + https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.31.Release.19.msi + 3.0.30 Release 18 false 11-Nov-2019 Bug Fix; Null pointer exception in new O365 detection due to unexpected data - Please download Chem4Word-Setup.exe from https://www.chem4word.co.uk/download/ if you encounter any difficulties updating. - https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.29.Release.17.msi + https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.30.Release.18.msi 3.0.29 Release 17 diff --git a/src/Chem4Word.V3/Data/This-Version.xml b/src/Chem4Word.V3/Data/This-Version.xml index ed0d222b..61ba8a02 100644 --- a/src/Chem4Word.V3/Data/This-Version.xml +++ b/src/Chem4Word.V3/Data/This-Version.xml @@ -1,6 +1,6 @@  - 3.0.30 Release 18 + 3.0.31 Release 19 false - 11-Nov-2019 + 08-Jan-2020 \ No newline at end of file diff --git a/src/Chem4Word.V3/Data/index.html b/src/Chem4Word.V3/Data/index.html index 5843121c..c9e470a0 100644 --- a/src/Chem4Word.V3/Data/index.html +++ b/src/Chem4Word.V3/Data/index.html @@ -15,6 +15,10 @@

Chemistry for Word Add-In V3

Setup Bootstrapper Chem4Word-Setup + + Version 3.0.31 - Release 19 + Chem4Word-Setup 3.0.31 Release 19 + Version 3.0.30 - Release 18 Chem4Word-Setup 3.0.30 Release 18 diff --git a/src/Chem4Word.V3/Database/Library.cs b/src/Chem4Word.V3/Database/Library.cs index 6765189b..8545efa2 100644 --- a/src/Chem4Word.V3/Database/Library.cs +++ b/src/Chem4Word.V3/Database/Library.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -238,12 +238,12 @@ private void DeleteChemistry(SQLiteConnection conn, long chemistryId) } } - public string GetChemistryByID(long id) + public string GetChemistryById(long id) { string result = null; using (SQLiteConnection conn = LibraryConnection()) { - SQLiteDataReader chemistry = GetChemistryByID(conn, id); + SQLiteDataReader chemistry = GetChemistryById(conn, id); while (chemistry.Read()) { var byteArray = (Byte[])chemistry["Chemistry"]; @@ -258,7 +258,7 @@ public string GetChemistryByID(long id) return result; } - private SQLiteDataReader GetChemistryByID(SQLiteConnection conn, long id) + private SQLiteDataReader GetChemistryById(SQLiteConnection conn, long id) { string module = $"{_product}.{_class}.{MethodBase.GetCurrentMethod().Name}()"; try diff --git a/src/Chem4Word.V3/Helpers/C4wAddInInfo.cs b/src/Chem4Word.V3/Helpers/C4wAddInInfo.cs index 7b062573..fc04a5db 100644 --- a/src/Chem4Word.V3/Helpers/C4wAddInInfo.cs +++ b/src/Chem4Word.V3/Helpers/C4wAddInInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Helpers/ChemistryHelper.cs b/src/Chem4Word.V3/Helpers/ChemistryHelper.cs index 86987bb0..a45d226c 100644 --- a/src/Chem4Word.V3/Helpers/ChemistryHelper.cs +++ b/src/Chem4Word.V3/Helpers/ChemistryHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Helpers/ConfigWatcher.cs b/src/Chem4Word.V3/Helpers/ConfigWatcher.cs index f6f69a4f..920b48eb 100644 --- a/src/Chem4Word.V3/Helpers/ConfigWatcher.cs +++ b/src/Chem4Word.V3/Helpers/ConfigWatcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Helpers/CustomXMLPartHelper.cs b/src/Chem4Word.V3/Helpers/CustomXMLPartHelper.cs index a5693f99..6d3cb8ce 100644 --- a/src/Chem4Word.V3/Helpers/CustomXMLPartHelper.cs +++ b/src/Chem4Word.V3/Helpers/CustomXMLPartHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Helpers/FormulaHelper.cs b/src/Chem4Word.V3/Helpers/FormulaHelper.cs index ee271dfd..740dab87 100644 --- a/src/Chem4Word.V3/Helpers/FormulaHelper.cs +++ b/src/Chem4Word.V3/Helpers/FormulaHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Helpers/ReferenceKeeper.cs b/src/Chem4Word.V3/Helpers/ReferenceKeeper.cs index 6f65c2c8..77a4b43a 100644 --- a/src/Chem4Word.V3/Helpers/ReferenceKeeper.cs +++ b/src/Chem4Word.V3/Helpers/ReferenceKeeper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Helpers/RegistryHelper.cs b/src/Chem4Word.V3/Helpers/RegistryHelper.cs index cac81ece..c311b5b4 100644 --- a/src/Chem4Word.V3/Helpers/RegistryHelper.cs +++ b/src/Chem4Word.V3/Helpers/RegistryHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Helpers/TargetWord.cs b/src/Chem4Word.V3/Helpers/TargetWord.cs index 05acc099..b02ae043 100644 --- a/src/Chem4Word.V3/Helpers/TargetWord.cs +++ b/src/Chem4Word.V3/Helpers/TargetWord.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Helpers/TaskPaneHelper.cs b/src/Chem4Word.V3/Helpers/TaskPaneHelper.cs index 660932d7..d19f148f 100644 --- a/src/Chem4Word.V3/Helpers/TaskPaneHelper.cs +++ b/src/Chem4Word.V3/Helpers/TaskPaneHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Helpers/UpdateHelper.cs b/src/Chem4Word.V3/Helpers/UpdateHelper.cs index 4f7c3b6c..892bf146 100644 --- a/src/Chem4Word.V3/Helpers/UpdateHelper.cs +++ b/src/Chem4Word.V3/Helpers/UpdateHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -58,6 +58,9 @@ public static int CheckForUpdates(int frequency) } } +#if DEBUG + doCheck = true; +#endif if (doCheck) { bool update = false; @@ -183,7 +186,7 @@ public static bool FetchUpdateInfo() { string currentVersionNumber = Globals.Chem4WordV3.ThisVersion.Root.Element("Number").Value; DateTime currentReleaseDate = SafeDate.Parse(Globals.Chem4WordV3.ThisVersion.Root.Element("Released").Value); - Debug.WriteLine("Current Version " + currentVersionNumber + " Released " + currentReleaseDate.ToString("dd-MMM-yyyy", CultureInfo.InvariantCulture)); + Debug.WriteLine("Current Version " + currentVersionNumber + " Released " + SafeDate.ToShortDate(currentReleaseDate)); string xml = GetVersionsXmlFile(); if (!string.IsNullOrEmpty(xml)) @@ -196,7 +199,7 @@ public static bool FetchUpdateInfo() { var thisVersionNumber = version.Element("Number").Value; DateTime thisVersionDate = SafeDate.Parse(version.Element("Released").Value); - Debug.WriteLine("New Version " + thisVersionNumber + " Released " + thisVersionDate.ToString("dd-MMM-yyyy", CultureInfo.InvariantCulture)); + Debug.WriteLine("New Version " + thisVersionNumber + " Released " + SafeDate.ToShortDate(thisVersionDate)); if (thisVersionDate > currentReleaseDate) { Globals.Chem4WordV3.VersionsBehind++; @@ -329,7 +332,10 @@ public static void ClearSettings() } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } } } diff --git a/src/Chem4Word.V3/Helpers/Upgrader.cs b/src/Chem4Word.V3/Helpers/Upgrader.cs index 21ba8bfe..ea2b64a3 100644 --- a/src/Chem4Word.V3/Helpers/Upgrader.cs +++ b/src/Chem4Word.V3/Helpers/Upgrader.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -123,7 +123,7 @@ public static int LegacyChemistryCount(Word.Document doc) foreach (Word.ContentControl cc in doc.ContentControls) { Word.WdContentControlType? contentControlType = cc.Type; - Debug.WriteLine($"{cc.ID} {cc.Range.Start} {DecodeContentControlType(contentControlType)} {cc.Tag}"); + //Debug.WriteLine($"{cc.ID} {cc.Range.Start} {DecodeContentControlType(contentControlType)} {cc.Tag}"); try { if (cc.Title != null && cc.Title.Equals(Constants.LegacyContentControlTitle)) @@ -340,7 +340,7 @@ private static List CollectData(Word.Document doc) string xml = xmlPart.XML; if (xml.Contains(" CollectData(Word.Document doc) if (xml.Contains(" CollectData(Word.Document doc) if (ddNode != null) { ddValue = ddNode.Attributes["value"].Value; - Debug.WriteLine(" " + ddValue); + //Debug.WriteLine(" " + ddValue); } if (refNode != null) { ccValue = refNode.Attributes["cc"].Value; cmlValue = refNode.Attributes["cml"].Value; - Debug.WriteLine($" CC Id: {ccValue} CML Id: {cmlValue}"); + //Debug.WriteLine($" CC Id: {ccValue} CML Id: {cmlValue}"); foreach (UpgradeTarget target in targets) { diff --git a/src/Chem4Word.V3/Helpers/WaitCursor.cs b/src/Chem4Word.V3/Helpers/WaitCursor.cs index 84f9f1ea..d2b02dcb 100644 --- a/src/Chem4Word.V3/Helpers/WaitCursor.cs +++ b/src/Chem4Word.V3/Helpers/WaitCursor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Library/DefaultNameConverter.cs b/src/Chem4Word.V3/Library/DefaultNameConverter.cs index 95fcc7e7..5d2da245 100644 --- a/src/Chem4Word.V3/Library/DefaultNameConverter.cs +++ b/src/Chem4Word.V3/Library/DefaultNameConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Library/LibraryHost.cs b/src/Chem4Word.V3/Library/LibraryHost.cs index 2c1f04af..a2036e42 100644 --- a/src/Chem4Word.V3/Library/LibraryHost.cs +++ b/src/Chem4Word.V3/Library/LibraryHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Library/LibraryItem.cs b/src/Chem4Word.V3/Library/LibraryItem.cs index 9e03eec7..b47a960c 100644 --- a/src/Chem4Word.V3/Library/LibraryItem.cs +++ b/src/Chem4Word.V3/Library/LibraryItem.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Library/LibraryItemControl.xaml.cs b/src/Chem4Word.V3/Library/LibraryItemControl.xaml.cs index c4985266..0985ec5f 100644 --- a/src/Chem4Word.V3/Library/LibraryItemControl.xaml.cs +++ b/src/Chem4Word.V3/Library/LibraryItemControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Library/LibraryModel.cs b/src/Chem4Word.V3/Library/LibraryModel.cs index f9943324..139d95c9 100644 --- a/src/Chem4Word.V3/Library/LibraryModel.cs +++ b/src/Chem4Word.V3/Library/LibraryModel.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Library/LibraryValidation.cs b/src/Chem4Word.V3/Library/LibraryValidation.cs index 2bbf8118..06be49d7 100644 --- a/src/Chem4Word.V3/Library/LibraryValidation.cs +++ b/src/Chem4Word.V3/Library/LibraryValidation.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs b/src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs index ff778aa2..a5ee64d2 100644 --- a/src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs +++ b/src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Library/LibraryViewModel.cs b/src/Chem4Word.V3/Library/LibraryViewModel.cs index 72f05698..f372b04b 100644 --- a/src/Chem4Word.V3/Library/LibraryViewModel.cs +++ b/src/Chem4Word.V3/Library/LibraryViewModel.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Library/NameValidationRule.cs b/src/Chem4Word.V3/Library/NameValidationRule.cs index 529e68b0..36a28d17 100644 --- a/src/Chem4Word.V3/Library/NameValidationRule.cs +++ b/src/Chem4Word.V3/Library/NameValidationRule.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Library/TagBlock.xaml.cs b/src/Chem4Word.V3/Library/TagBlock.xaml.cs index d82fe1ca..04ec5153 100644 --- a/src/Chem4Word.V3/Library/TagBlock.xaml.cs +++ b/src/Chem4Word.V3/Library/TagBlock.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Library/TagEditor.cs b/src/Chem4Word.V3/Library/TagEditor.cs index 35d9d795..388f94c9 100644 --- a/src/Chem4Word.V3/Library/TagEditor.cs +++ b/src/Chem4Word.V3/Library/TagEditor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Navigator/DoNothingConverter.cs b/src/Chem4Word.V3/Navigator/DoNothingConverter.cs index 6e2b7ecc..f0df99ea 100644 --- a/src/Chem4Word.V3/Navigator/DoNothingConverter.cs +++ b/src/Chem4Word.V3/Navigator/DoNothingConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Navigator/FormulaBlock.cs b/src/Chem4Word.V3/Navigator/FormulaBlock.cs index fb013041..3b9fdfd0 100644 --- a/src/Chem4Word.V3/Navigator/FormulaBlock.cs +++ b/src/Chem4Word.V3/Navigator/FormulaBlock.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Navigator/NavigatorHost.cs b/src/Chem4Word.V3/Navigator/NavigatorHost.cs index fc2a0209..2197c58d 100644 --- a/src/Chem4Word.V3/Navigator/NavigatorHost.cs +++ b/src/Chem4Word.V3/Navigator/NavigatorHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Navigator/NavigatorItem.cs b/src/Chem4Word.V3/Navigator/NavigatorItem.cs index 47251bf1..fa1f1a6b 100644 --- a/src/Chem4Word.V3/Navigator/NavigatorItem.cs +++ b/src/Chem4Word.V3/Navigator/NavigatorItem.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Navigator/NavigatorItemControl.xaml.cs b/src/Chem4Word.V3/Navigator/NavigatorItemControl.xaml.cs index c7b570ab..e04b02b4 100644 --- a/src/Chem4Word.V3/Navigator/NavigatorItemControl.xaml.cs +++ b/src/Chem4Word.V3/Navigator/NavigatorItemControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Navigator/NavigatorModel.cs b/src/Chem4Word.V3/Navigator/NavigatorModel.cs index a2f466d6..36f08f09 100644 --- a/src/Chem4Word.V3/Navigator/NavigatorModel.cs +++ b/src/Chem4Word.V3/Navigator/NavigatorModel.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Navigator/NavigatorSupport.cs b/src/Chem4Word.V3/Navigator/NavigatorSupport.cs index 0132c22f..ded2f7c8 100644 --- a/src/Chem4Word.V3/Navigator/NavigatorSupport.cs +++ b/src/Chem4Word.V3/Navigator/NavigatorSupport.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Navigator/NavigatorViewControl.xaml.cs b/src/Chem4Word.V3/Navigator/NavigatorViewControl.xaml.cs index 3b90dcb7..51d4cc5e 100644 --- a/src/Chem4Word.V3/Navigator/NavigatorViewControl.xaml.cs +++ b/src/Chem4Word.V3/Navigator/NavigatorViewControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Navigator/NavigatorViewModel.cs b/src/Chem4Word.V3/Navigator/NavigatorViewModel.cs index 759dd567..7f5f24fb 100644 --- a/src/Chem4Word.V3/Navigator/NavigatorViewModel.cs +++ b/src/Chem4Word.V3/Navigator/NavigatorViewModel.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Options.cs b/src/Chem4Word.V3/Options.cs index 4e1a6470..d624db3b 100644 --- a/src/Chem4Word.V3/Options.cs +++ b/src/Chem4Word.V3/Options.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Properties/Annotations.cs b/src/Chem4Word.V3/Properties/Annotations.cs index 69619541..5f77c244 100644 --- a/src/Chem4Word.V3/Properties/Annotations.cs +++ b/src/Chem4Word.V3/Properties/Annotations.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/Properties/AssemblyInfo.cs b/src/Chem4Word.V3/Properties/AssemblyInfo.cs index f1f975a3..82666776 100644 --- a/src/Chem4Word.V3/Properties/AssemblyInfo.cs +++ b/src/Chem4Word.V3/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word V3")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.Designer.cs b/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.Designer.cs index c259587e..92e4fce0 100644 --- a/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.Designer.cs +++ b/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.Designer.cs @@ -100,6 +100,7 @@ private void InitializeComponent() // this.WebSearchMenu.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge; this.WebSearchMenu.Dynamic = true; + this.WebSearchMenu.Enabled = false; this.WebSearchMenu.Image = global::Chem4Word.Properties.Resources.WebSearch; this.WebSearchMenu.Label = "Web Search"; this.WebSearchMenu.Name = "WebSearchMenu"; @@ -128,6 +129,7 @@ private void InitializeComponent() // ShowLibrary // this.ShowLibrary.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge; + this.ShowLibrary.Enabled = false; this.ShowLibrary.Image = global::Chem4Word.Properties.Resources.Gallery_Find; this.ShowLibrary.Label = "Open"; this.ShowLibrary.Name = "ShowLibrary"; @@ -138,6 +140,7 @@ private void InitializeComponent() // SaveToLibrary // this.SaveToLibrary.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge; + this.SaveToLibrary.Enabled = false; this.SaveToLibrary.Image = global::Chem4Word.Properties.Resources.Gallery_Save; this.SaveToLibrary.Label = "Save"; this.SaveToLibrary.Name = "SaveToLibrary"; @@ -171,6 +174,7 @@ private void InitializeComponent() // ArrangeMolecules // this.ArrangeMolecules.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge; + this.ArrangeMolecules.Enabled = false; this.ArrangeMolecules.Image = global::Chem4Word.Properties.Resources.Seperate_Molecules; this.ArrangeMolecules.Label = "Arrange"; this.ArrangeMolecules.Name = "ArrangeMolecules"; @@ -215,6 +219,7 @@ private void InitializeComponent() // ShowNavigator // this.ShowNavigator.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge; + this.ShowNavigator.Enabled = false; this.ShowNavigator.Image = global::Chem4Word.Properties.Resources.Navigator_Toggle; this.ShowNavigator.Label = "Navigate"; this.ShowNavigator.Name = "ShowNavigator"; @@ -233,6 +238,7 @@ private void InitializeComponent() // ChangeOptions // this.ChangeOptions.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge; + this.ChangeOptions.Enabled = false; this.ChangeOptions.Image = global::Chem4Word.Properties.Resources.Options; this.ChangeOptions.Label = "Options"; this.ChangeOptions.Name = "ChangeOptions"; @@ -243,6 +249,7 @@ private void InitializeComponent() // HelpMenu // this.HelpMenu.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge; + this.HelpMenu.Enabled = false; this.HelpMenu.Image = global::Chem4Word.Properties.Resources.Help; this.HelpMenu.Items.Add(this.ShowAbout); this.HelpMenu.Items.Add(this.ShowHome); @@ -307,11 +314,13 @@ private void InitializeComponent() // Update // this.Update.ControlSize = Microsoft.Office.Core.RibbonControlSize.RibbonControlSizeLarge; + this.Update.Enabled = false; this.Update.Image = global::Chem4Word.Properties.Resources.Shield_Good; this.Update.Label = "Update"; this.Update.Name = "Update"; this.Update.ScreenTip = "About Chem4Word"; this.Update.ShowImage = true; + this.Update.Visible = false; this.Update.Click += new Microsoft.Office.Tools.Ribbon.RibbonControlEventHandler(this.OnUpdateClick); // // CustomRibbon diff --git a/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs b/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs index c1d1165f..35795183 100644 --- a/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs +++ b/src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -35,6 +35,13 @@ using SaveFileDialog = System.Windows.Forms.SaveFileDialog; using Word = Microsoft.Office.Interop.Word; +/* + * **************************** + * Do NOT Change this Namespace + * **************************** + */ + +// ReSharper disable once CheckNamespace namespace Chem4Word { public partial class CustomRibbon @@ -56,25 +63,22 @@ private void CustomRibbon_Load(object sender, RibbonUIEventArgs e) try { - Chem4Word.Chem4WordV3.Ribbon = this; + Chem4Word.Chem4WordV3.SetGlobalRibbon(this); + RibbonTab tab = this.Tabs[0]; string tabLabel = "Chemistry"; #if DEBUG tabLabel += $" (Debug {Constants.Chem4WordVersion})"; #endif - if (Globals.Chem4WordV3.WordVersion == 2013) - { - tab.Label = tabLabel.ToUpper(); - } - else - { - tab.Label = tabLabel; - } + tab.Label = Globals.Chem4WordV3.WordVersion == 2013 ? tabLabel.ToUpper() : tabLabel; } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } } @@ -97,7 +101,6 @@ private void OnRenderAsButtonClick(object sender, RibbonControlEventArgs e) try { RibbonButton b = sender as RibbonButton; - //Debug.WriteLine($"User chose {b.Tag}"); Word.Selection sel = app.Selection; @@ -106,7 +109,6 @@ private void OnRenderAsButtonClick(object sender, RibbonControlEventArgs e) if (sel.ContentControls.Count > 0) { cc = sel.ContentControls[1]; - //Debug.WriteLine("Existing CC ID: " + cc.ID + " Tag: " + cc?.Tag + " Title: " + cc.Title); if (cc.Title != null && cc.Title.Equals(Constants.ContentControlTitle)) { string chosenState = b.Tag.ToString(); @@ -182,7 +184,6 @@ private void OnRenderAsButtonClick(object sender, RibbonControlEventArgs e) text = ChemistryHelper.GetInlineText(model, chosenState, ref isFormula, out source); Globals.Chem4WordV3.Telemetry.Write(module, "Information", $"Render structure as {source}"); } - ChemistryHelper.Insert1D(cc, text, isFormula, chosenState + ":" + guid); } } @@ -198,7 +199,10 @@ private void OnRenderAsButtonClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } finally { @@ -236,7 +240,6 @@ private void AddDynamicMenuItems() if (sel.ContentControls.Count > 0) { cc = sel.ContentControls[1]; - //Debug.WriteLine("Existing CC ID: " + cc.ID + " Tag: " + cc?.Tag + " Title: " + cc.Title); if (cc.Title != null && cc.Title.Equals(Constants.ContentControlTitle)) { string prefix = "2D"; @@ -349,7 +352,10 @@ private void AddDynamicMenuItems() } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } } @@ -380,6 +386,7 @@ private void OnOptionsClick(object sender, RibbonControlEventArgs e) if (Globals.Chem4WordV3.EventsEnabled && Globals.Chem4WordV3.ChemistryAllowed) { Globals.Chem4WordV3.EventsEnabled = false; + Word.Application app = Globals.Chem4WordV3.Application; try { @@ -396,9 +403,15 @@ private void OnOptionsClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } Globals.Chem4WordV3.EventsEnabled = true; + + app.ActiveWindow.SetFocus(); + app.Activate(); } AfterButtonChecks(sender as RibbonButton); @@ -523,7 +536,10 @@ public static void InsertFile() { Exception x = new Exception("Could not import file"); Globals.Chem4WordV3.Telemetry.Write(module, "Exception(Data)", mol); - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, x).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, x)) + { + form.ShowDialog(); + } } } } @@ -536,7 +552,10 @@ public static void InsertFile() } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } } @@ -552,7 +571,7 @@ public void ActivateChemistryTab() } } - public bool BeforeButtonChecks(RibbonButton button) + private bool BeforeButtonChecks(RibbonButton button) { if (Globals.Chem4WordV3.SystemOptions == null) { @@ -564,7 +583,7 @@ public bool BeforeButtonChecks(RibbonButton button) return true; } - public void AfterButtonChecks(RibbonButton button) + private void AfterButtonChecks(RibbonButton button) { RegistryHelper.SendSetupActions(); RegistryHelper.SendUpdateActions(); @@ -587,6 +606,8 @@ public void AfterButtonChecks(RibbonButton button) } Globals.Chem4WordV3.EvaluateChemistryAllowed(); + Globals.Chem4WordV3.ShowOrHideUpdateShield(); + Globals.Chem4WordV3.SelectChemistry(Globals.Chem4WordV3.Application.Selection); } public static void PerformEdit() @@ -918,20 +939,17 @@ public static void PerformEdit() } else { - string tempfileName = null; - // Always render the file. renderer.Properties = new Dictionary(); renderer.Properties.Add("Guid", guidString); renderer.Cml = afterCml; - tempfileName = renderer.Render(); + string tempfileName = renderer.Render(); if (!isNewDrawing) { // Erase old CC cc.LockContents = false; - Debug.WriteLine(cc.Type); if (cc.Type == Word.WdContentControlType.wdContentControlPicture) { cc.Range.InlineShapes[1].Delete(); @@ -1004,7 +1022,10 @@ public static void PerformEdit() } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } finally { @@ -1036,8 +1057,8 @@ private void OnViewCmlClick(object sender, RibbonControlEventArgs e) if (Globals.Chem4WordV3.EventsEnabled && Globals.Chem4WordV3.ChemistryAllowed) { Globals.Chem4WordV3.EventsEnabled = false; - Word.Application app = Globals.Chem4WordV3.Application; + try { Word.Selection sel = app.Selection; @@ -1065,13 +1086,16 @@ private void OnViewCmlClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } - Globals.Chem4WordV3.EventsEnabled = true; - app.ActiveWindow.SetFocus(); app.Activate(); + + Globals.Chem4WordV3.EventsEnabled = true; } AfterButtonChecks(sender as RibbonButton); @@ -1175,7 +1199,10 @@ private void ExportFile() } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } } @@ -1190,6 +1217,7 @@ private void OnEditLabelsClick(object sender, RibbonControlEventArgs e) Globals.Chem4WordV3.EventsEnabled = false; Word.Application app = Globals.Chem4WordV3.Application; + try { Word.Document doc = app.ActiveDocument; @@ -1234,12 +1262,18 @@ private void OnEditLabelsClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } + } + finally + { + app.ActiveWindow.SetFocus(); + app.Activate(); } Globals.Chem4WordV3.EventsEnabled = true; - app.ActiveWindow.SetFocus(); - app.Activate(); } AfterButtonChecks(sender as RibbonButton); @@ -1260,10 +1294,11 @@ private void OnViewAsItemsLoading(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } - - AfterButtonChecks(sender as RibbonButton); } private void OnSearchItemsLoading(object sender, RibbonControlEventArgs e) @@ -1297,10 +1332,11 @@ private void OnSearchItemsLoading(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } - - AfterButtonChecks(sender as RibbonButton); } private void OnSearcherClick(object sender, RibbonControlEventArgs ribbonControlEventArgs) @@ -1312,6 +1348,7 @@ private void OnSearcherClick(object sender, RibbonControlEventArgs ribbonControl if (Globals.Chem4WordV3.EventsEnabled && Globals.Chem4WordV3.ChemistryAllowed) { Globals.Chem4WordV3.EventsEnabled = false; + Word.Application app = Globals.Chem4WordV3.Application; try { @@ -1337,10 +1374,16 @@ private void OnSearcherClick(object sender, RibbonControlEventArgs ribbonControl } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } Globals.Chem4WordV3.EventsEnabled = true; + + app.ActiveWindow.SetFocus(); + app.Activate(); } AfterButtonChecks(sender as RibbonButton); @@ -1419,7 +1462,10 @@ private void OnSaveToLibraryClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } Globals.Chem4WordV3.EventsEnabled = true; } @@ -1437,7 +1483,7 @@ private void OnNavigatorClick(object sender, RibbonControlEventArgs e) { //see https://msdn.microsoft.com/en-us/library/bb608620(v=vs.100).aspx - Debug.WriteLine($"OnNavigatorClick() {ShowNavigator.Checked}"); + //Debug.WriteLine($"OnNavigatorClick() {ShowNavigator.Checked}"); Word.Application app = Globals.Chem4WordV3.Application; @@ -1488,7 +1534,10 @@ private void OnNavigatorClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } AfterButtonChecks(sender as RibbonButton); @@ -1500,8 +1549,6 @@ private void OnNavigatorPaneVisibleChanged(object sender, EventArgs eventArgs) try { - Debug.WriteLine($"OnNavigatorPaneVisibleChanged() {ShowNavigator.Checked}"); - CustomTaskPane taskPane = sender as CustomTaskPane; Word.Application app = Globals.Chem4WordV3.Application; @@ -1513,11 +1560,8 @@ private void OnNavigatorPaneVisibleChanged(object sender, EventArgs eventArgs) if (window != null) { string taskdoc = window.Document.Name; - Debug.WriteLine(taskdoc); - if (taskdoc.Equals(app.ActiveDocument.Name)) { - Debug.WriteLine($"Navigator Visible: {taskPane.Visible}"); if (ShowNavigator.Checked != taskPane.Visible) { ShowNavigator.Checked = taskPane.Visible; @@ -1529,10 +1573,11 @@ private void OnNavigatorPaneVisibleChanged(object sender, EventArgs eventArgs) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } - - AfterButtonChecks(sender as RibbonButton); } private void OnShowLibraryClick(object sender, RibbonControlEventArgs e) @@ -1553,8 +1598,6 @@ private void OnShowLibraryClick(object sender, RibbonControlEventArgs e) { if (Globals.Chem4WordV3.EventsEnabled) { - //app.System.Cursor = Word.WdCursorType.wdCursorWait; - if (app.Documents.Count > 0) { CustomTaskPane custTaskPane = null; @@ -1605,7 +1648,10 @@ private void OnShowLibraryClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } AfterButtonChecks(sender as RibbonButton); @@ -1617,8 +1663,6 @@ public void OnLibraryPaneVisibleChanged(object sender, EventArgs eventArgs) try { - Debug.WriteLine($"OnLibraryPaneVisibleChanged() {ShowLibrary.Checked}"); - Word.Application app = Globals.Chem4WordV3.Application; CustomTaskPane taskPane = sender as CustomTaskPane; @@ -1630,10 +1674,8 @@ public void OnLibraryPaneVisibleChanged(object sender, EventArgs eventArgs) if (window != null) { string taskdoc = window.Document.Name; - Debug.WriteLine(taskdoc); if (taskdoc.Equals(app.ActiveDocument.Name)) { - //Debug.WriteLine($"Library Visible: {taskPane.Visible}"); if (ShowLibrary.Checked != taskPane.Visible) { ShowLibrary.Checked = taskPane.Visible; @@ -1650,7 +1692,10 @@ public void OnLibraryPaneVisibleChanged(object sender, EventArgs eventArgs) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } } @@ -1728,7 +1773,6 @@ private void OnSeparateClick(object sender, RibbonControlEventArgs e) // Insert a new CC cc = doc.ContentControls.Add(Word.WdContentControlType.wdContentControlRichText, ref _missing); - Debug.WriteLine("Inserted ContentControl " + cc.ID); cc.Title = Constants.ContentControlTitle; cc.Tag = fullTag; @@ -1755,7 +1799,10 @@ private void OnSeparateClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } finally { @@ -1767,7 +1814,6 @@ private void OnSeparateClick(object sender, RibbonControlEventArgs e) { // Move selection point into the Content Control which was just edited or added app.Selection.SetRange(cc.Range.Start, cc.Range.End); - //Globals.Chem4WordV3.SelectChemistry(app.Selection); } } Globals.Chem4WordV3.EventsEnabled = true; @@ -1799,7 +1845,10 @@ private void OnUpdateClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } Globals.Chem4WordV3.EventsEnabled = true; @@ -1828,7 +1877,6 @@ private void OnShowAboutClick(object sender, RibbonControlEventArgs e) UpdateHelper.ReadThisVersion(assembly); if (Globals.Chem4WordV3.ThisVersion != null) { - string[] parts = Globals.Chem4WordV3.ThisVersion.Root.Element("Number").Value.Split(' '); string temp = Globals.Chem4WordV3.ThisVersion.Root.Element("Number").Value; int idx = temp.IndexOf(" "); fa.VersionString = $"Chem4Word V{Constants.Chem4WordVersion} {temp.Substring(idx + 1)} [{fvi.FileVersion}]"; @@ -1842,7 +1890,10 @@ private void OnShowAboutClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } Globals.Chem4WordV3.EventsEnabled = true; @@ -1867,7 +1918,10 @@ private void OnShowHomeClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } Globals.Chem4WordV3.EventsEnabled = true; @@ -1935,7 +1989,10 @@ private void OnReadManualClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } Globals.Chem4WordV3.EventsEnabled = true; @@ -1960,7 +2017,10 @@ private void OnYouTubeClick(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } Globals.Chem4WordV3.EventsEnabled = true; @@ -1982,7 +2042,10 @@ private void ButtonsDisabled_Click(object sender, RibbonControlEventArgs e) } catch (Exception ex) { - new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex).ShowDialog(); + using (var form = new ReportError(Globals.Chem4WordV3.Telemetry, Globals.Chem4WordV3.WordTopLeft, module, ex)) + { + form.ShowDialog(); + } } AfterButtonChecks(sender as RibbonButton); diff --git a/src/Chem4Word.V3/Tags/TagBox.xaml.cs b/src/Chem4Word.V3/Tags/TagBox.xaml.cs index bf0674aa..3290e566 100644 --- a/src/Chem4Word.V3/Tags/TagBox.xaml.cs +++ b/src/Chem4Word.V3/Tags/TagBox.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/About.cs b/src/Chem4Word.V3/UI/About.cs index abca8562..53032ebe 100644 --- a/src/Chem4Word.V3/UI/About.cs +++ b/src/Chem4Word.V3/UI/About.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/AutomaticUpdate.cs b/src/Chem4Word.V3/UI/AutomaticUpdate.cs index 40ab6e71..9eddabc9 100644 --- a/src/Chem4Word.V3/UI/AutomaticUpdate.cs +++ b/src/Chem4Word.V3/UI/AutomaticUpdate.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/EditLabels.cs b/src/Chem4Word.V3/UI/EditLabels.cs index cddcce5f..ba356a58 100644 --- a/src/Chem4Word.V3/UI/EditLabels.cs +++ b/src/Chem4Word.V3/UI/EditLabels.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/ImportErrors.cs b/src/Chem4Word.V3/UI/ImportErrors.cs index 73963f06..cc0b8ec8 100644 --- a/src/Chem4Word.V3/UI/ImportErrors.cs +++ b/src/Chem4Word.V3/UI/ImportErrors.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/PlugInComboItem.cs b/src/Chem4Word.V3/UI/PlugInComboItem.cs index 11018217..fdf26821 100644 --- a/src/Chem4Word.V3/UI/PlugInComboItem.cs +++ b/src/Chem4Word.V3/UI/PlugInComboItem.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/UpdateFailure.cs b/src/Chem4Word.V3/UI/UpdateFailure.cs index 0a8278bb..5b892131 100644 --- a/src/Chem4Word.V3/UI/UpdateFailure.cs +++ b/src/Chem4Word.V3/UI/UpdateFailure.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/UserControls/UcEditFormula.cs b/src/Chem4Word.V3/UI/UserControls/UcEditFormula.cs index 1ffa0aa7..8dd59da0 100644 --- a/src/Chem4Word.V3/UI/UserControls/UcEditFormula.cs +++ b/src/Chem4Word.V3/UI/UserControls/UcEditFormula.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/UserControls/UcEditName.cs b/src/Chem4Word.V3/UI/UserControls/UcEditName.cs index 6d0ed2ad..c431eea6 100644 --- a/src/Chem4Word.V3/UI/UserControls/UcEditName.cs +++ b/src/Chem4Word.V3/UI/UserControls/UcEditName.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/UserControls/UcMoleculeLabelEditor.cs b/src/Chem4Word.V3/UI/UserControls/UcMoleculeLabelEditor.cs index f244bf5f..6025efb0 100644 --- a/src/Chem4Word.V3/UI/UserControls/UcMoleculeLabelEditor.cs +++ b/src/Chem4Word.V3/UI/UserControls/UcMoleculeLabelEditor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/WPF/SettingsControl.xaml.cs b/src/Chem4Word.V3/UI/WPF/SettingsControl.xaml.cs index 17bd82d9..26bffa08 100644 --- a/src/Chem4Word.V3/UI/WPF/SettingsControl.xaml.cs +++ b/src/Chem4Word.V3/UI/WPF/SettingsControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/WPF/SettingsHost.cs b/src/Chem4Word.V3/UI/WPF/SettingsHost.cs index 71a19dc6..b9c7a637 100644 --- a/src/Chem4Word.V3/UI/WPF/SettingsHost.cs +++ b/src/Chem4Word.V3/UI/WPF/SettingsHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/UI/XmlViewer.cs b/src/Chem4Word.V3/UI/XmlViewer.cs index c34cf405..f23d3227 100644 --- a/src/Chem4Word.V3/UI/XmlViewer.cs +++ b/src/Chem4Word.V3/UI/XmlViewer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/WebServices/ChemicalProperties.cs b/src/Chem4Word.V3/WebServices/ChemicalProperties.cs index dcd5fa47..aa36477f 100644 --- a/src/Chem4Word.V3/WebServices/ChemicalProperties.cs +++ b/src/Chem4Word.V3/WebServices/ChemicalProperties.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/WebServices/ChemicalServices.cs b/src/Chem4Word.V3/WebServices/ChemicalServices.cs index 239c55ee..321855dc 100644 --- a/src/Chem4Word.V3/WebServices/ChemicalServices.cs +++ b/src/Chem4Word.V3/WebServices/ChemicalServices.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4Word.V3/WebServices/ChemicalServicesResult.cs b/src/Chem4Word.V3/WebServices/ChemicalServicesResult.cs index 04f2a3d5..dffb1b87 100644 --- a/src/Chem4Word.V3/WebServices/ChemicalServicesResult.cs +++ b/src/Chem4Word.V3/WebServices/ChemicalServicesResult.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4WordTests/ControlTestForm.cs b/src/Chem4WordTests/ControlTestForm.cs index 3e9be00a..a7f36c31 100644 --- a/src/Chem4WordTests/ControlTestForm.cs +++ b/src/Chem4WordTests/ControlTestForm.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4WordTests/Converters/PersistenceTests.cs b/src/Chem4WordTests/Converters/PersistenceTests.cs index e84ce18a..6cba3da1 100644 --- a/src/Chem4WordTests/Converters/PersistenceTests.cs +++ b/src/Chem4WordTests/Converters/PersistenceTests.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chem4WordTests/Properties/AssemblyInfo.cs b/src/Chem4WordTests/Properties/AssemblyInfo.cs index e877b9a6..d64855c5 100644 --- a/src/Chem4WordTests/Properties/AssemblyInfo.cs +++ b/src/Chem4WordTests/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4WordTests")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/Chem4WordTests/ResourceHelper.cs b/src/Chem4WordTests/ResourceHelper.cs index 12a6b650..14ba95fd 100644 --- a/src/Chem4WordTests/ResourceHelper.cs +++ b/src/Chem4WordTests/ResourceHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Atom.cs b/src/Chemistry/Chem4Word.Model/Atom.cs index b7a4017f..6a6aa732 100644 --- a/src/Chemistry/Chem4Word.Model/Atom.cs +++ b/src/Chemistry/Chem4Word.Model/Atom.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Bond.cs b/src/Chemistry/Chem4Word.Model/Bond.cs index 9a37bc03..634c0cba 100644 --- a/src/Chemistry/Chem4Word.Model/Bond.cs +++ b/src/Chemistry/Chem4Word.Model/Bond.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/ChemicalName.cs b/src/Chemistry/Chem4Word.Model/ChemicalName.cs index 1c262ded..2fc470f7 100644 --- a/src/Chemistry/Chem4Word.Model/ChemicalName.cs +++ b/src/Chemistry/Chem4Word.Model/ChemicalName.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/ChemistryContainer.cs b/src/Chemistry/Chem4Word.Model/ChemistryContainer.cs index 92487286..e422ed98 100644 --- a/src/Chemistry/Chem4Word.Model/ChemistryContainer.cs +++ b/src/Chemistry/Chem4Word.Model/ChemistryContainer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/CML/CML.cs b/src/Chemistry/Chem4Word.Model/Converters/CML/CML.cs index 67959d1c..61880345 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/CML/CML.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/CML/CML.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/CML/CMLConverter.cs b/src/Chemistry/Chem4Word.Model/Converters/CML/CMLConverter.cs index 429d3343..976a0e52 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/CML/CMLConverter.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/CML/CMLConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/IConverter.cs b/src/Chemistry/Chem4Word.Model/Converters/IConverter.cs index f3a7e7a1..d053187b 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/IConverter.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/IConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/Json/JSONConverter.cs b/src/Chemistry/Chem4Word.Model/Converters/Json/JSONConverter.cs index 1b8199a6..7a78fdf8 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/Json/JSONConverter.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/Json/JSONConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/MDL/Counts.cs b/src/Chemistry/Chem4Word.Model/Converters/MDL/Counts.cs index 5cd38b1e..fec84d50 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/MDL/Counts.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/MDL/Counts.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/MDL/CtabProcessor.cs b/src/Chemistry/Chem4Word.Model/Converters/MDL/CtabProcessor.cs index ffdcd655..5964b741 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/MDL/CtabProcessor.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/MDL/CtabProcessor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/MDL/DataProcessor.cs b/src/Chemistry/Chem4Word.Model/Converters/MDL/DataProcessor.cs index be86e924..e47bc754 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/MDL/DataProcessor.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/MDL/DataProcessor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/MDL/MDLConstants.cs b/src/Chemistry/Chem4Word.Model/Converters/MDL/MDLConstants.cs index 1e9679f0..fadac24d 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/MDL/MDLConstants.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/MDL/MDLConstants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/MDL/PropertyType.cs b/src/Chemistry/Chem4Word.Model/Converters/MDL/PropertyType.cs index 4308b612..d789d126 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/MDL/PropertyType.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/MDL/PropertyType.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/MDL/SdFileBase.cs b/src/Chemistry/Chem4Word.Model/Converters/MDL/SdFileBase.cs index f6c7df2f..b7993fc1 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/MDL/SdFileBase.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/MDL/SdFileBase.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/MDL/SdFileConverter.cs b/src/Chemistry/Chem4Word.Model/Converters/MDL/SdFileConverter.cs index 086bfd23..c4f5d69e 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/MDL/SdFileConverter.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/MDL/SdFileConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Converters/MDL/SdfState.cs b/src/Chemistry/Chem4Word.Model/Converters/MDL/SdfState.cs index a9599154..c3519ff6 100644 --- a/src/Chemistry/Chem4Word.Model/Converters/MDL/SdfState.cs +++ b/src/Chemistry/Chem4Word.Model/Converters/MDL/SdfState.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Element.cs b/src/Chemistry/Chem4Word.Model/Element.cs index f2c636ef..d01a9054 100644 --- a/src/Chemistry/Chem4Word.Model/Element.cs +++ b/src/Chemistry/Chem4Word.Model/Element.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/ElementBase.cs b/src/Chemistry/Chem4Word.Model/ElementBase.cs index 994b7733..e67c64a1 100644 --- a/src/Chemistry/Chem4Word.Model/ElementBase.cs +++ b/src/Chemistry/Chem4Word.Model/ElementBase.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Enums/Enums.cs b/src/Chemistry/Chem4Word.Model/Enums/Enums.cs index 811a6e08..ddb16bb5 100644 --- a/src/Chemistry/Chem4Word.Model/Enums/Enums.cs +++ b/src/Chemistry/Chem4Word.Model/Enums/Enums.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Formula.cs b/src/Chemistry/Chem4Word.Model/Formula.cs index 4fc699a0..a9f1f5cd 100644 --- a/src/Chemistry/Chem4Word.Model/Formula.cs +++ b/src/Chemistry/Chem4Word.Model/Formula.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/FunctionalGroup.cs b/src/Chemistry/Chem4Word.Model/FunctionalGroup.cs index 48abe779..f0cacd36 100644 --- a/src/Chemistry/Chem4Word.Model/FunctionalGroup.cs +++ b/src/Chemistry/Chem4Word.Model/FunctionalGroup.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/FunctionalGroups.cs b/src/Chemistry/Chem4Word.Model/FunctionalGroups.cs index 2a9132d4..4c20b662 100644 --- a/src/Chemistry/Chem4Word.Model/FunctionalGroups.cs +++ b/src/Chemistry/Chem4Word.Model/FunctionalGroups.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Geometry/Geometry.cs b/src/Chemistry/Chem4Word.Model/Geometry/Geometry.cs index 1a183e9c..55273230 100644 --- a/src/Chemistry/Chem4Word.Model/Geometry/Geometry.cs +++ b/src/Chemistry/Chem4Word.Model/Geometry/Geometry.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Geometry/Packer.cs b/src/Chemistry/Chem4Word.Model/Geometry/Packer.cs index aa80d36b..d58e8cb1 100644 --- a/src/Chemistry/Chem4Word.Model/Geometry/Packer.cs +++ b/src/Chemistry/Chem4Word.Model/Geometry/Packer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Geometry/Seperator.cs b/src/Chemistry/Chem4Word.Model/Geometry/Seperator.cs index 91642bf0..b7ffaea5 100644 --- a/src/Chemistry/Chem4Word.Model/Geometry/Seperator.cs +++ b/src/Chemistry/Chem4Word.Model/Geometry/Seperator.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Globals.cs b/src/Chemistry/Chem4Word.Model/Globals.cs index ea6f6512..3359989f 100644 --- a/src/Chemistry/Chem4Word.Model/Globals.cs +++ b/src/Chemistry/Chem4Word.Model/Globals.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Model.cs b/src/Chemistry/Chem4Word.Model/Model.cs index 31b30865..91b12505 100644 --- a/src/Chemistry/Chem4Word.Model/Model.cs +++ b/src/Chemistry/Chem4Word.Model/Model.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Molecule.cs b/src/Chemistry/Chem4Word.Model/Molecule.cs index c8df66fc..326d831e 100644 --- a/src/Chemistry/Chem4Word.Model/Molecule.cs +++ b/src/Chemistry/Chem4Word.Model/Molecule.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/MoleculeUtils.cs b/src/Chemistry/Chem4Word.Model/MoleculeUtils.cs index cd467b43..8fd21189 100644 --- a/src/Chemistry/Chem4Word.Model/MoleculeUtils.cs +++ b/src/Chemistry/Chem4Word.Model/MoleculeUtils.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/PeriodicTable.cs b/src/Chemistry/Chem4Word.Model/PeriodicTable.cs index 49ab0005..8cc9e564 100644 --- a/src/Chemistry/Chem4Word.Model/PeriodicTable.cs +++ b/src/Chemistry/Chem4Word.Model/PeriodicTable.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Properties/AssemblyInfo.cs b/src/Chemistry/Chem4Word.Model/Properties/AssemblyInfo.cs index 9a1779ed..8d8f11fe 100644 --- a/src/Chemistry/Chem4Word.Model/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Chem4Word.Model/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.Model")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/Chemistry/Chem4Word.Model/Reaction.cs b/src/Chemistry/Chem4Word.Model/Reaction.cs index f7dfe983..38a9fc11 100644 --- a/src/Chemistry/Chem4Word.Model/Reaction.cs +++ b/src/Chemistry/Chem4Word.Model/Reaction.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Ring.cs b/src/Chemistry/Chem4Word.Model/Ring.cs index 40a3ce73..f83211f5 100644 --- a/src/Chemistry/Chem4Word.Model/Ring.cs +++ b/src/Chemistry/Chem4Word.Model/Ring.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Chem4Word.Model/Utils.cs b/src/Chemistry/Chem4Word.Model/Utils.cs index f44a867d..43550981 100644 --- a/src/Chemistry/Chem4Word.Model/Utils.cs +++ b/src/Chemistry/Chem4Word.Model/Utils.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Controls/Chem4Word.Controls/Behaviors/AdjustScaleToFitContentBehavior.cs b/src/Chemistry/Controls/Chem4Word.Controls/Behaviors/AdjustScaleToFitContentBehavior.cs index 624cc7b3..5e4b770b 100644 --- a/src/Chemistry/Controls/Chem4Word.Controls/Behaviors/AdjustScaleToFitContentBehavior.cs +++ b/src/Chemistry/Controls/Chem4Word.Controls/Behaviors/AdjustScaleToFitContentBehavior.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Controls/Chem4Word.Controls/Display.xaml.cs b/src/Chemistry/Controls/Chem4Word.Controls/Display.xaml.cs index c0f1a453..14e9d607 100644 --- a/src/Chemistry/Controls/Chem4Word.Controls/Display.xaml.cs +++ b/src/Chemistry/Controls/Chem4Word.Controls/Display.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Controls/Chem4Word.Controls/DisplayControl.xaml.cs b/src/Chemistry/Controls/Chem4Word.Controls/DisplayControl.xaml.cs index 3eca2285..b486ab03 100644 --- a/src/Chemistry/Controls/Chem4Word.Controls/DisplayControl.xaml.cs +++ b/src/Chemistry/Controls/Chem4Word.Controls/DisplayControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Controls/Chem4Word.Controls/DoNothingConverter.cs b/src/Chemistry/Controls/Chem4Word.Controls/DoNothingConverter.cs index b69c51ca..50567064 100644 --- a/src/Chemistry/Controls/Chem4Word.Controls/DoNothingConverter.cs +++ b/src/Chemistry/Controls/Chem4Word.Controls/DoNothingConverter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Controls/Chem4Word.Controls/Properties/AssemblyInfo.cs b/src/Chemistry/Controls/Chem4Word.Controls/Properties/AssemblyInfo.cs index ffd9ded9..b8712b15 100644 --- a/src/Chemistry/Controls/Chem4Word.Controls/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Controls/Chem4Word.Controls/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.Controls")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/Chemistry/Controls/Chem4Word.ViewModel/AtomGeometry.cs b/src/Chemistry/Controls/Chem4Word.ViewModel/AtomGeometry.cs index 519658b3..863c093f 100644 --- a/src/Chemistry/Controls/Chem4Word.ViewModel/AtomGeometry.cs +++ b/src/Chemistry/Controls/Chem4Word.ViewModel/AtomGeometry.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Controls/Chem4Word.ViewModel/AtomShape.cs b/src/Chemistry/Controls/Chem4Word.ViewModel/AtomShape.cs index f5653b5a..845c9289 100644 --- a/src/Chemistry/Controls/Chem4Word.ViewModel/AtomShape.cs +++ b/src/Chemistry/Controls/Chem4Word.ViewModel/AtomShape.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Controls/Chem4Word.ViewModel/BondGeometry.cs b/src/Chemistry/Controls/Chem4Word.ViewModel/BondGeometry.cs index 34326f4a..4df4e39f 100644 --- a/src/Chemistry/Controls/Chem4Word.ViewModel/BondGeometry.cs +++ b/src/Chemistry/Controls/Chem4Word.ViewModel/BondGeometry.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Controls/Chem4Word.ViewModel/BondShape.cs b/src/Chemistry/Controls/Chem4Word.ViewModel/BondShape.cs index 764a2217..c3974d07 100644 --- a/src/Chemistry/Controls/Chem4Word.ViewModel/BondShape.cs +++ b/src/Chemistry/Controls/Chem4Word.ViewModel/BondShape.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Controls/Chem4Word.ViewModel/CanvasAutoSize.cs b/src/Chemistry/Controls/Chem4Word.ViewModel/CanvasAutoSize.cs index 3f817518..ecda4518 100644 --- a/src/Chemistry/Controls/Chem4Word.ViewModel/CanvasAutoSize.cs +++ b/src/Chemistry/Controls/Chem4Word.ViewModel/CanvasAutoSize.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Controls/Chem4Word.ViewModel/Globals.cs b/src/Chemistry/Controls/Chem4Word.ViewModel/Globals.cs index 9dcd41d0..b0aa5de8 100644 --- a/src/Chemistry/Controls/Chem4Word.ViewModel/Globals.cs +++ b/src/Chemistry/Controls/Chem4Word.ViewModel/Globals.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Chemistry/Controls/Chem4Word.ViewModel/Properties/AssemblyInfo.cs b/src/Chemistry/Controls/Chem4Word.ViewModel/Properties/AssemblyInfo.cs index 40e55ad7..01e4fbe1 100644 --- a/src/Chemistry/Controls/Chem4Word.ViewModel/Properties/AssemblyInfo.cs +++ b/src/Chemistry/Controls/Chem4Word.ViewModel/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.ViewModel")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/Chemistry/Controls/Chem4Word.ViewModel/VisualTreeHelpers.cs b/src/Chemistry/Controls/Chem4Word.ViewModel/VisualTreeHelpers.cs index b469410a..e780fb68 100644 --- a/src/Chemistry/Controls/Chem4Word.ViewModel/VisualTreeHelpers.cs +++ b/src/Chemistry/Controls/Chem4Word.ViewModel/VisualTreeHelpers.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Chem4Word.Core/Helpers/CohenSutherland.cs b/src/Common/Chem4Word.Core/Helpers/CohenSutherland.cs index 54f45d5d..11a11cba 100644 --- a/src/Common/Chem4Word.Core/Helpers/CohenSutherland.cs +++ b/src/Common/Chem4Word.Core/Helpers/CohenSutherland.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Chem4Word.Core/Helpers/Constants.cs b/src/Common/Chem4Word.Core/Helpers/Constants.cs index 6033ab6a..8e63a971 100644 --- a/src/Common/Chem4Word.Core/Helpers/Constants.cs +++ b/src/Common/Chem4Word.Core/Helpers/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -9,27 +9,23 @@ namespace Chem4Word.Core.Helpers { public static class Constants { - public static string Chem4WordVersion = "3.0"; - public static string Chem4WordVersionFiles = "files3"; - public static string ContentControlTitle = "Chemistry"; - public static string LegacyContentControlTitle = "chemistry"; - public static string NavigatorTaskPaneTitle = "Navigator"; - public static string LibraryTaskPaneTitle = "Library"; - - public static double TopLeftOffset = 24; - public static string OoXmlBookmarkPrefix = "C4W_"; + public const string Chem4WordVersion = "3.0"; + public const string Chem4WordVersionFiles = "files3"; + public const string ContentControlTitle = "Chemistry"; + public const string LegacyContentControlTitle = "chemistry"; + public const string NavigatorTaskPaneTitle = "Navigator"; + public const string LibraryTaskPaneTitle = "Library"; + + public const double TopLeftOffset = 24; + public const string OoXmlBookmarkPrefix = "C4W_"; public const string LibraryFileName = "Library.db"; - public static string Chem4WordWebServiceUri = "https://chemicalservices.azurewebsites.net/api/Resolve"; - - public static string DefaultEditorPlugIn800 = "ChemDoodle Web Structure Editor V8.0.0"; - public static string DefaultEditorPlugIn702 = "ChemDoodle Web Structure Editor V7.0.2"; - public static int ChemDoodleWeb800MinimumBrowserVersion = 11; - public static string DefaultRendererPlugIn = "Open Office Xml Renderer V3"; - - public static string CmlNameSpaceCode = "cml"; + public const string Chem4WordWebServiceUri = "https://chemicalservices.azurewebsites.net/api/Resolve"; - public static string CmlElementMolecule = "molecule"; + public const string DefaultEditorPlugIn800 = "ChemDoodle Web Structure Editor V8.0.0"; + public const string DefaultEditorPlugIn702 = "ChemDoodle Web Structure Editor V7.0.2"; + public const int ChemDoodleWeb800MinimumBrowserVersion = 11; + public const string DefaultRendererPlugIn = "Open Office Xml Renderer V3"; public const string ChemspiderIdName = "chemspider:Id"; public const string ChemspiderInchiKeyName = "chemspider:Inchikey"; @@ -55,6 +51,7 @@ public static class Constants // Update Checks public const int MaximunVersionsBehind = 7; + public static string Chem4WordTooOld = "Chem4Word is too many versions old."; // Bond length limits etc public const double MinimumBondLength = 5; diff --git a/src/Common/Chem4Word.Core/Helpers/ResourceHelper.cs b/src/Common/Chem4Word.Core/Helpers/ResourceHelper.cs index be46fba9..b5932a9f 100644 --- a/src/Common/Chem4Word.Core/Helpers/ResourceHelper.cs +++ b/src/Common/Chem4Word.Core/Helpers/ResourceHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Chem4Word.Core/Helpers/SafeDate.cs b/src/Common/Chem4Word.Core/Helpers/SafeDate.cs index 25b5726b..1b1da258 100644 --- a/src/Common/Chem4Word.Core/Helpers/SafeDate.cs +++ b/src/Common/Chem4Word.Core/Helpers/SafeDate.cs @@ -1,11 +1,12 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. // --------------------------------------------------------------------------- using System; +using System.Globalization; namespace Chem4Word.Core.Helpers { @@ -101,5 +102,55 @@ public static DateTime Parse(string input) return result; } + + /// + /// "dd-MMM-yyyy HH:mm:ss.fff + /// + /// + /// + public static string ToLongDate(DateTime dateTime) + { + return dateTime.ToString("dd-MMM-yyyy HH:mm:ss.fff", CultureInfo.InvariantCulture); + } + + /// + /// "dd-MMM-yyyy" + /// + /// + /// + public static string ToShortDate(DateTime dateTime) + { + return dateTime.ToString("dd-MMM-yyyy", CultureInfo.InvariantCulture); + } + + /// + /// "HH:mm:ss.fff" + /// + /// + /// + public static string ToShortTime(DateTime dateTime) + { + return dateTime.ToString("HH:mm:ss.fff", CultureInfo.InvariantCulture); + } + + /// + /// "yyyy-MM-dd" + /// + /// + /// + public static string ToIsoShortDate(DateTime dateTime) + { + return dateTime.ToString("yyyy-MM-dd", CultureInfo.InvariantCulture); + } + + /// + /// "MMddyyHHmm" + /// + /// + /// + public static string ToMdlHeaderTime(DateTime dateTime) + { + return dateTime.ToString("MMddyyHHmm", CultureInfo.InvariantCulture); + } } } \ No newline at end of file diff --git a/src/Common/Chem4Word.Core/Helpers/SafeDouble.cs b/src/Common/Chem4Word.Core/Helpers/SafeDouble.cs index ae57eea4..eae53cff 100644 --- a/src/Common/Chem4Word.Core/Helpers/SafeDouble.cs +++ b/src/Common/Chem4Word.Core/Helpers/SafeDouble.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs b/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs index ff5c3e45..667c962a 100644 --- a/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs +++ b/src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.Core")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/Common/Chem4Word.Core/UI/Controls/CustomProgressBar.cs b/src/Common/Chem4Word.Core/UI/Controls/CustomProgressBar.cs index b54ec846..3252263e 100644 --- a/src/Common/Chem4Word.Core/UI/Controls/CustomProgressBar.cs +++ b/src/Common/Chem4Word.Core/UI/Controls/CustomProgressBar.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Chem4Word.Core/UI/Controls/TabControlEx.cs b/src/Common/Chem4Word.Core/UI/Controls/TabControlEx.cs index 12da7d8a..1718d8ed 100644 --- a/src/Common/Chem4Word.Core/UI/Controls/TabControlEx.cs +++ b/src/Common/Chem4Word.Core/UI/Controls/TabControlEx.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Chem4Word.Core/UI/Controls/Win32.cs b/src/Common/Chem4Word.Core/UI/Controls/Win32.cs index c63033c1..c1c9eda3 100644 --- a/src/Common/Chem4Word.Core/UI/Controls/Win32.cs +++ b/src/Common/Chem4Word.Core/UI/Controls/Win32.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Chem4Word.Core/UI/Forms/MolFileViewer.cs b/src/Common/Chem4Word.Core/UI/Forms/MolFileViewer.cs index a9c1c252..3587ebc6 100644 --- a/src/Common/Chem4Word.Core/UI/Forms/MolFileViewer.cs +++ b/src/Common/Chem4Word.Core/UI/Forms/MolFileViewer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Chem4Word.Core/UI/Forms/Progress.cs b/src/Common/Chem4Word.Core/UI/Forms/Progress.cs index 31da4939..fd76586b 100644 --- a/src/Common/Chem4Word.Core/UI/Forms/Progress.cs +++ b/src/Common/Chem4Word.Core/UI/Forms/Progress.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Chem4Word.Core/UI/Forms/ReportError.cs b/src/Common/Chem4Word.Core/UI/Forms/ReportError.cs index 8abf2f46..fbf2f134 100644 --- a/src/Common/Chem4Word.Core/UI/Forms/ReportError.cs +++ b/src/Common/Chem4Word.Core/UI/Forms/ReportError.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Chem4Word.Core/UI/Wpf/WpfEventArgs.cs b/src/Common/Chem4Word.Core/UI/Wpf/WpfEventArgs.cs index 96a9433d..6e1aabc0 100644 --- a/src/Common/Chem4Word.Core/UI/Wpf/WpfEventArgs.cs +++ b/src/Common/Chem4Word.Core/UI/Wpf/WpfEventArgs.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Chem4Word.Core/UserInteractions.cs b/src/Common/Chem4Word.Core/UserInteractions.cs index 1948adcc..d067ddfd 100644 --- a/src/Common/Chem4Word.Core/UserInteractions.cs +++ b/src/Common/Chem4Word.Core/UserInteractions.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Telemetry/AzureServiceBusWriter.cs b/src/Common/Telemetry/AzureServiceBusWriter.cs index cca629cc..42787403 100644 --- a/src/Common/Telemetry/AzureServiceBusWriter.cs +++ b/src/Common/Telemetry/AzureServiceBusWriter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Telemetry/Properties/AssemblyInfo.cs b/src/Common/Telemetry/Properties/AssemblyInfo.cs index f3ffe4ee..e7e131f0 100644 --- a/src/Common/Telemetry/Properties/AssemblyInfo.cs +++ b/src/Common/Telemetry/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.Telemetry")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/Common/Telemetry/ServiceBusMessage.cs b/src/Common/Telemetry/ServiceBusMessage.cs index 211663b2..69f85a86 100644 --- a/src/Common/Telemetry/ServiceBusMessage.cs +++ b/src/Common/Telemetry/ServiceBusMessage.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Telemetry/SystemHelper.cs b/src/Common/Telemetry/SystemHelper.cs index 76c01f67..1fc70ec6 100644 --- a/src/Common/Telemetry/SystemHelper.cs +++ b/src/Common/Telemetry/SystemHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -86,8 +86,17 @@ public static string GetMachineId() return result; } - public SystemHelper() + private List Initialise() { + List timings = new List(); + + string message = $"SystemHelper.Initialise() started at {SafeDate.ToLongDate(DateTime.Now)}"; + timings.Add(message); + Debug.WriteLine(message); + + Stopwatch sw = new Stopwatch(); + sw.Start(); + WordVersion = -1; #region Get Machine Guid @@ -229,8 +238,9 @@ public SystemHelper() #region Get IpAddress ParameterizedThreadStart pts = GetExternalIpAddress; - Thread t = new Thread(pts); - t.Start(null); + Thread thread = new Thread(pts); + thread.SetApartmentState(ApartmentState.STA); + thread.Start(null); #endregion Get IpAddress @@ -250,16 +260,39 @@ public SystemHelper() #if DEBUG GetGitStatus(); #endif + + sw.Stop(); + + message = $"SystemHelper.Initialise() took {sw.ElapsedMilliseconds.ToString("#,000")}ms"; + timings.Add(message); + Debug.WriteLine(message); + + return timings; + } + + public SystemHelper(List timings) + { + StartUpTimings = timings; + + StartUpTimings.AddRange(Initialise()); } - // return result; - //} + public SystemHelper() + { + if (StartUpTimings == null) + { + StartUpTimings = new List(); + } + + StartUpTimings.AddRange(Initialise()); + } private void GetGitStatus() { var result = new List(); + result.Add("Git Origin"); + result.AddRange(RunCommand("git.exe", "config --get remote.origin.url", AddInLocation)); result.Add("Git Branch"); - // git rev-parse --abbrev-ref HEAD == Current Branch result.AddRange(RunCommand("git.exe", "rev-parse --abbrev-ref HEAD", AddInLocation)); // git status --porcelain == Get List of changed files @@ -468,6 +501,15 @@ private string HKLM_GetString(string path, string key) private void GetExternalIpAddress(object o) { + string module = $"{MethodBase.GetCurrentMethod().Name}()"; + + string message = $"{module} started at {SafeDate.ToLongDate(DateTime.Now)}"; + StartUpTimings.Add(message); + Debug.WriteLine(message); + + Stopwatch sw = new Stopwatch(); + sw.Start(); + // http://www.ipv6proxy.net/ --> "Your IP address : 2600:3c00::f03c:91ff:fe93:dcd4" try @@ -590,11 +632,17 @@ private void GetExternalIpAddress(object o) _retryCount++; Thread.Sleep(500); ParameterizedThreadStart pts = GetExternalIpAddress; - Thread t = new Thread(pts); - t.SetApartmentState(ApartmentState.STA); - t.Start(null); + Thread thread = new Thread(pts); + thread.SetApartmentState(ApartmentState.STA); + thread.Start(null); } } + + sw.Stop(); + + message = $"{module} took {sw.ElapsedMilliseconds.ToString("#,000")}ms"; + StartUpTimings.Add(message); + Debug.WriteLine(message); } private DateTime FromPhpDate(string line) diff --git a/src/Common/Telemetry/TelemetryWriter.cs b/src/Common/Telemetry/TelemetryWriter.cs index 56a52686..d53ba6c3 100644 --- a/src/Common/Telemetry/TelemetryWriter.cs +++ b/src/Common/Telemetry/TelemetryWriter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Common/Telemetry/WmiHelper.cs b/src/Common/Telemetry/WmiHelper.cs index 5482c4db..9f4491f5 100644 --- a/src/Common/Telemetry/WmiHelper.cs +++ b/src/Common/Telemetry/WmiHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Installer/Chem4WordSetup/Constants.cs b/src/Installer/Chem4WordSetup/Constants.cs index bedd0595..7e6ca2ce 100644 --- a/src/Installer/Chem4WordSetup/Constants.cs +++ b/src/Installer/Chem4WordSetup/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Installer/Chem4WordSetup/Program.cs b/src/Installer/Chem4WordSetup/Program.cs index 4d589e05..f2e26fbf 100644 --- a/src/Installer/Chem4WordSetup/Program.cs +++ b/src/Installer/Chem4WordSetup/Program.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs index bb353c2f..efe8f59c 100644 --- a/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs +++ b/src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word Setup Bootstrapper")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/Installer/Chem4WordSetup/RegistryHelper.cs b/src/Installer/Chem4WordSetup/RegistryHelper.cs index 89c80c0d..f16a8a3f 100644 --- a/src/Installer/Chem4WordSetup/RegistryHelper.cs +++ b/src/Installer/Chem4WordSetup/RegistryHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Installer/Chem4WordSetup/Setup.cs b/src/Installer/Chem4WordSetup/Setup.cs index 7110ebd6..4fcec36f 100644 --- a/src/Installer/Chem4WordSetup/Setup.cs +++ b/src/Installer/Chem4WordSetup/Setup.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Installer/Chem4WordSetup/TaskIndicator.cs b/src/Installer/Chem4WordSetup/TaskIndicator.cs index 7f2762b5..5f77b529 100644 --- a/src/Installer/Chem4WordSetup/TaskIndicator.cs +++ b/src/Installer/Chem4WordSetup/TaskIndicator.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Installer/Chem4WordUpdater/Constants.cs b/src/Installer/Chem4WordUpdater/Constants.cs index 3a14a635..3f568b0f 100644 --- a/src/Installer/Chem4WordUpdater/Constants.cs +++ b/src/Installer/Chem4WordUpdater/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Installer/Chem4WordUpdater/Program.cs b/src/Installer/Chem4WordUpdater/Program.cs index e93d03e3..adfc3486 100644 --- a/src/Installer/Chem4WordUpdater/Program.cs +++ b/src/Installer/Chem4WordUpdater/Program.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs index 5b255f93..7b2719c1 100644 --- a/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs +++ b/src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4WordUpdater")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/Installer/Chem4WordUpdater/RegistryHelper.cs b/src/Installer/Chem4WordUpdater/RegistryHelper.cs index 40b85c4b..191554eb 100644 --- a/src/Installer/Chem4WordUpdater/RegistryHelper.cs +++ b/src/Installer/Chem4WordUpdater/RegistryHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Installer/Chem4WordUpdater/Updater.cs b/src/Installer/Chem4WordUpdater/Updater.cs index 739f12b3..5e80b303 100644 --- a/src/Installer/Chem4WordUpdater/Updater.cs +++ b/src/Installer/Chem4WordUpdater/Updater.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Installer/WiX.CustomAction/CustomAction.cs b/src/Installer/WiX.CustomAction/CustomAction.cs index a5c116a0..8c5faf44 100644 --- a/src/Installer/WiX.CustomAction/CustomAction.cs +++ b/src/Installer/WiX.CustomAction/CustomAction.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs b/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs index 7a879854..32ba43bd 100644 --- a/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs +++ b/src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -15,7 +15,7 @@ [assembly: AssemblyDescription("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("WiX.CustomAction")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -34,5 +34,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/Installer/WiXInstaller/Product.wxs b/src/Installer/WiXInstaller/Product.wxs index 6e0610f3..6678fe5d 100644 --- a/src/Installer/WiXInstaller/Product.wxs +++ b/src/Installer/WiXInstaller/Product.wxs @@ -1,7 +1,7 @@  - + diff --git a/src/Installer/WiXInstaller/WiX-Installer.wixproj b/src/Installer/WiXInstaller/WiX-Installer.wixproj index fbe7ff25..e26b8d53 100644 --- a/src/Installer/WiXInstaller/WiX-Installer.wixproj +++ b/src/Installer/WiXInstaller/WiX-Installer.wixproj @@ -6,7 +6,7 @@ 3.10 746e1493-1b1e-482c-8fa4-c147237f4f7b 2.0 - Chem4Word-Setup.3.0.30.Release.18 + Chem4Word-Setup.3.0.31.Release.19 Package SAK SAK diff --git a/src/Notes/Releases.txt b/src/Notes/Releases.txt index f9920cf4..1b11d08e 100644 --- a/src/Notes/Releases.txt +++ b/src/Notes/Releases.txt @@ -1,6 +1,6 @@ # Set Build Numbers -.\SetAssemblyVersion.ps1 -path .. -version 3.0.31 -name "Release 19" -released 31-Dec-2019 +.\SetAssemblyVersion.ps1 -path .. -version 3.0.31 -name "Release 19" -released 08-Jan-2020 .\SetAssemblyVersion.ps1 -path .. -version 3.0.30 -name "Release 18" -released 11-Nov-2019 .\SetAssemblyVersion.ps1 -path .. -version 3.0.29 -name "Release 17" -released 10-Nov-2019 diff --git a/src/PlugIns/Contracts/IChem4WordCommon.cs b/src/PlugIns/Contracts/IChem4WordCommon.cs index daf7b52f..17d55613 100644 --- a/src/PlugIns/Contracts/IChem4WordCommon.cs +++ b/src/PlugIns/Contracts/IChem4WordCommon.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Contracts/IChem4WordEditor.cs b/src/PlugIns/Contracts/IChem4WordEditor.cs index e112fe12..f94ac3f2 100644 --- a/src/PlugIns/Contracts/IChem4WordEditor.cs +++ b/src/PlugIns/Contracts/IChem4WordEditor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Contracts/IChem4WordRenderer.cs b/src/PlugIns/Contracts/IChem4WordRenderer.cs index c22d8c7a..109f31e9 100644 --- a/src/PlugIns/Contracts/IChem4WordRenderer.cs +++ b/src/PlugIns/Contracts/IChem4WordRenderer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Contracts/IChem4WordSearcher.cs b/src/PlugIns/Contracts/IChem4WordSearcher.cs index fd7b7f98..c27e43c2 100644 --- a/src/PlugIns/Contracts/IChem4WordSearcher.cs +++ b/src/PlugIns/Contracts/IChem4WordSearcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Contracts/IChem4WordTelemetry.cs b/src/PlugIns/Contracts/IChem4WordTelemetry.cs index 81ecf6f6..5e3ab658 100644 --- a/src/PlugIns/Contracts/IChem4WordTelemetry.cs +++ b/src/PlugIns/Contracts/IChem4WordTelemetry.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs index a0da2518..37aa4615 100644 --- a/src/PlugIns/Contracts/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Contracts/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.Contracts")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/PlugIns/Editors/ChemDoodleWeb.702/ChemDoodleWeb.cs b/src/PlugIns/Editors/ChemDoodleWeb.702/ChemDoodleWeb.cs index ed62488b..7180a169 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.702/ChemDoodleWeb.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.702/ChemDoodleWeb.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.702/Editor.cs b/src/PlugIns/Editors/ChemDoodleWeb.702/Editor.cs index 26357b83..9a73d3fc 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.702/Editor.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.702/Editor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.702/Options.cs b/src/PlugIns/Editors/ChemDoodleWeb.702/Options.cs index 6354e905..2c9af596 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.702/Options.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.702/Options.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.702/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/ChemDoodleWeb.702/Properties/AssemblyInfo.cs index c1ab91d2..960d7ab8 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.702/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.702/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.ChemDoodleWebEditor702")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/PlugIns/Editors/ChemDoodleWeb.702/Settings.cs b/src/PlugIns/Editors/ChemDoodleWeb.702/Settings.cs index 2dd3e359..9b845fcd 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.702/Settings.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.702/Settings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Editor.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Editor.cs index 326b0815..d4dfa7d2 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/Editor.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/Editor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/EditorHost.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/EditorHost.cs index 0210c1a4..56637aac 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/EditorHost.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/EditorHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Options.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Options.cs index 178f0760..dbae85da 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/Options.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/Options.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs index 7acf84dc..f2d360bf 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.ChemDoodleWebEditor800")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/Settings.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/Settings.cs index 2ae1f5ad..c0086549 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/Settings.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/Settings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/ChemDoodleWeb.800/WpfChemDoodle.xaml.cs b/src/PlugIns/Editors/ChemDoodleWeb.800/WpfChemDoodle.xaml.cs index d8d9ce02..b6333b3d 100644 --- a/src/PlugIns/Editors/ChemDoodleWeb.800/WpfChemDoodle.xaml.cs +++ b/src/PlugIns/Editors/ChemDoodleWeb.800/WpfChemDoodle.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/SimpleWpfEditor/Editor.cs b/src/PlugIns/Editors/SimpleWpfEditor/Editor.cs index e4d6e3eb..aac82b73 100644 --- a/src/PlugIns/Editors/SimpleWpfEditor/Editor.cs +++ b/src/PlugIns/Editors/SimpleWpfEditor/Editor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/SimpleWpfEditor/EditorControl.xaml.cs b/src/PlugIns/Editors/SimpleWpfEditor/EditorControl.xaml.cs index 35782806..fa89b640 100644 --- a/src/PlugIns/Editors/SimpleWpfEditor/EditorControl.xaml.cs +++ b/src/PlugIns/Editors/SimpleWpfEditor/EditorControl.xaml.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/SimpleWpfEditor/EditorHost.cs b/src/PlugIns/Editors/SimpleWpfEditor/EditorHost.cs index d73b6d76..3fadde2d 100644 --- a/src/PlugIns/Editors/SimpleWpfEditor/EditorHost.cs +++ b/src/PlugIns/Editors/SimpleWpfEditor/EditorHost.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs b/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs index 763b87ce..7dc5c0a5 100644 --- a/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Editors/SimpleWpfEditor/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.SimpleWpfEditor")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/PlugIns/Renderers/OoXmlV3/CoordinateTool.cs b/src/PlugIns/Renderers/OoXmlV3/CoordinateTool.cs index 057c1481..9131c481 100644 --- a/src/PlugIns/Renderers/OoXmlV3/CoordinateTool.cs +++ b/src/PlugIns/Renderers/OoXmlV3/CoordinateTool.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/GeometryTool.cs b/src/PlugIns/Renderers/OoXmlV3/GeometryTool.cs index a949ef66..319109ce 100644 --- a/src/PlugIns/Renderers/OoXmlV3/GeometryTool.cs +++ b/src/PlugIns/Renderers/OoXmlV3/GeometryTool.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelCharacter.cs b/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelCharacter.cs index ee389fdc..b41cf658 100644 --- a/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelCharacter.cs +++ b/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelCharacter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelPositioner.cs b/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelPositioner.cs index 477ebf1a..745b1fba 100644 --- a/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelPositioner.cs +++ b/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelPositioner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelRenderer.cs b/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelRenderer.cs index 7525cb8f..f5898055 100644 --- a/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelRenderer.cs +++ b/src/PlugIns/Renderers/OoXmlV3/OOXML/Atoms/AtomLabelRenderer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLine.cs b/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLine.cs index c0122a39..0ff9caf9 100644 --- a/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLine.cs +++ b/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLine.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLinePositioner.cs b/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLinePositioner.cs index ae298591..a8eeb7b2 100644 --- a/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLinePositioner.cs +++ b/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLinePositioner.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLineRenderer.cs b/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLineRenderer.cs index 12571073..4014bae3 100644 --- a/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLineRenderer.cs +++ b/src/PlugIns/Renderers/OoXmlV3/OOXML/Bonds/BondLineRenderer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlFile.cs b/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlFile.cs index 54a4a106..475d7979 100644 --- a/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlFile.cs +++ b/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlFile.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlHelper.cs b/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlHelper.cs index 72738f5b..53dc8e9a 100644 --- a/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlHelper.cs +++ b/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlRenderer.cs b/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlRenderer.cs index 56a76f23..a872517e 100644 --- a/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlRenderer.cs +++ b/src/PlugIns/Renderers/OoXmlV3/OOXML/OoXmlRenderer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/Options.cs b/src/PlugIns/Renderers/OoXmlV3/Options.cs index 0b8d7abe..ccb019f6 100644 --- a/src/PlugIns/Renderers/OoXmlV3/Options.cs +++ b/src/PlugIns/Renderers/OoXmlV3/Options.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/Properties/AssemblyInfo.cs b/src/PlugIns/Renderers/OoXmlV3/Properties/AssemblyInfo.cs index cecb79a9..01e2570c 100644 --- a/src/PlugIns/Renderers/OoXmlV3/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Renderers/OoXmlV3/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.Renderer.OoXmlV3")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/PlugIns/Renderers/OoXmlV3/Renderer.cs b/src/PlugIns/Renderers/OoXmlV3/Renderer.cs index fa99c5e4..18869c10 100644 --- a/src/PlugIns/Renderers/OoXmlV3/Renderer.cs +++ b/src/PlugIns/Renderers/OoXmlV3/Renderer.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/Settings.cs b/src/PlugIns/Renderers/OoXmlV3/Settings.cs index b7c94102..4aeb874c 100644 --- a/src/PlugIns/Renderers/OoXmlV3/Settings.cs +++ b/src/PlugIns/Renderers/OoXmlV3/Settings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/TTF/TtfCharacter.cs b/src/PlugIns/Renderers/OoXmlV3/TTF/TtfCharacter.cs index a29e366d..f306e969 100644 --- a/src/PlugIns/Renderers/OoXmlV3/TTF/TtfCharacter.cs +++ b/src/PlugIns/Renderers/OoXmlV3/TTF/TtfCharacter.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/TTF/TtfContour.cs b/src/PlugIns/Renderers/OoXmlV3/TTF/TtfContour.cs index 7fd2567a..b10ed8de 100644 --- a/src/PlugIns/Renderers/OoXmlV3/TTF/TtfContour.cs +++ b/src/PlugIns/Renderers/OoXmlV3/TTF/TtfContour.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Renderers/OoXmlV3/TTF/TtfPoint.cs b/src/PlugIns/Renderers/OoXmlV3/TTF/TtfPoint.cs index 7bcddae5..28e5581f 100644 --- a/src/PlugIns/Renderers/OoXmlV3/TTF/TtfPoint.cs +++ b/src/PlugIns/Renderers/OoXmlV3/TTF/TtfPoint.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Constants.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Constants.cs index d2e7aa31..14e405dd 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Constants.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Options.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Options.cs index 758cb7fa..a40ed9f0 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Options.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Options.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs index 9649552e..d5f2a9f4 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.Searcher.ChEBIPlugin")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/SearchChEBI.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/SearchChEBI.cs index 79c713bc..9a3dd3e5 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/SearchChEBI.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/SearchChEBI.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Searcher.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Searcher.cs index 3ae192e3..1dfdd0f9 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Searcher.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Searcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Settings.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Settings.cs index c374f556..5fd6e435 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Settings.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/Settings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/WaitCursor.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/WaitCursor.cs index e11d0db8..a1f6908d 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/WaitCursor.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ChEBIPlugin/WaitCursor.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Options.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Options.cs index 97c975e8..bff13f2d 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Options.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Options.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs index 1e2ec8fe..96d80e58 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.Searcher.ExamplePlugIn")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Searcher.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Searcher.cs index 802253d9..49698ab5 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Searcher.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Searcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Settings.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Settings.cs index 77d41f5d..bf073730 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Settings.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.ExamplePlugIn/Settings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Constants.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Constants.cs index 1dc02203..b802116d 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Constants.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Options.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Options.cs index b39b1518..a4c272c1 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Options.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Options.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs index bee99569..fee0c002 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.Searcher.OpsinPlugIn")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/SearchOpsin.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/SearchOpsin.cs index 3c811e20..1deb6528 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/SearchOpsin.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/SearchOpsin.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Searcher.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Searcher.cs index 6ca8658d..5294f47b 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Searcher.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Searcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Settings.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Settings.cs index c0ca8cfe..df5ae440 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Settings.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.OpsinPlugIn/Settings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Constants.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Constants.cs index 35ee6f27..74ca0e06 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Constants.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Constants.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Options.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Options.cs index fecd745b..9f1c3e07 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Options.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Options.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs index c53ff94c..21a4694c 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("Chem4Word.Searcher.PubChemPlugIn")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")] diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/SearchPubChem.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/SearchPubChem.cs index ad7990c7..46cf4727 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/SearchPubChem.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/SearchPubChem.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Searcher.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Searcher.cs index f59ad939..ce50f563 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Searcher.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Searcher.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Settings.cs b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Settings.cs index a1691113..d2d9c16a 100644 --- a/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Settings.cs +++ b/src/PlugIns/Searchers/Chem4Word.Searcher.PubChemPlugIn/Settings.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Scripts/Install-Dev-Certificate.ps1 b/src/Scripts/Install-Dev-Certificate.ps1 index 1800d937..2503f166 100644 --- a/src/Scripts/Install-Dev-Certificate.ps1 +++ b/src/Scripts/Install-Dev-Certificate.ps1 @@ -1,15 +1,11 @@ $pwd = Split-Path -Path $MyInvocation.MyCommand.Path -# This does not work ??? -# Have to CD first ??? -# $certificate = """$($pwd)\Certificates\Developer\Chem4WordAddIn.pfx""" - CD "$($pwd)\Certificates\Developer" $certificate = "Chem4WordAddIn.pfx" Write-Host "Importing Certificate " $certificate -$password = ConvertTo-SecureString -String "Password_123" -Force –AsPlainText +$password = ConvertTo-SecureString -String "Password_123" -Force -AsPlainText Import-PfxCertificate -FilePath $certificate -CertStoreLocation Cert:\CurrentUser\My -Exportable -Password $password \ No newline at end of file diff --git a/src/Scripts/SetAssemblyVersion.ps1 b/src/Scripts/SetAssemblyVersion.ps1 index 658146f5..9f66acb1 100644 --- a/src/Scripts/SetAssemblyVersion.ps1 +++ b/src/Scripts/SetAssemblyVersion.ps1 @@ -43,7 +43,7 @@ function Update-SourceVersion $assemblyVersion = 'AssemblyVersion("' + $version + '")'; $fileVersion = 'AssemblyFileVersion("' + $version + '")'; $company = 'AssemblyCompany("Chem4Word")' - $copyright = 'AssemblyCopyright("© Chem4Word 2019. All rights reserved.")' + $copyright = 'AssemblyCopyright("© Chem4Word 2020. All rights reserved.")' $trademark = 'AssemblyTrademark("Chem4Word")' (Get-Content $o.FullName -encoding UTF8) | ForEach-Object { diff --git a/src/Scripts/SignFiles.cmd b/src/Scripts/SignFiles.cmd index 158e9199..8f7a29a0 100644 --- a/src/Scripts/SignFiles.cmd +++ b/src/Scripts/SignFiles.cmd @@ -1,6 +1,6 @@ @echo off -set release=Chem4Word-Setup.3.0.30.Release.18.msi +set release=Chem4Word-Setup.3.0.31.Release.19.msi set working=C:\Temp set signclientpath=C:\Tools\Azure\SignClient diff --git a/src/Shared/FolderHelper.cs b/src/Shared/FolderHelper.cs index dd110f1f..fec479ae 100644 --- a/src/Shared/FolderHelper.cs +++ b/src/Shared/FolderHelper.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/Shared/OfficeHelper.cs b/src/Shared/OfficeHelper.cs index c71e38f4..995e6205 100644 --- a/src/Shared/OfficeHelper.cs +++ b/src/Shared/OfficeHelper.cs @@ -1,10 +1,10 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. // --------------------------------------------------------------------------- - + // Shared file (Add As Link) using System; @@ -87,7 +87,7 @@ public static string GetWordProduct() string servicePack = GetOfficeServicePack(fi.FileVersion); if (!string.IsNullOrEmpty(servicePack)) { - officeProductName = officeProductName + " " + servicePack; + officeProductName = officeProductName + " " + servicePack.Trim(); } // Get a bit more information about this version @@ -98,6 +98,17 @@ public static string GetWordProduct() result = officeProductName + " [" + wordVersionNumber + "]"; + int limiter = 32; + while (result.IndexOf(" ", StringComparison.Ordinal) >= 0) + { + result = result.Replace(" ", " "); + limiter--; + if (limiter == 0) + { + break; + } + } + return result; } @@ -338,7 +349,6 @@ private static string DecodeBits(string officeGuid) string bitFlag = officeGuid.Substring(20, 1); string debugFlag = officeGuid.Substring(25, 1); - #region 32 / 64 bit if (bitFlag.Equals("1")) diff --git a/src/Shared/RegistryWOW6432.cs b/src/Shared/RegistryWOW6432.cs index 3745d851..7825c83e 100644 --- a/src/Shared/RegistryWOW6432.cs +++ b/src/Shared/RegistryWOW6432.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/TestHarness/WindowsForms-TestHarness/FlexForm.cs b/src/TestHarness/WindowsForms-TestHarness/FlexForm.cs index 45d2ba3d..e00c92c3 100644 --- a/src/TestHarness/WindowsForms-TestHarness/FlexForm.cs +++ b/src/TestHarness/WindowsForms-TestHarness/FlexForm.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/TestHarness/WindowsForms-TestHarness/Form1.cs b/src/TestHarness/WindowsForms-TestHarness/Form1.cs index cb369d0f..33d8598b 100644 --- a/src/TestHarness/WindowsForms-TestHarness/Form1.cs +++ b/src/TestHarness/WindowsForms-TestHarness/Form1.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/TestHarness/WindowsForms-TestHarness/Program.cs b/src/TestHarness/WindowsForms-TestHarness/Program.cs index 457b5b23..60fc58cc 100644 --- a/src/TestHarness/WindowsForms-TestHarness/Program.cs +++ b/src/TestHarness/WindowsForms-TestHarness/Program.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. diff --git a/src/TestHarness/WindowsForms-TestHarness/Properties/AssemblyInfo.cs b/src/TestHarness/WindowsForms-TestHarness/Properties/AssemblyInfo.cs index 4cfb3d72..e3bf3f29 100644 --- a/src/TestHarness/WindowsForms-TestHarness/Properties/AssemblyInfo.cs +++ b/src/TestHarness/WindowsForms-TestHarness/Properties/AssemblyInfo.cs @@ -1,5 +1,5 @@ // --------------------------------------------------------------------------- -// Copyright (c) 2019, The .NET Foundation. +// Copyright (c) 2020, The .NET Foundation. // This software is released under the Apache License, Version 2.0. // The license and further copyright text can be found in the file LICENSE.md // at the root directory of the distribution. @@ -16,7 +16,7 @@ [assembly: AssemblyConfiguration("")] [assembly: AssemblyCompany("Chem4Word")] [assembly: AssemblyProduct("WinFormsTestHarness")] -[assembly: AssemblyCopyright("© Chem4Word 2019. All rights reserved.")] +[assembly: AssemblyCopyright("© Chem4Word 2020. All rights reserved.")] [assembly: AssemblyTrademark("Chem4Word")] [assembly: AssemblyCulture("")] @@ -35,5 +35,5 @@ // Build Number // Revision // -[assembly: AssemblyVersion("3.0.30.7254")] -[assembly: AssemblyFileVersion("3.0.30.7254")] +[assembly: AssemblyVersion("3.0.31.7312")] +[assembly: AssemblyFileVersion("3.0.31.7312")]