Skip to content

Commit

Permalink
Merged PR 565: Chem4Word V3 - Release 29 (V3.0.41)
Browse files Browse the repository at this point in the history
- Updated telemetry
- Remove legacy Chem4Word settings on install

Related work items: #990, #1040
  • Loading branch information
MikeWilliams-UK committed Feb 2, 2023
1 parent 31d9860 commit a67e76d
Show file tree
Hide file tree
Showing 221 changed files with 859 additions and 353 deletions.
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/AssemblyReflectionManager.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Chem4WordV3.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
31 changes: 20 additions & 11 deletions src/Chem4Word.V3/Data/Chem4Word-Versions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,17 +2,26 @@
<!-- This file must be uploaded to https://www.chem4word.co.uk/files3/ folder as Chem4Word-Versions.xml -->
<ChangeLog>
<Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>
<Version>
<Number>3.0.40 Release 28</Number>
<IsBeta>false</IsBeta>
<Released>01-Jul-2022</Released>
<Changes>
<Change>Security Update Newtonsoft.Json -> 13.0.1</Change>
<Change>If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word</Change>
<Change>Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating</Change>
</Changes>
<Url>https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.40.Release.28.msi</Url>
</Version>
<Version>
<Number>3.0.41 Release 29</Number>
<IsBeta>false</IsBeta>
<Released>02-Feb-2023</Released>
<Changes>
<Change>Updated telemetry</Change>
<Change>Remove legacy Chem4Word settings on install</Change>
<Change>If you like our product, please consider buying us a coffee at https://www.buymeacoffee.com/chem4word</Change>
<Change>Please download Chem4Word-Setup.exe via https://www.chem4word.co.uk/download/ if you encounter any difficulties updating</Change>
</Changes>
<Url>https://www.chem4word.co.uk/files3/Chem4Word-Setup.3.0.41.Release.29.msi</Url>
</Version>
<Version>
<Number>3.0.40 Release 28</Number>
<IsBeta>false</IsBeta>
<Released>01-Jul-2022</Released>
<Changes>
<Change>Security Update Newtonsoft.Json -> 13.0.1</Change>
</Changes>
</Version>
<Version>
<Number>3.0.39 Release 27</Number>
<IsBeta>false</IsBeta>
Expand Down
4 changes: 2 additions & 2 deletions src/Chem4Word.V3/Data/This-Version.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Version>
<Number>3.0.40 Release 28</Number>
<Number>3.0.41 Release 29</Number>
<IsBeta>false</IsBeta>
<Released>01-Jul-2022</Released>
<Released>02-Feb-2023</Released>
</Version>
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Database/Library.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Helpers/C4wAddInInfo.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Helpers/ChemistryHelper.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Helpers/ConfigWatcher.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Helpers/CustomXMLPartHelper.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Helpers/FormulaHelper.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Helpers/ReferenceKeeper.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Helpers/RegistryHelper.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Helpers/TargetWord.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Helpers/TaskPaneHelper.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
18 changes: 9 additions & 9 deletions src/Chem4Word.V3/Helpers/UpdateHelper.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down Expand Up @@ -240,18 +240,18 @@ private static string GetVersionsXmlFile()
{
string module = $"{_product}.{_class}.{MethodBase.GetCurrentMethod().Name}()";

string VersionsFile = $"{Constants.Chem4WordVersionFiles}/Chem4Word-Versions.xml";
string PrimaryDomain = "https://www.chem4word.co.uk";
string[] Domains = { "https://www.chem4word.co.uk", "http://www.chem4word.com", "https://chem4word.azurewebsites.net" };
string VersionsFileMarker = "<Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>";
string primaryDomain = Constants.OurDomains.FirstOrDefault();
string versionsFileMarker = "<Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>";

string versionsFile = $"{Constants.Chem4WordVersionFiles}/Chem4Word-Versions.xml";

string contents = null;

var securityProtocol = ServicePointManager.SecurityProtocol;
ServicePointManager.SecurityProtocol = securityProtocol | SecurityProtocolType.Tls11 | SecurityProtocolType.Tls12;

bool foundOurXmlFile = false;
foreach (var domain in Domains)
foreach (var domain in Constants.OurDomains)
{
using (HttpClient client = new HttpClient())
{
Expand All @@ -263,14 +263,14 @@ private static string GetVersionsXmlFile()

client.DefaultRequestHeaders.Add("user-agent", "Chem4Word VersionChecker");
client.BaseAddress = new Uri(domain);
var response = client.GetAsync(VersionsFile).Result;
var response = client.GetAsync(versionsFile).Result;
response.EnsureSuccessStatusCode();

string result = response.Content.ReadAsStringAsync().Result;
if (result.Contains(VersionsFileMarker))
if (result.Contains(versionsFileMarker))
{
foundOurXmlFile = true;
contents = domain.Equals(PrimaryDomain) ? result : result.Replace(PrimaryDomain, domain);
contents = domain.Equals(primaryDomain) ? result : result.Replace(primaryDomain, domain);
}
else
{
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Helpers/Upgrader.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Helpers/WordSettings.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Library/DefaultNameConverter.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Library/LibraryHost.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Library/LibraryItem.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Library/LibraryItemControl.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Library/LibraryModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Library/LibraryValidation.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Library/LibraryViewControl.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Library/LibraryViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Library/NameValidationRule.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Library/TagBlock.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Library/TagEditor.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Navigator/DoNothingConverter.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Navigator/FormulaBlock.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Navigator/NavigatorHost.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Navigator/NavigatorItem.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Navigator/NavigatorItemControl.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Navigator/NavigatorModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Navigator/NavigatorSupport.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Navigator/NavigatorViewControl.xaml.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Navigator/NavigatorViewModel.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Options.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Properties/Annotations.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
8 changes: 4 additions & 4 deletions src/Chem4Word.V3/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand All @@ -16,7 +16,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("Chem4Word")]
[assembly: AssemblyProduct("Chem4Word V3")]
[assembly: AssemblyCopyright("© Chem4Word 2022. All rights reserved.")]
[assembly: AssemblyCopyright("© Chem4Word 2023. All rights reserved.")]
[assembly: AssemblyTrademark("Chem4Word")]
[assembly: AssemblyCulture("")]

Expand All @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.0.40.8217")]
[assembly: AssemblyFileVersion("3.0.40.8217")]
[assembly: AssemblyVersion("3.0.41.8433")]
[assembly: AssemblyFileVersion("3.0.41.8433")]
2 changes: 1 addition & 1 deletion src/Chem4Word.V3/Ribbon/Chem4WordRibbon.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// ---------------------------------------------------------------------------
// Copyright (c) 2022, The .NET Foundation.
// Copyright (c) 2023, 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.
Expand Down
Loading

0 comments on commit a67e76d

Please sign in to comment.