Skip to content

Commit

Permalink
BUMP v1.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
deafgoat committed Sep 6, 2018
1 parent 93abdf8 commit e10c6da
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 10 deletions.
4 changes: 4 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
MongoDB ODBC 1.1.0
* Added support for SCRAM-SHA-256 authentication mechanism.
* Added support for Linux distributions (Ubuntu 14.04, 16.04 and RHEL 7).

MongoDB ODBC 1.0.0
Forked from MySQL ODBC 5.3.10

Expand Down
2 changes: 1 addition & 1 deletion mongodb-odbc-driver/bin/VERSION.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
1.0.0
1.1.0
4 changes: 2 additions & 2 deletions mongodb-odbc-driver/installer/msi/BinaryFragment.wxs
Original file line number Diff line number Diff line change
Expand Up @@ -20,11 +20,11 @@
</Component>
<Component Guid="{20040826-9A0C-4783-9364-A1A74FFE6EB2}" Id="drivera" SharedDllRefCount="yes" Win64="$(var.win64Flag)">
<File Checksum="yes" DiskId="1" Id="mdbodbca.dll" Name="mdbodbca.dll" Source="mdbodbca.dll" KeyPath="yes" />
<ODBCDriver File="mdbodbca.dll" Id="MongoDB_ODBC_1.0a_Driver" Name="MongoDB ODBC 1.0 ANSI Driver" SetupFile="mdbodbcS.dll" />
<ODBCDriver File="mdbodbca.dll" Id="MongoDB_ODBC_1.0a_Driver" Name="MongoDB ODBC 1.1.0 ANSI Driver" SetupFile="mdbodbcS.dll" />
</Component>
<Component Guid="{66D2AAC0-B5D9-40DB-9797-3A52014DC526}" Id="driverw" SharedDllRefCount="yes" Win64="$(var.win64Flag)">
<File Checksum="yes" DiskId="1" Id="mdbodbcw.dll" Name="mdbodbcw.dll" Source="mdbodbcw.dll" KeyPath="yes" />
<ODBCDriver File="mdbodbcw.dll" Id="MongoDB_ODBC_1.0w_Driver" Name="MongoDB ODBC 1.0 Unicode Driver" SetupFile="mdbodbcS.dll" />
<ODBCDriver File="mdbodbcw.dll" Id="MongoDB_ODBC_1.0w_Driver" Name="MongoDB ODBC 1.1.0 Unicode Driver" SetupFile="mdbodbcS.dll" />
</Component>
<Component Guid="{628199F9-7996-4D6C-8319-EDAF12120263}" Id="setuplib" SharedDllRefCount="yes" Win64="$(var.win64Flag)">
<File DiskId="1" Id="mdbodbcS.lib" Name="mdbodbcS.lib" Source="mdbodbcS.lib" />
Expand Down
6 changes: 3 additions & 3 deletions mongodb-odbc-driver/installer/msi/build-msi.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -31,17 +31,17 @@ $version = $matches[1]
# rev the minor version (1.0 -> 1.1). That way, we
# will allow multiple minor versions to be installed
# side-by-side.
if ([double]$version -gt 1.0) {
if ([double]$version -gt 1.1) {
throw "You must change the upgrade code for a minor revision.
Once that is done, change the version number above to
account for the next revision that will require being
upgradeable. Make sure to change both x64 and x86 upgradeCode"
}

if ($Arch -eq "x64") {
$upgradeCode = "36ff9c14-c22c-4b8a-a998-eefb68e176ec"
$upgradeCode = "11f63272-b2a0-4b84-a280-e90c415c0bfa"
} else {
$upgradeCode = "635a11fe-328a-4f94-ba31-a9116fbfda36"
$upgradeCode = "b3e15e1b-b36b-4f5e-bf2a-e85d2e00d3c1"
}


Expand Down
4 changes: 2 additions & 2 deletions setupgui/windows/odbcdialogparams.rc
Original file line number Diff line number Diff line change
Expand Up @@ -58,14 +58,14 @@ BEGIN
BEGIN
VALUE "Comments", "provides setup library functionality\0"
VALUE "CompanyName", "MongoDB Inc.\0"
VALUE "FileDescription", "MongoDB ODBC 1.0 Driver Setup Library\0"
VALUE "FileDescription", "MongoDB ODBC 1.1.0 Driver Setup Library\0"
VALUE "FileVersion", MYODBC_STRFILEVER
VALUE "InternalName", "mdbodbcS\0"
VALUE "LegalCopyright", "Copyright (c) 1995, 2013, Oracle and/or its affiliates, Copyright (c) 2018-Present MongoDB Inc.\0"
VALUE "LegalTrademarks", "MongoDB is a trademark of MongoDB Inc.\0"
VALUE "OriginalFilename", "mdbodbcS.dll\0"
VALUE "PrivateBuild", "Production\0"
VALUE "ProductName", "MongoDB ODBC 1.0\0"
VALUE "ProductName", "MongoDB ODBC 1.1.0\0"
VALUE "ProductVersion", MYODBC_STRPRODUCTVER
VALUE "SpecialBuild", "GA release\0"
END
Expand Down
4 changes: 2 additions & 2 deletions version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,10 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

SET(CONNECTOR_MAJOR "1")
SET(CONNECTOR_MINOR "0")
SET(CONNECTOR_MINOR "1")
SET(CONNECTOR_PATCH "0")
SET(CONNECTOR_LEVEL "")
SET(CONNECTOR_QUALITY "RC")
SET(CONNECTOR_QUALITY "GA")

# ----------------------------------------------------------------------
# Set other variables that are about the version
Expand Down

0 comments on commit e10c6da

Please sign in to comment.