Skip to content

Commit

Permalink
Merged PR 674: Seed Next Version
Browse files Browse the repository at this point in the history
Related work items: #1141
  • Loading branch information
MikeWilliams-UK committed Mar 20, 2024
1 parent adacc3f commit 8961f53
Show file tree
Hide file tree
Showing 32 changed files with 73 additions and 63 deletions.
15 changes: 12 additions & 3 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-3/ folder as Chem4Word-Versions.xml -->
<ChangeLog>
<Id>f3c4f4db-2fff-46db-b14a-feb8e09f7742</Id>
<Version>
<Number>3.3.6 Release 4</Number>
<IsBeta>false</IsBeta>
<Released>01-Apr-2024</Released>
<Changes>
<Change>...</Change>
<Change>...</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-3/Chem4Word-Setup.3.3.6.Release.4.msi</Url>
</Version>
<Version>
<Number>3.3.5 Release 3</Number>
<IsBeta>false</IsBeta>
<Released>20-Mar-2024</Released>
<Changes>
<Change>Correct Facebook url in Help -> About</Change>
<Change>Add detection of Office 2024</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-3/Chem4Word-Setup.3.3.5.Release.3.msi</Url>
</Version>
<Version>
<Number>3.3.4 Release 2</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.3.5 Release 3</Number>
<Number>3.3.6 Release 4</Number>
<IsBeta>false</IsBeta>
<Released>20-Mar-2024</Released>
<Released>01-Apr-2024</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.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
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.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
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.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
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.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
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.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
2 changes: 1 addition & 1 deletion src/Common/Chem4Word.Telemetry/TelemetryWriter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ private void WritePrivate(string operation, string level, string message)
var processId = 666;
var machineId = Guid.Empty.ToString("D");
// This is updated automatically by Set-Assembly-Version.ps1
var versionNumber = "3.3.5.666";
var versionNumber = "3.3.6.666";

try
{
Expand Down
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.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
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-3/Chem4Word-Setup.3.3.5.Release.3.msi";
private const string DefaultMsiFile = "https://www.chem4word.co.uk/files3-3/Chem4Word-Setup.3.3.6.Release.4.msi";
private const string VstoInstaller = "https://www.chem4word.co.uk/files3-3/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.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
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.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
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 2024 Release 3" Manufacturer="Chem4Word" Version="3.3.5.8845" UpgradeCode="865226e7-d29d-49aa-a390-dda49979b102" Language="1033">
<Product Id="*" Name="Chemistry Add-In for Microsoft Word 2024 Release 4" Manufacturer="Chem4Word" Version="3.3.6.8857" 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.3.5.Release.3</OutputName>
<OutputName>Chem4Word-Setup.3.3.6.Release.4</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.3.5 -name "Release 3" -released "20-Mar-2024" -path ..
.\Set-Assembly-Version.ps1 -version 3.3.6 -name "Release 4" -released "01-Apr-2024" -path ..

.\Set-Assembly-Version.ps1 -version 3.3.5 -name "Release 3" -released "20-Mar-2024" -path ..
.\Set-Assembly-Version.ps1 -version 3.3.4 -name "Release 2" -released "29-Feb-2024" -path ..
.\Set-Assembly-Version.ps1 -version 3.3.3 -name "Release 1" -released "14-Feb-2024" -path ..
.\Set-Assembly-Version.ps1 -version 3.3.2 -name "Beta 2" -released "12-Oct-2023" -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.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
// [assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
// [assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
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.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
2 changes: 1 addition & 1 deletion src/Scripts/Sign-Files.cmd
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
@echo off

set release=Chem4Word-Setup.3.3.5.Release.3.msi
set release=Chem4Word-Setup.3.3.6.Release.4.msi
set working=C:\Temp
set signtoolpath=C:\Tools\Azure\SignTool\sign.exe

Expand Down
6 changes: 3 additions & 3 deletions src/TestHarness/LibraryTransformer/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
// [assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
Original file line number Diff line number Diff line change
Expand Up @@ -35,5 +35,5 @@
// Build Number
// Revision
//
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
6 changes: 3 additions & 3 deletions src/TestHarness/Wpf.UI.Sandbox/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,6 @@
//
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
// [assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]
4 changes: 2 additions & 2 deletions src/UnitTests/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.3.5.8845")]
[assembly: AssemblyFileVersion("3.3.5.8845")]
[assembly: AssemblyVersion("3.3.6.8857")]
[assembly: AssemblyFileVersion("3.3.6.8857")]

0 comments on commit 8961f53

Please sign in to comment.