Skip to content

Commit

Permalink
BUMP v1.3.0
Browse files Browse the repository at this point in the history
  • Loading branch information
rychipman committed Jan 14, 2020
1 parent 1eeb5fd commit 16ee2b0
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 9 deletions.
5 changes: 5 additions & 0 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,3 +1,8 @@
MongoDB ODBC 1.3.0
* Update ICU Download link
* Support python 3 in mac installer
* Use OpenSSL on Windows for TLS 1.2 support

MongoDB ODBC 1.2.0
* Fixed OS X installer bug

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.2.0
1.3.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 @@ -32,11 +32,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.2.0 ANSI Driver" SetupFile="mdbodbcS.dll" />
<ODBCDriver File="mdbodbca.dll" Id="MongoDB_ODBC_1.0a_Driver" Name="MongoDB ODBC 1.3.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.2.0 Unicode Driver" SetupFile="mdbodbcS.dll" />
<ODBCDriver File="mdbodbcw.dll" Id="MongoDB_ODBC_1.0w_Driver" Name="MongoDB ODBC 1.3.0 Unicode Driver" SetupFile="mdbodbcS.dll" />
</Component>
<Component Guid="{F14D7C7F-1B4C-4218-A5DF-2D278451DD37}" Id="installer" SharedDllRefCount="yes" Win64="$(var.win64Flag)">
<File DiskId="1" Id="installer" Name="mdbodbc-installer.exe" ShortName="g1mdra3f.exe" Source="installer.exe" />
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.2) {
if ([double]$version -gt 1.3) {
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 = "56c0cda6-269a-49d0-a539-6711818088be"
$upgradeCode = "650564f1-27f0-459b-95df-f186ddf8eb16"
} else {
$upgradeCode = "01623c80-6101-499d-bce8-da693e3796f6"
$upgradeCode = "5095a972-40ba-4003-844a-7dff745996d2"
}


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.2.0 Driver Setup Library\0"
VALUE "FileDescription", "MongoDB ODBC 1.3.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.2.0\0"
VALUE "ProductName", "MongoDB ODBC 1.3.0\0"
VALUE "ProductVersion", MYODBC_STRPRODUCTVER
VALUE "SpecialBuild", "GA release\0"
END
Expand Down
2 changes: 1 addition & 1 deletion version.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
# 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA

SET(CONNECTOR_MAJOR "1")
SET(CONNECTOR_MINOR "2")
SET(CONNECTOR_MINOR "3")
SET(CONNECTOR_PATCH "0")
SET(CONNECTOR_LEVEL "")
SET(CONNECTOR_QUALITY "GA")
Expand Down

0 comments on commit 16ee2b0

Please sign in to comment.