Update version to 2.1.0

vbaderks · vbaderks · commit 20ed9e93be8b · 2019-12-29T20:10:31.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -3,7 +3,7 @@
 
 cmake_minimum_required(VERSION 3.9...3.14)
 
-project(charls VERSION 2.0.1 LANGUAGES C CXX)
+project(charls VERSION 2.1.0 LANGUAGES C CXX)
 
 # Determine if project is built as a subproject (using add_subdirectory) or if it is the master project.
 set(MASTER_PROJECT OFF)
diff --git a/SECURITY.md b/SECURITY.md
@@ -2,12 +2,10 @@
 
 ## Supported Versions
 
-Use this section to tell people about which versions of your project are
-currently being supported with security updates.
-
 | Version | Supported          |
 | ------- | ------------------ |
-| 2.0.0   | :white_check_mark: |
+| 2.1.0   | :white_check_mark: |
+| 2.0.0   | :x:                |
 | 1.1.0   | :white_check_mark: |
 | < 1.1.0 | :x:                |
 
diff --git a/appveyor.yml b/appveyor.yml
@@ -1,4 +1,4 @@
-version: 2.00.{build}
+version: 2.1.0.{build}
 os: Visual Studio 2019
 configuration:
 - Debug
diff --git a/dotnet/src/CharLSNet.csproj b/dotnet/src/CharLSNet.csproj
@@ -7,9 +7,9 @@
     <Description>".NET interop layer for the CharLS JPEG-LS codec"</Description>
     <Company>Team-CharLS</Company>
     <Authors>Team-CharLS</Authors>
-    <Version>2.0.1</Version>
+    <Version>2.1.0</Version>
     <AssemblyVersion>2.0.0.0</AssemblyVersion>
-    <FileVersion>2.0.0.0</FileVersion>
+    <FileVersion>2.1.0.0</FileVersion>
     <Copyright>Copyright 2019 Team CharLS</Copyright>
     <Platforms>AnyCPU</Platforms>
     <Configurations>Debug;Release;Checked</Configurations>
diff --git a/src/charls.rc b/src/charls.rc
diff --git a/src/version.cpp b/src/version.cpp
@@ -12,7 +12,7 @@
 
 const char* CHARLS_API_CALLING_CONVENTION charls_get_version_string() noexcept
 {
-    return TO_STRING(CHARLS_VERSION_MAJOR) "." TO_STRING(CHARLS_VERSION_MINOR) "." TO_STRING(CHARLS_VERSION_PATCH) "-rc1";
+    return TO_STRING(CHARLS_VERSION_MAJOR) "." TO_STRING(CHARLS_VERSION_MINOR) "." TO_STRING(CHARLS_VERSION_PATCH);
 }
 
 void CHARLS_API_CALLING_CONVENTION charls_get_version_number(int32_t* major, int32_t* minor, int32_t* patch) noexcept

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-version: 2.00.{build}`
	`1`	`+version: 2.1.0.{build}`
`2`	`2`	`os: Visual Studio 2019`
`3`	`3`	`configuration:`
`4`	`4`	`- Debug`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@`
`12`	`12`
`13`	`13`	`const char* CHARLS_API_CALLING_CONVENTION charls_get_version_string() noexcept`
`14`	`14`	`{`
`15`		`- return TO_STRING(CHARLS_VERSION_MAJOR) "." TO_STRING(CHARLS_VERSION_MINOR) "." TO_STRING(CHARLS_VERSION_PATCH) "-rc1";`
	`15`	`+ return TO_STRING(CHARLS_VERSION_MAJOR) "." TO_STRING(CHARLS_VERSION_MINOR) "." TO_STRING(CHARLS_VERSION_PATCH);`
`16`	`16`	`}`
`17`	`17`
`18`	`18`	`void CHARLS_API_CALLING_CONVENTION charls_get_version_number(int32_t* major, int32_t* minor, int32_t* patch) noexcept`