diff --git a/extensions/sql-database-projects/package.json b/extensions/sql-database-projects/package.json index 933cadfa52..0bcd2e9e6a 100644 --- a/extensions/sql-database-projects/package.json +++ b/extensions/sql-database-projects/package.json @@ -43,7 +43,7 @@ { "title": "%sqlDatabaseProjects.Settings%", "properties": { - "sqlDatabaseProjects.netCoreSDKLocation": { + "sqlDatabaseProjects.netCoreSDK Location": { "type": "string", "description": "%sqlDatabaseProjects.netCoreInstallLocation%" }, diff --git a/extensions/sql-database-projects/package.nls.json b/extensions/sql-database-projects/package.nls.json index f1482deb57..155d0152d4 100644 --- a/extensions/sql-database-projects/package.nls.json +++ b/extensions/sql-database-projects/package.nls.json @@ -35,7 +35,7 @@ "sqlDatabaseProjects.Settings": "Database Projects", "sqlDatabaseProjects.netCoreInstallLocation": "Full path to .NET Core SDK on the machine.", "sqlDatabaseProjects.netCoreDoNotAsk": "Whether to prompt the user to install .NET Core when not detected.", - "sqlDatabaseProjects.netCoreDowngradeDoNotShow": "Whether to prompt the user to set .NET SDK version when a newer unsupported version is detected.", + "sqlDatabaseProjects.netCoreDowngradeDoNotShow": "Whether to prompt the user to install .NET SDK version and add global.json to project when a newer unsupported version is detected.", "sqlDatabaseProjects.nodejsDoNotAsk": "Whether to prompt the user to install Node.js when not detected.", "sqlDatabaseProjects.autorestSqlVersion": "Which version of Autorest.Sql to use from NPM. Latest will be used if not set.", "sqlDatabaseProjects.welcome": "No database projects currently open.\n[New Project](command:sqlDatabaseProjects.new)\n[Open Project](command:sqlDatabaseProjects.open)\n[Create Project From Database](command:sqlDatabaseProjects.importDatabase)", diff --git a/extensions/sql-database-projects/src/controllers/mainController.ts b/extensions/sql-database-projects/src/controllers/mainController.ts index e8aa915db2..d7e7cad19b 100644 --- a/extensions/sql-database-projects/src/controllers/mainController.ts +++ b/extensions/sql-database-projects/src/controllers/mainController.ts @@ -82,9 +82,6 @@ export default class MainController implements vscode.Disposable { IconPathHelper.setExtensionContext(this.extensionContext); await templates.loadTemplates(path.join(this.context.extensionPath, 'resources', 'templates')); - - // ensure .net core is installed - await this.netcoreTool.findOrInstallNetCore(); } public dispose(): void { diff --git a/extensions/sql-database-projects/src/controllers/projectController.ts b/extensions/sql-database-projects/src/controllers/projectController.ts index 896bc1eedb..e8c20c5a17 100644 --- a/extensions/sql-database-projects/src/controllers/projectController.ts +++ b/extensions/sql-database-projects/src/controllers/projectController.ts @@ -252,7 +252,8 @@ export class ProjectsController { const message = utils.getErrorMessage(err); if (err instanceof DotNetError) { - void vscode.window.showErrorMessage(message); + // DotNetErrors already get shown by the netCoreTool so just show this one in the console + console.error(message); } else { void vscode.window.showErrorMessage(constants.projBuildFailed(message)); } diff --git a/extensions/sql-database-projects/src/tools/netcoreTool.ts b/extensions/sql-database-projects/src/tools/netcoreTool.ts index 4c980d0524..2ff905e5cf 100644 --- a/extensions/sql-database-projects/src/tools/netcoreTool.ts +++ b/extensions/sql-database-projects/src/tools/netcoreTool.ts @@ -17,7 +17,7 @@ import { ShellCommandOptions, ShellExecutionHelper } from './shellExecutionHelpe const localize = nls.loadMessageBundle(); export const DBProjectConfigurationKey: string = 'sqlDatabaseProjects'; -export const NetCoreInstallLocationKey: string = 'netCoreSDKLocation'; +export const NetCoreInstallLocationKey: string = 'netCoreSDK Location'; export const NetCoreDoNotAskAgainKey: string = 'netCoreDoNotAsk'; export const NetCoreDowngradeDoNotShowAgainKey: string = 'netCoreDowngradeDoNotShow'; export const NetCoreNonWindowsDefaultPath = '/usr/local/share';