From 17d3489778a8263bdf09178cc9a03e60d3873013 Mon Sep 17 00:00:00 2001 From: Kim Santiago <31145923+kisantia@users.noreply.github.com> Date: Thu, 17 Nov 2022 14:09:03 -0800 Subject: [PATCH] Update Microsoft.Build.Sql version to 0.1.7-preview (#21242) * update the default Microsoft.Build.Sql version used by sql projects * update Microsoft.Build.Sql SDK version * update baselines and template to also use 0.1.7-preview --- extensions/sql-database-projects/package.nls.json | 2 +- .../resources/templates/newSdkSqlProjectTemplate.xml | 2 +- extensions/sql-database-projects/src/common/constants.ts | 2 +- .../newSdkStyleSqlProjectSdkImportAttributeBaseline.xml | 4 ++-- .../test/baselines/newSdkStyleSqlProjectSdkNodeBaseline.xml | 2 +- .../newSdkStyleSqlProjectSdkProjectAttributeBaseline.xml | 2 +- .../src/test/baselines/openSdkStyleSqlProjectBaseline.xml | 2 +- .../openSdkStyleSqlProjectNoProjectGuidBaseline.xml | 2 +- .../openSdkStyleSqlProjectWithBuildRemoveBaseline.xml | 2 +- .../openSdkStyleSqlProjectWithFilesSpecifiedBaseline.xml | 2 +- .../openSdkStyleSqlProjectWithGlobsSpecifiedBaseline.xml | 2 +- extensions/sql-database-projects/src/tools/buildHelper.ts | 5 +++-- 12 files changed, 15 insertions(+), 14 deletions(-) diff --git a/extensions/sql-database-projects/package.nls.json b/extensions/sql-database-projects/package.nls.json index 65e83894d2..7b9289c163 100644 --- a/extensions/sql-database-projects/package.nls.json +++ b/extensions/sql-database-projects/package.nls.json @@ -41,6 +41,6 @@ "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.collapseProjectNodes": "Whether project nodes start collapsed", - "sqlDatabaseProjects.microsoftBuildSqlVersion": "Which version of Microsoft.Build.Sql SDK to use for building legacy sql projects. Example: 0.1.3-preview", + "sqlDatabaseProjects.microsoftBuildSqlVersion": "Which version of Microsoft.Build.Sql SDK to use for building legacy sql projects. Example: 0.1.7-preview", "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/resources/templates/newSdkSqlProjectTemplate.xml b/extensions/sql-database-projects/resources/templates/newSdkSqlProjectTemplate.xml index f61b4bbd93..404b8b62f6 100644 --- a/extensions/sql-database-projects/resources/templates/newSdkSqlProjectTemplate.xml +++ b/extensions/sql-database-projects/resources/templates/newSdkSqlProjectTemplate.xml @@ -1,6 +1,6 @@ - + @@PROJECT_NAME@@ {@@PROJECT_GUID@@} diff --git a/extensions/sql-database-projects/src/common/constants.ts b/extensions/sql-database-projects/src/common/constants.ts index 1cae47832b..c08d8d4694 100644 --- a/extensions/sql-database-projects/src/common/constants.ts +++ b/extensions/sql-database-projects/src/common/constants.ts @@ -23,7 +23,7 @@ export const msdbDacpac = 'msdb.dacpac'; export const MicrosoftDatatoolsSchemaSqlSql = 'Microsoft.Data.Tools.Schema.Sql.Sql'; export const databaseSchemaProvider = 'DatabaseSchemaProvider'; export const sqlProjectSdk = 'Microsoft.Build.Sql'; -export const sqlProjectSdkVersion = '0.1.3-preview'; +export const sqlProjectSdkVersion = '0.1.7-preview'; // Project Provider export const emptySqlDatabaseProjectTypeId = 'EmptySqlDbProj'; diff --git a/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkImportAttributeBaseline.xml b/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkImportAttributeBaseline.xml index ebe3258e46..1c1bfecda3 100644 --- a/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkImportAttributeBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkImportAttributeBaseline.xml @@ -9,6 +9,6 @@ - - + + diff --git a/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkNodeBaseline.xml b/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkNodeBaseline.xml index 87e73c699f..1a7b1d5da3 100644 --- a/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkNodeBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkNodeBaseline.xml @@ -1,6 +1,6 @@ - + TestProjectName {2C283C5D-9E4A-4313-8FF9-4E0CEE20B063} diff --git a/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkProjectAttributeBaseline.xml b/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkProjectAttributeBaseline.xml index 9ef27f0150..0fac6b00bd 100644 --- a/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkProjectAttributeBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkProjectAttributeBaseline.xml @@ -1,5 +1,5 @@ - + TestProjectName {2C283C5D-9E4A-4313-8FF9-4E0CEE20B063} diff --git a/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectBaseline.xml b/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectBaseline.xml index a956694190..135fbb3f4a 100644 --- a/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectBaseline.xml @@ -1,6 +1,6 @@ - + TestProjectName {2C283C5D-9E4A-4313-8FF9-4E0CEE20B063} diff --git a/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectNoProjectGuidBaseline.xml b/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectNoProjectGuidBaseline.xml index b8a50be3d9..5aa7dae678 100644 --- a/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectNoProjectGuidBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectNoProjectGuidBaseline.xml @@ -1,6 +1,6 @@ - + TestProjectName Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider diff --git a/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithBuildRemoveBaseline.xml b/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithBuildRemoveBaseline.xml index e1a7b2dab0..89b608f780 100644 --- a/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithBuildRemoveBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithBuildRemoveBaseline.xml @@ -1,6 +1,6 @@ - + TestProjectName {2C283C5D-9E4A-4313-8FF9-4E0CEE20B063} diff --git a/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithFilesSpecifiedBaseline.xml b/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithFilesSpecifiedBaseline.xml index 835174939d..525b694fa0 100644 --- a/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithFilesSpecifiedBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithFilesSpecifiedBaseline.xml @@ -1,6 +1,6 @@ - + TestProjectName {2C283C5D-9E4A-4313-8FF9-4E0CEE20B063} diff --git a/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithGlobsSpecifiedBaseline.xml b/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithGlobsSpecifiedBaseline.xml index 49086a22e4..5e0438fe0f 100644 --- a/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithGlobsSpecifiedBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithGlobsSpecifiedBaseline.xml @@ -1,6 +1,6 @@ - + TestProjectName {2C283C5D-9E4A-4313-8FF9-4E0CEE20B063} diff --git a/extensions/sql-database-projects/src/tools/buildHelper.ts b/extensions/sql-database-projects/src/tools/buildHelper.ts index 85dd889609..7f4f058a2a 100644 --- a/extensions/sql-database-projects/src/tools/buildHelper.ts +++ b/extensions/sql-database-projects/src/tools/buildHelper.ts @@ -15,7 +15,7 @@ import { DBProjectConfigurationKey } from './netcoreTool'; const buildDirectory = 'BuildDirectory'; const sdkName = 'Microsoft.Build.Sql'; -const microsoftBuildSqlDefaultVersion = '0.1.3-preview'; +const microsoftBuildSqlDefaultVersion = '0.1.7-preview'; const buildFiles: string[] = [ 'Microsoft.Data.SqlClient.dll', @@ -28,7 +28,8 @@ const buildFiles: string[] = [ 'Microsoft.SqlServer.Types.dll', 'System.ComponentModel.Composition.dll', 'System.IO.Packaging.dll', - 'Microsoft.Data.Tools.Schema.SqlTasks.targets' + 'Microsoft.Data.Tools.Schema.SqlTasks.targets', + 'Microsoft.SqlServer.Server' ]; export class BuildHelper {