Merge branch 'master' into dev

Author: MrMeemus

.bumpversion.cfg

@@ -1,5 +1,6 @@
 [bumpversion]
 current_version = 1.0.0a21
+
 parse = (?P<major>\d+)\.(?P<minor>\d+)\.(?P<patch>\d+)((?P<release>[a-z]+))(?P<release_version>\d+)
 serialize = 
 	{major}.{minor}.{patch}{release}{release_version}

mssqlscripter/__init__.py

@@ -3,4 +3,6 @@
 # Licensed under the MIT License. See License.txt in the project root for license information.
 # --------------------------------------------------------------------------------------------
 
+
 __version__ = '1.0.0a21'
+

mssqltoolsservice/buildwheels.py

@@ -17,6 +17,7 @@
 from urllib.request import urlopen
 
 
+
 DOWNLOAD_URL_BASE = 'https://mssqlscripter.blob.core.windows.net/sqltoolsservice-10-12-2017/'
 
 # Supported platform key's must match those in mssqlscript's setup.py.
@@ -25,7 +26,7 @@
     'OSX_10_11_64': DOWNLOAD_URL_BASE + 'Microsoft.SqlTools.ServiceLayer-osx-x64-netcoreapp2.0.tar.gz',
     'Windows_7_64': DOWNLOAD_URL_BASE + 'Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip',
     'Windows_7_86': DOWNLOAD_URL_BASE + 'Microsoft.SqlTools.ServiceLayer-win-x86-netcoreapp2.0.zip'
-}
+
 
 CURRENT_DIRECTORY = os.path.abspath(os.path.join(os.path.abspath(__file__), '..'))
 BUILD_DIRECTORY = os.path.abspath(os.path.join(CURRENT_DIRECTORY, 'build'))

mssqltoolsservice/mssqltoolsservice/__init__.py

@@ -9,9 +9,11 @@
 import os
 import platform
 
+
 __version__ = '1.0.0a21'
 
 
+
 def get_executable_path():
     """
         Find mssqltoolsservice executable relative to this package.

mssqltoolsservice/setup.py

@@ -12,8 +12,10 @@
 
 # This version number is in place in two places and must be in sync with
 # mssqlscripter's version in setup.py.
+
 MSSQLTOOLSSERVICE_VERSION = '1.0.0a21'
 
+
 # If we have source, validate version numbers match to prevent
 # uploading releases with mismatched versions.
 try:

setup.py

@@ -14,8 +14,10 @@
 
 # This version number is in place in two places and must be in sync with
 # mssqltoolsservice's version in setup.py.
+
 MSSQLSCRIPTER_VERSION = '1.0.0a21'
 
+
 # If we have the source, validate our setup version matches source version.
 # This will prevent uploading releases with mismatched versions. This will
 # also ensure mssqlscripter's version is in sync with mssqltoolsservice.