From 0200a06598ad5e7ac06439e3eb21699e05876ee8 Mon Sep 17 00:00:00 2001 From: MrMeemus Date: Mon, 20 Nov 2017 16:53:47 -0800 Subject: [PATCH 1/2] Fixing naming convention for local copy of sqltoolsservice, removed linux i686 support. --- build.py | 3 +-- mssqlscripter/mssqltoolsservice/external.py | 3 +-- ....SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip | Bin 3 files changed, 2 insertions(+), 4 deletions(-) rename sqltoolsservice/{winamd64 => win_amd64}/Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip (100%) diff --git a/build.py b/build.py index c6c00db..833a756 100644 --- a/build.py +++ b/build.py @@ -153,8 +153,7 @@ def publish_official(platforms_names): 'win32', 'win_amd64', 'macosx_10_11_intel', - 'manylinux1_x86_64', - 'manylinux1_i686'] + 'manylinux1_x86_64'] targets = { 'build': build, diff --git a/mssqlscripter/mssqltoolsservice/external.py b/mssqlscripter/mssqltoolsservice/external.py index bd0e376..5fbeaa9 100644 --- a/mssqlscripter/mssqltoolsservice/external.py +++ b/mssqlscripter/mssqltoolsservice/external.py @@ -19,7 +19,6 @@ # Supported platform key's must match those in mssqlscript's setup.py. SUPPORTED_PLATFORMS = { 'manylinux1_x86_64': SQLTOOLSSERVICE_BASE + 'manylinux1/' + 'Microsoft.SqlTools.ServiceLayer-linux-x64-netcoreapp2.0.tar.gz', - 'manylinux1_i686': SQLTOOLSSERVICE_BASE + 'manylinux1/' + 'Microsoft.SqlTools.ServiceLayer-linux-x64-netcoreapp2.0.tar.gz', 'macosx_10_11_intel': SQLTOOLSSERVICE_BASE + 'macosx_10_11_intel/' + 'Microsoft.SqlTools.ServiceLayer-osx-x64-netcoreapp2.0.tar.gz', 'win_amd64': SQLTOOLSSERVICE_BASE + 'winamd64/' + 'Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip', 'win32': SQLTOOLSSERVICE_BASE + 'win32/' + 'Microsoft.SqlTools.ServiceLayer-win-x86-netcoreapp2.0.zip' @@ -38,7 +37,7 @@ def copy_sqltoolsservice(platform): if not platform or platform not in SUPPORTED_PLATFORMS: print('{} is not supported.'.format(platform)) print('Please provide a valid platform flag.' + - '[win32, win_amd64, manylinux1_x86_64, manylinux1_i686, macosx_10_11_intel]') + '[win32, win_amd64, manylinux1_x86_64, macosx_10_11_intel]') sys.exit(1) copy_file_path = SUPPORTED_PLATFORMS[platform] diff --git a/sqltoolsservice/winamd64/Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip b/sqltoolsservice/win_amd64/Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip similarity index 100% rename from sqltoolsservice/winamd64/Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip rename to sqltoolsservice/win_amd64/Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip From 3369598949bb4e5d37f2e915bef9a6d54b744471 Mon Sep 17 00:00:00 2001 From: MrMeemus Date: Mon, 20 Nov 2017 16:58:29 -0800 Subject: [PATCH 2/2] Fixing fix path for win_amd64. --- mssqlscripter/mssqltoolsservice/external.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mssqlscripter/mssqltoolsservice/external.py b/mssqlscripter/mssqltoolsservice/external.py index 5fbeaa9..e3605eb 100644 --- a/mssqlscripter/mssqltoolsservice/external.py +++ b/mssqlscripter/mssqltoolsservice/external.py @@ -20,7 +20,7 @@ SUPPORTED_PLATFORMS = { 'manylinux1_x86_64': SQLTOOLSSERVICE_BASE + 'manylinux1/' + 'Microsoft.SqlTools.ServiceLayer-linux-x64-netcoreapp2.0.tar.gz', 'macosx_10_11_intel': SQLTOOLSSERVICE_BASE + 'macosx_10_11_intel/' + 'Microsoft.SqlTools.ServiceLayer-osx-x64-netcoreapp2.0.tar.gz', - 'win_amd64': SQLTOOLSSERVICE_BASE + 'winamd64/' + 'Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip', + 'win_amd64': SQLTOOLSSERVICE_BASE + 'win_amd64/' + 'Microsoft.SqlTools.ServiceLayer-win-x64-netcoreapp2.0.zip', 'win32': SQLTOOLSSERVICE_BASE + 'win32/' + 'Microsoft.SqlTools.ServiceLayer-win-x86-netcoreapp2.0.zip' }