diff --git a/extensions/mssql/config.json b/extensions/mssql/config.json index a9f422bee0..4d4ef5eaef 100644 --- a/extensions/mssql/config.json +++ b/extensions/mssql/config.json @@ -1,18 +1,18 @@ { "downloadUrl": "https://github.com/Microsoft/sqltoolsservice/releases/download/v{#version#}/microsoft.sqltools.servicelayer-{#fileName#}", - "version": "2.0.0-release.71", + "version": "3.0.0-release.4", "downloadFileNames": { - "Windows_86": "win-x86-netcoreapp2.2.zip", - "Windows_64": "win-x64-netcoreapp2.2.zip", - "OSX": "osx-x64-netcoreapp2.2.tar.gz", - "CentOS_7": "rhel-x64-netcoreapp2.2.tar.gz", - "Debian_8": "rhel-x64-netcoreapp2.2.tar.gz", - "Fedora_23": "rhel-x64-netcoreapp2.2.tar.gz", - "OpenSUSE_13_2": "rhel-x64-netcoreapp2.2.tar.gz", - "RHEL_7": "rhel-x64-netcoreapp2.2.tar.gz", - "SLES_12_2": "rhel-x64-netcoreapp2.2.tar.gz", - "Ubuntu_14": "rhel-x64-netcoreapp2.2.tar.gz", - "Ubuntu_16": "rhel-x64-netcoreapp2.2.tar.gz" + "Windows_86": "win-x86-netcoreapp3.1.zip", + "Windows_64": "win-x64-netcoreapp3.1.zip", + "OSX": "osx-x64-netcoreapp3.1.tar.gz", + "CentOS_7": "rhel-x64-netcoreapp3.1.tar.gz", + "Debian_8": "rhel-x64-netcoreapp3.1.tar.gz", + "Fedora_23": "rhel-x64-netcoreapp3.1.tar.gz", + "OpenSUSE_13_2": "rhel-x64-netcoreapp3.1.tar.gz", + "RHEL_7": "rhel-x64-netcoreapp3.1.tar.gz", + "SLES_12_2": "rhel-x64-netcoreapp3.1.tar.gz", + "Ubuntu_14": "rhel-x64-netcoreapp3.1.tar.gz", + "Ubuntu_16": "rhel-x64-netcoreapp3.1.tar.gz" }, "installDirectory": "./sqltoolsservice/{#platform#}/{#version#}", "executableFiles": ["MicrosoftSqlToolsServiceLayer.exe", "MicrosoftSqlToolsServiceLayer"], diff --git a/extensions/sql-database-projects/src/test/projectController.test.ts b/extensions/sql-database-projects/src/test/projectController.test.ts index 9ead46cedf..131d271244 100644 --- a/extensions/sql-database-projects/src/test/projectController.test.ts +++ b/extensions/sql-database-projects/src/test/projectController.test.ts @@ -47,7 +47,7 @@ beforeEach(async function (): Promise { testContext = createContext(); }); -describe.skip('ProjectsController: project controller operations', function (): void { +describe('ProjectsController: project controller operations', function (): void { before(async function (): Promise { await templates.loadTemplates(path.join(__dirname, '..', '..', 'resources', 'templates')); await baselines.loadBaselines(); @@ -218,7 +218,7 @@ describe.skip('ProjectsController: project controller operations', function (): }); }); -describe.skip('ProjectsController: import operations', function (): void { +describe('ProjectsController: import operations', function (): void { it('Should create list of all files and folders correctly', async function (): Promise { const testFolderPath = await testUtils.createDummyFileStructure(); @@ -295,7 +295,7 @@ describe.skip('ProjectsController: import operations', function (): void { }); }); -describe.skip('ProjectsController: add database reference operations', function (): void { +describe('ProjectsController: add database reference operations', function (): void { it('Should show error when no reference type is selected', async function (): Promise { testContext.apiWrapper.setup(x => x.showQuickPick(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns(() => Promise.resolve(undefined)); testContext.apiWrapper.setup(x => x.showErrorMessage(TypeMoq.It.isAny())).returns((s) => { throw new Error(s); }); @@ -343,7 +343,7 @@ describe.skip('ProjectsController: add database reference operations', function }); }); -describe.skip('ProjectsController: round trip feature with SSDT', function (): void { +describe('ProjectsController: round trip feature with SSDT', function (): void { it('Should show warning message for SSDT project opened in Azure Data Studio', async function (): Promise { testContext.apiWrapper.setup(x => x.showWarningMessage(TypeMoq.It.isAny(), TypeMoq.It.isAny(), TypeMoq.It.isAny())).returns((s) => { throw new Error(s); }); diff --git a/extensions/sql-database-projects/src/tools/netcoreTool.ts b/extensions/sql-database-projects/src/tools/netcoreTool.ts index efe089aab8..265634b6a1 100644 --- a/extensions/sql-database-projects/src/tools/netcoreTool.ts +++ b/extensions/sql-database-projects/src/tools/netcoreTool.ts @@ -16,7 +16,7 @@ const localize = nls.loadMessageBundle(); export const DBProjectConfigurationKey: string = 'sqlDatabaseProjects'; export const NetCoreInstallLocationKey: string = 'netCoreSDKLocation'; export const NextCoreNonWindowsDefaultPath = '/usr/local/share'; -export const NetCoreInstallationConfirmation: string = localize('sqlDatabaseProjects.NetCoreInstallationConfirmation', "The .NET Core SDK cannnot be located. Project build will not work. Please install the same or update the .Net Core SDK location in settings if already installed."); +export const NetCoreInstallationConfirmation: string = localize('sqlDatabaseProjects.NetCoreInstallationConfirmation', "The .NET Core SDK cannnot be located. Project build will not work. Please install .NET Core SDK version 3.1 or update the .Net Core SDK location in settings if already installed."); export const UpdateNetCoreLocation: string = localize('sqlDatabaseProjects.UpdateNetCoreLocation', "Update .Net Core location"); export const InstallNetCore: string = localize('sqlDatabaseProjects.InstallNetCore', "Install .Net Core SDK");