Skip to content

Commit

Permalink
change version to 1.4 for next stable dev
Browse files Browse the repository at this point in the history
  • Loading branch information
jhmgoossens committed Dec 2, 2023
1 parent 764c534 commit bd18535
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/windows-ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion CHANGELOG.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.)
Expand Down
4 changes: 2 additions & 2 deletions src/Sonnet/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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")]
10 changes: 5 additions & 5 deletions src/SonnetWrapper/AssemblyInfo.h
Original file line number Diff line number Diff line change
Expand Up @@ -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""
Expand Down

0 comments on commit bd18535

Please sign in to comment.