From bd185353c9c9933b0fe07621d2f505f417d92854 Mon Sep 17 00:00:00 2001 From: Jan-Willem Goossens Date: Sat, 2 Dec 2023 12:32:09 +0100 Subject: [PATCH] change version to 1.4 for next stable dev --- .github/workflows/windows-ci.yml | 6 +++--- CHANGELOG.txt | 2 +- src/Sonnet/AssemblyInfo.cs | 4 ++-- src/SonnetWrapper/AssemblyInfo.h | 10 +++++----- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index b3c27a6..4b5de54 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -54,8 +54,8 @@ jobs: echo Ref name: ${{ github.ref_name }} >> Sonnet\BUILD-INFO.txt echo Commit: ${{ github.sha }} >> Sonnet\BUILD-INFO.txt Sonnet\build-third-party-license.bat - (Get-Content Sonnet\src\Sonnet\AssemblyInfo.cs).Replace('2.0.0.9999','2.0.0.${{ github.run_number }}') | Set-Content Sonnet\src\Sonnet\AssemblyInfo.cs - (Get-Content Sonnet\src\SonnetWrapper\AssemblyInfo.h).Replace('2.0.0.9999','2.0.0.${{ github.run_number }}').Replace('2,0,0,9999','2,0,0,${{ github.run_number }}') | Set-Content Sonnet\src\SonnetWrapper\AssemblyInfo.h + (Get-Content Sonnet\src\Sonnet\AssemblyInfo.cs).Replace('1.4.0.9999','1.4.0.${{ github.run_number }}') | Set-Content Sonnet\src\Sonnet\AssemblyInfo.cs + (Get-Content Sonnet\src\SonnetWrapper\AssemblyInfo.h).Replace('1.4.0.9999','1.4.0.${{ github.run_number }}').Replace('1,4,0,9999','1,4,0,${{ github.run_number }}') | Set-Content Sonnet\src\SonnetWrapper\AssemblyInfo.h 7z --% a -tzip -r -x!.git "Sonnet-${{ github.ref_name }}-CI-src.zip" .\* nuget restore Sonnet\MSVisualStudio\v17\Sonnet.sln @@ -120,7 +120,7 @@ jobs: replace: true updateTag: true body: | - Built on: ${{ env.builddate }} (v2.0.0.${{ github.run_number }} ) + Built on: ${{ env.builddate }} (v1.4.0.${{ github.run_number }} ) The Sonnet latest builds are pre-release builds based on the latest code in the master branch. As such, these builds may or may not be stable. The Sonnet latest builds use the latest code in the [master branch of Cbc](https://github.com/coin-or/cbc) and its dependencies. The Sonnet latest builds are created automatically at every successful build following a commit to the master branch. diff --git a/CHANGELOG.txt b/CHANGELOG.txt index 98a70bb..2d71aee 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -9,7 +9,7 @@ The File Version numbers change with every release. In contrast, the Assembly Ve - MIQP. Quadratic objective for MIP. Quadratic objective works with OsiClp (QP). Quadratic objectives via OsiCbc does not work well and is disabled. (Unconfirmed for Cbc 2.10.10) -[1.4.0] Nov 2023 +[1.4.0] Dec 2023 Minor release of Sonnet, using Cbc 2.10.11. Sonnet stable 1.4 brings the latest changes from sonnet master back to Sonnet 1.3 based on Cbc 2.10.11, including nested source folders (Cbc\Cbc etc.) diff --git a/src/Sonnet/AssemblyInfo.cs b/src/Sonnet/AssemblyInfo.cs index d6dda64..2971f78 100644 --- a/src/Sonnet/AssemblyInfo.cs +++ b/src/Sonnet/AssemblyInfo.cs @@ -62,5 +62,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("2.0.0.0")] -[assembly: AssemblyFileVersion("2.0.0.9999")] +[assembly: AssemblyVersion("1.4.0.0")] +[assembly: AssemblyFileVersion("1.4.0.9999")] diff --git a/src/SonnetWrapper/AssemblyInfo.h b/src/SonnetWrapper/AssemblyInfo.h index 03bbe21..95653cb 100644 --- a/src/SonnetWrapper/AssemblyInfo.h +++ b/src/SonnetWrapper/AssemblyInfo.h @@ -5,17 +5,17 @@ #pragma once -#define VER_FILEVERSION 2,0,0,9999 -#define VER_FILEVERSION_STR "2.0.0.9999" +#define VER_FILEVERSION 1,4,0,9999 +#define VER_FILEVERSION_STR "1.4.0.9999" // About Production & Assembly version: // Did the interface change? // -> Yes: Are the changes backward compatible? // -> No: Then change the version number // -> Yes: Keep same version. // -> No: Keep same version. -#define VER_PRODUCTVERSION 2,0,0,0 -#define VER_PRODUCTVERSION_STR L"2.0.0.0" -#define VER_ASSEMBLYVERSION_STR L"2.0.0.0" // Can use * but that's what we DONT want to do +#define VER_PRODUCTVERSION 1,4,0,0 +#define VER_PRODUCTVERSION_STR L"1.4.0.0" +#define VER_ASSEMBLYVERSION_STR L"1.4.0.0" // Can use * but that's what we DONT want to do #define VER_COPYRIGHT L"This code is licensed under the terms of the Eclipse Public License v2.0 (EPL-2.0)." #define VER_TRADEMARK L""