Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

merge v1.2.0 into develop #717

Closed
wants to merge 1 commit into from
Closed

merge v1.2.0 into develop #717

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
# Project configuration
# ===========================================================================

PROJECT(antaresXpansion VERSION 1.1.0)
PROJECT(antaresXpansion VERSION 1.2.0)
set(ANTARES_XPANSION_RC 0)

# ===========================================================================
Expand Down
2 changes: 1 addition & 1 deletion antares-version.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"antares_version": "8.8.0-rc2",
"antares_version_executable": "8.8",
"antares_xpansion_version": "1.1.0",
"antares_xpansion_version": "1.2.0",
"antares_deps_version": "2.0.7",
"minizip_ng_version": "3.0.6"
}
15 changes: 14 additions & 1 deletion docs/changelog/CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
Antares-Xpansion changelog
=================
v1.1 (TBA)

v1.2 (10/2023)
--------------------------------------------------------

### Features

- Support "named mps" from Antares simulator
- Use Antares Simulator 8.8.0-rc2

### Bug fixes

- Fix issue on windows with concurrent access to log files

v1.1 (09/2023)
--------------------

### Features
Expand Down
2 changes: 1 addition & 1 deletion sonar-project.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
sonar.projectName=antares-xpansion
sonar.projectKey=AntaresSimulatorTeam_antares-xpansion
sonar.organization=antaressimulatorteam
sonar.projectVersion=1.1.0
sonar.projectVersion=1.2.0

# =====================================================
# Properties that will be shared amongst all modules
Expand Down
Loading