diff --git a/.github/workflows/windows-ci.yml b/.github/workflows/windows-ci.yml index 4e21844..7635623 100644 --- a/.github/workflows/windows-ci.yml +++ b/.github/workflows/windows-ci.yml @@ -53,8 +53,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('1.3.1.0','1.3.1.${{ github.run_number }}') | Set-Content Sonnet\src\Sonnet\AssemblyInfo.cs - (Get-Content Sonnet\src\SonnetWrapper\AssemblyInfo.h).Replace('1.3.1.0','1.3.1.${{ github.run_number }}').Replace('1,3,1,0','1,3,1,${{ github.run_number }}') | Set-Content Sonnet\src\SonnetWrapper\AssemblyInfo.h + (Get-Content Sonnet\src\Sonnet\AssemblyInfo.cs).Replace('1.3.2.0','1.3.2.${{ github.run_number }}') | Set-Content Sonnet\src\Sonnet\AssemblyInfo.cs + (Get-Content Sonnet\src\SonnetWrapper\AssemblyInfo.h).Replace('1.3.2.0','1.3.2.${{ github.run_number }}').Replace('1,3,2,0','1,3,2,${{ 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 @@ -119,7 +119,7 @@ jobs: replace: true updateTag: true body: | - Built on: ${{ env.builddate }} (v1.3.1.${{ github.run_number }} ) + Built on: ${{ env.builddate }} (v1.3.2.${{ 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 b6c4988..d0f48a6 100644 --- a/CHANGELOG.txt +++ b/CHANGELOG.txt @@ -8,6 +8,10 @@ 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.3.2.0] Nov 2023 +Patch release of Sonnet, upgrading to Cbc 2.10.11. + - Bump to Cbc 2.10.11 + [1.3.1.0] June 2023 Patch release of Sonnet, upgrading to Cbc 2.10.10 and support .NET 6.0 and .NET Framework 4.8. - Bump to Cbc 2.10.10 diff --git a/appveyor.yml b/appveyor.yml index d49c872..51ab57b 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -9,7 +9,7 @@ environment: secure: 7rM8AX6MnUMN7F8Ad9BTvgRci9lmy4i3LWHC5l9ZdVY3xtJg7RwIXNWAg95vXFmK # version format -version: 1.3.1.{build} +version: 1.3.2.{build} # you can use {branch} name in version format too # version: 1.0.{build}-{branch} @@ -85,8 +85,8 @@ install: assembly_info: patch: true file: AssemblyInfo.* - assembly_version: "1.3.1.0" - assembly_file_version: "1.3.1.{build}" + assembly_version: "1.3.2.0" + assembly_file_version: "1.3.2.{build}" # assembly_informational_version: "1.4.0.{build}" #---------------------------------# @@ -114,7 +114,7 @@ before_build: - echo RELEASE_TYPE "%RELEASE_TYPE%" - echo Creating %RELEASE_NAME%-src.zip artefact from projects folder - echo Built on %date% %time% > BUILD-INFO.txt - - echo Version 1.3.1.%APPVEYOR_BUILD_NUMBER% >> BUILD-INFO.txt + - echo Version 1.3.2.%APPVEYOR_BUILD_NUMBER% >> BUILD-INFO.txt - echo Repo %APPVEYOR_REPO_NAME% >> BUILD-INFO.txt - echo Ref name %APPVEYOR_REPO_BRANCH% >> BUILD-INFO.txt - echo Commit %APPVEYOR_REPO_COMMIT% >> BUILD-INFO.txt diff --git a/src/Sonnet/AssemblyInfo.cs b/src/Sonnet/AssemblyInfo.cs index 51f1848..77f265c 100644 --- a/src/Sonnet/AssemblyInfo.cs +++ b/src/Sonnet/AssemblyInfo.cs @@ -41,5 +41,5 @@ // // You can specify all the values or you can default the Revision and Build Numbers // by using the '*' as shown below: -[assembly: AssemblyVersion("1.3.1.0")] -[assembly: AssemblyFileVersion("1.3.1.0")] +[assembly: AssemblyVersion("1.3.2.0")] +[assembly: AssemblyFileVersion("1.3.2.0")] diff --git a/src/SonnetWrapper/AssemblyInfo.h b/src/SonnetWrapper/AssemblyInfo.h index ce4169f..2c19e22 100644 --- a/src/SonnetWrapper/AssemblyInfo.h +++ b/src/SonnetWrapper/AssemblyInfo.h @@ -4,8 +4,8 @@ #pragma once -#define VER_FILEVERSION 1,3,1,0 -#define VER_FILEVERSION_STR "1.3.1.0" +#define VER_FILEVERSION 1,3,2,0 +#define VER_FILEVERSION_STR "1.3.2.0" // About Production & Assembly version: // Did the interface change? @@ -13,21 +13,21 @@ // -> No: Then change the version number // -> Yes: Keep same version. // -> No: Keep same version. -#define VER_PRODUCTVERSION 1,3,1,0 -#define VER_PRODUCTVERSION_STR "1.3.1.0" -#define VER_ASSEMBLYVERSION_STR "1.3.1.0" // Can use * +#define VER_PRODUCTVERSION 1,3,2,0 +#define VER_PRODUCTVERSION_STR "1.3.2.0" +#define VER_ASSEMBLYVERSION_STR "1.3.2.0" // Can use * #ifdef _DEBUG #ifndef WIN32 -#define VER_FILEDESCRIPTION "SonnetWrapper 64-bit (Debug), based on Cbc 2.10.10" +#define VER_FILEDESCRIPTION "SonnetWrapper 64-bit (Debug), based on Cbc 2.10.11" #else -#define VER_FILEDESCRIPTION "SonnetWrapper 32-bit (Debug), based on Cbc 2.10.10" +#define VER_FILEDESCRIPTION "SonnetWrapper 32-bit (Debug), based on Cbc 2.10.11" #endif #else #ifndef WIN32 -#define VER_FILEDESCRIPTION "SonnetWrapper 64-bit, based on Cbc 2.10.10" +#define VER_FILEDESCRIPTION "SonnetWrapper 64-bit, based on Cbc 2.10.11" #else -#define VER_FILEDESCRIPTION "SonnetWrapper 32-bit, based on Cbc 2.10.10" +#define VER_FILEDESCRIPTION "SonnetWrapper 32-bit, based on Cbc 2.10.11" #endif #endif