Skip to content

Commit

Permalink
Merged PR 600: Create V3.2.10
Browse files Browse the repository at this point in the history
Related work items: #1064
  • Loading branch information
MikeWilliams-UK committed Mar 18, 2023
1 parent adb115a commit be6fea8
Show file tree
Hide file tree
Showing 48 changed files with 351 additions and 90 deletions.
24 changes: 13 additions & 11 deletions src/Chem4Word.V3-2.sln
Original file line number Diff line number Diff line change
Expand Up @@ -90,11 +90,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Scripts", "Scripts", "{53F5
Scripts\Clone-Setup-V3.ps1 = Scripts\Clone-Setup-V3.ps1
Scripts\Clone-Setup-V31.ps1 = Scripts\Clone-Setup-V31.ps1
Scripts\Detect-Invalid-Config.ps1 = Scripts\Detect-Invalid-Config.ps1
Scripts\Install-Dev-Certificate.ps1 = Scripts\Install-Dev-Certificate.ps1
Scripts\Get-Back-To-Square-One.ps1 = Scripts\Get-Back-To-Square-One.ps1
Scripts\Install-Dev-Certificate.ps1 = Scripts\Install-Dev-Certificate.ps1
Scripts\Reset-User-Settings.ps1 = Scripts\Reset-User-Settings.ps1
Scripts\SignAssembly.ps1 = Scripts\SignAssembly.ps1
Scripts\Set-Assembly-Version.ps1 = Scripts\Set-Assembly-Version.ps1
Scripts\SignAssembly.ps1 = Scripts\SignAssembly.ps1
Scripts\SignFiles.cmd = Scripts\SignFiles.cmd
EndProjectSection
EndProject
Expand Down Expand Up @@ -133,7 +133,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chem4Word.Libraries", "Chem
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Chem4Word.WebServices", "Chemistry\Chem4Word.WebServices\Chem4Word.WebServices.csproj", "{54F9D4A6-E151-4C65-9D68-16C620B7A6BC}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WPF.ShapeTester", "TestHarness\WPF.ShapeTester\WPF.ShapeTester.csproj", "{66114688-4B34-4B67-B14D-49F961683CBB}"
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Wpf.UI.Sandbox", "TestHarness\Wpf.UI.Sandbox\Wpf.UI.Sandbox.csproj", "{66114688-4B34-4B67-B14D-49F961683CBB}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Expand Down Expand Up @@ -693,15 +693,17 @@ Global
{66114688-4B34-4B67-B14D-49F961683CBB}.Release|x86.ActiveCfg = Release|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Release|x86.Build.0 = Release|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Setup|Any CPU.ActiveCfg = Setup|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Setup|x64.ActiveCfg = Debug|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Setup|x64.Build.0 = Debug|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Setup|x86.ActiveCfg = Debug|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Setup|x86.Build.0 = Debug|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Setup|Any CPU.Build.0 = Setup|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Setup|x64.ActiveCfg = Setup|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Setup|x64.Build.0 = Setup|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Setup|x86.ActiveCfg = Setup|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Setup|x86.Build.0 = Setup|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Vso-Ci|Any CPU.ActiveCfg = Vso-Ci|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Vso-Ci|x64.ActiveCfg = Debug|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Vso-Ci|x64.Build.0 = Debug|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Vso-Ci|x86.ActiveCfg = Debug|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Vso-Ci|x86.Build.0 = Debug|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Vso-Ci|Any CPU.Build.0 = Vso-Ci|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Vso-Ci|x64.ActiveCfg = Vso-Ci|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Vso-Ci|x64.Build.0 = Vso-Ci|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Vso-Ci|x86.ActiveCfg = Vso-Ci|Any CPU
{66114688-4B34-4B67-B14D-49F961683CBB}.Vso-Ci|x86.Build.0 = Vso-Ci|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
19 changes: 15 additions & 4 deletions src/Chem4Word.V3/Data/Chem4Word-Versions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,21 @@
<!-- This file must be uploaded to https://www.chem4word.co.uk/files3-2/ folder as Chem4Word-Versions.xml -->
<ChangeLog>
<Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>
<Version>
<Number>3.2.10 Release 6</Number>
<IsBeta>false</IsBeta>
<Released>31-Mar-2023</Released>
<Changes>
<Change>...</Change>
<Change>...</Change>
<Change>...</Change>
<Change>...</Change>
<Change>Please note any previous beta versions V3.2.4 and below will cease to allow insertion or editing of chemistry</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-2/Chem4Word-Setup.3.2.10.Release.6.msi</Url>
</Version>
<Version>
<Number>3.2.9 Release 5</Number>
<IsBeta>false</IsBeta>
Expand All @@ -10,11 +25,7 @@
<Change>BugFix: Chemistry is not editable after first save of document until document is closed then re-opened</Change>
<Change>BugFix: Reagent and Conditions buttons now work properly in ACME</Change>
<Change>BugFix: Prevent import of structures which have duplicate bonds</Change>
<Change>Please note any previous beta versions V3.2.4 and below will cease to allow insertion or editing of chemistry</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-2/Chem4Word-Setup.3.2.9.Release.5.msi</Url>
</Version>
<Version>
<Number>3.2.8 Release 4</Number>
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.2.9 Release 5</Number>
<Number>3.2.10 Release 6</Number>
<IsBeta>false</IsBeta>
<Released>17-Mar-2023</Released>
<Released>31-Mar-2023</Released>
</Version>
4 changes: 2 additions & 2 deletions src/Chem4Word.V3/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
4 changes: 2 additions & 2 deletions src/Chemistry/Chem4Word.ACME/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
4 changes: 2 additions & 2 deletions src/Chemistry/Chem4Word.Libraries/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
4 changes: 2 additions & 2 deletions src/Chemistry/Chem4Word.Model2/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
4 changes: 2 additions & 2 deletions src/Common/Chem4Word.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
4 changes: 2 additions & 2 deletions src/Common/Chem4Word.Telemetry/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
4 changes: 2 additions & 2 deletions src/Installer/Chem4WordSetup/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
2 changes: 1 addition & 1 deletion src/Installer/Chem4WordSetup/Setup.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public partial class Setup : Form
private const string DetectV2AddIn = @"Chemistry Add-in for Word\Chem4Word.AddIn.vsto";
private const string DetectV3AddIn = @"Chem4Word V3\Chem4Word.V3.vsto";

private const string DefaultMsiFile = "https://www.chem4word.co.uk/files3-2/Chem4Word-Setup.3.2.9.Release.5.msi";
private const string DefaultMsiFile = "https://www.chem4word.co.uk/files3-2/Chem4Word-Setup.3.2.10.Release.6.msi";
private const string VstoInstaller = "https://www.chem4word.co.uk/files3-2/vstor_redist.exe";

private WebClient _webClient;
Expand Down
4 changes: 2 additions & 2 deletions src/Installer/Chem4WordUpdater/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
4 changes: 2 additions & 2 deletions src/Installer/WiX.CustomAction/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -34,5 +34,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
2 changes: 1 addition & 1 deletion src/Installer/WiXInstaller/Product.wxs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
<!-- For automatic upgrade to work only first three parts of version number are used -->
<Product Id="*" Name="Chemistry Add-In for Microsoft Word 2022 Release 5" Manufacturer="Chem4Word" Version="3.2.9.8476" UpgradeCode="865226e7-d29d-49aa-a390-dda49979b102" Language="1033">
<Product Id="*" Name="Chemistry Add-In for Microsoft Word 2022 Release 6" Manufacturer="Chem4Word" Version="3.2.10.8490" UpgradeCode="865226e7-d29d-49aa-a390-dda49979b102" Language="1033">
<Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
<MajorUpgrade DowngradeErrorMessage="A newer version of Chem4Word is already installed." />
<Media Id="1" Cabinet="product.cab" EmbedCab="yes" CompressionLevel="high" />
Expand Down
2 changes: 1 addition & 1 deletion src/Installer/WiXInstaller/WiX-Installer.wixproj
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
<ProductVersion>3.10</ProductVersion>
<ProjectGuid>746e1493-1b1e-482c-8fa4-c147237f4f7b</ProjectGuid>
<SchemaVersion>2.0</SchemaVersion>
<OutputName>Chem4Word-Setup.3.2.9.Release.5</OutputName>
<OutputName>Chem4Word-Setup.3.2.10.Release.6</OutputName>
<OutputType>Package</OutputType>
<SccProjectName>SAK</SccProjectName>
<SccLocalPath>SAK</SccLocalPath>
Expand Down
3 changes: 2 additions & 1 deletion src/Notes/Releases.txt
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
# Set Build Numbers

.\Set-Assembly-Version.ps1 -version 3.2.9 -name "Release 5" -released "17-Mar-2023" -path ..
.\Set-Assembly-Version.ps1 -version 3.2.10 -name "Release 6" -released "31-Mar-2023" -path ..

.\Set-Assembly-Version.ps1 -version 3.2.9 -name "Release 5" -released "17-Mar-2023" -path ..
.\Set-Assembly-Version.ps1 -version 3.2.8 -name "Release 4" -released "15-Feb-2023" -path ..
.\Set-Assembly-Version.ps1 -version 3.2.7 -name "Release 3" -released "02-Feb-2023" -path ..
.\Set-Assembly-Version.ps1 -version 3.2.6 -name "Release 2" -released "05-Dec-2022" -path ..
Expand Down
4 changes: 2 additions & 2 deletions src/PlugIns/Contracts/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
4 changes: 2 additions & 2 deletions src/PlugIns/Renderers/OoXmlV4/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
2 changes: 1 addition & 1 deletion src/Scripts/SignFiles.cmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@echo off

set release=Chem4Word-Setup.3.2.9.Release.5.msi
set release=Chem4Word-Setup.3.2.10.Release.6.msi
set working=C:\Temp
set signclientpath=C:\Tools\Azure\SignClient

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
Original file line number Diff line number Diff line change
Expand Up @@ -51,5 +51,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.2.9.8476")]
[assembly: AssemblyFileVersion("3.2.9.8476")]
[assembly: AssemblyVersion("3.2.10.8490")]
[assembly: AssemblyFileVersion("3.2.10.8490")]
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Application
x:Class="WPF.ShapeTester.App"
x:Class="Wpf.UI.Sandbox.App"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
StartupUri="MainWindow.xaml">
StartupUri="Launcher.xaml">
<Application.Resources />
</Application>
Original file line number Diff line number Diff line change
Expand Up @@ -7,12 +7,12 @@

using System.Windows;

namespace WPF.ShapeTester
namespace Wpf.UI.Sandbox
{
/// <summary>
/// Interaction logic for App.xaml
/// </summary>
public partial class App : Application
{
}
}
}
36 changes: 36 additions & 0 deletions src/TestHarness/Wpf.UI.Sandbox/Launcher.xaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
<Window
x:Class="Wpf.UI.Sandbox.Launcher"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="clr-namespace:Wpf.UI.Sandbox"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
Title="Launcher"
Width="800"
Height="450"
mc:Ignorable="d">
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="*" />
<RowDefinition Height="*" />
</Grid.RowDefinitions>
<Button
Grid.Row="0"
Grid.Column="0"
Click="OnClick_Button1">
Shapes
</Button>
<Button
Grid.Row="1"
Grid.Column="0"
Click="OnClick_Button2">
Ticker
</Button>
</Grid>
</Window>
Loading

0 comments on commit be6fea8

Please sign in to comment.