Skip to content

Commit

Permalink
Bump to Cbc 2.10.11 (#34)
Browse files Browse the repository at this point in the history
* Bump to Cbc 2.10.11
* Update Sonnet version numbers to 1.3.2
  • Loading branch information
jhmgoossens authored Nov 11, 2023
1 parent 6c345e6 commit 98e82ad
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 18 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
4 changes: 4 additions & 0 deletions CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions appveyor.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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}
Expand Down Expand Up @@ -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}"

#---------------------------------#
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/Sonnet/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
18 changes: 9 additions & 9 deletions src/SonnetWrapper/AssemblyInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,30 +4,30 @@

#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?
// -> Yes: Are the changes backward compatible?
// -> 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

Expand Down

0 comments on commit 98e82ad

Please sign in to comment.