diff --git a/extensions/sql-database-projects/resources/templates/newSqlProjectTemplate.xml b/extensions/sql-database-projects/resources/templates/newSqlProjectTemplate.xml index 0e69c4d9f6..d1e8ed2b3f 100644 --- a/extensions/sql-database-projects/resources/templates/newSqlProjectTemplate.xml +++ b/extensions/sql-database-projects/resources/templates/newSqlProjectTemplate.xml @@ -7,7 +7,7 @@ 2.0 4.1 {@@PROJECT_GUID@@} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database diff --git a/extensions/sql-database-projects/src/test/baselines/SSDTProjectAfterUpdateBaseline.xml b/extensions/sql-database-projects/src/test/baselines/SSDTProjectAfterUpdateBaseline.xml index 0930ef4985..b9d21f990d 100644 --- a/extensions/sql-database-projects/src/test/baselines/SSDTProjectAfterUpdateBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/SSDTProjectAfterUpdateBaseline.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database @@ -77,11 +77,11 @@ - + False master - + False master diff --git a/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaseline.xml b/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaseline.xml index c7bcfd71f7..ef1ae254b9 100644 --- a/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaseline.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database @@ -70,8 +70,8 @@ - - $(DacPacRootPath)\Extensions\Microsoft\SQLDB\Extensions\SqlServer\130\SqlSchemas\master.dacpac + + $(DacPacRootPath)\Extensions\Microsoft\SQLDB\Extensions\SqlServer\150\SqlSchemas\master.dacpac False master diff --git a/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTarget.xml b/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTarget.xml index c03b6dfd1b..ad217bd0d0 100644 --- a/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTarget.xml +++ b/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTarget.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database diff --git a/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTargetAfterUpdate.xml b/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTargetAfterUpdate.xml index c39272fd87..0b9a0d6019 100644 --- a/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTargetAfterUpdate.xml +++ b/extensions/sql-database-projects/src/test/baselines/SSDTProjectBaselineWithCleanTargetAfterUpdate.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database diff --git a/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml b/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml index 039d30f87e..5d0948d137 100644 --- a/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectAfterSystemDbUpdateBaseline.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database @@ -77,19 +77,19 @@ - + False master - + False master - + False msdb - + False msdb diff --git a/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectBaseline.xml b/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectBaseline.xml index b7af463f15..b4ec269301 100644 --- a/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/SSDTUpdatedProjectBaseline.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database @@ -77,16 +77,16 @@ - + False master - - $(DacPacRootPath)\Extensions\Microsoft\SQLDB\Extensions\SqlServer\130\SqlSchemas\msdb.dacpac + + $(DacPacRootPath)\Extensions\Microsoft\SQLDB\Extensions\SqlServer\150\SqlSchemas\msdb.dacpac False msdb - + False master diff --git a/extensions/sql-database-projects/src/test/baselines/newSqlProjectBaseline.xml b/extensions/sql-database-projects/src/test/baselines/newSqlProjectBaseline.xml index 7521477225..4d1184b89e 100644 --- a/extensions/sql-database-projects/src/test/baselines/newSqlProjectBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/newSqlProjectBaseline.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database diff --git a/extensions/sql-database-projects/src/test/baselines/newSqlProjectWithScriptBaseline.xml b/extensions/sql-database-projects/src/test/baselines/newSqlProjectWithScriptBaseline.xml index 5055f37003..936ac85a1e 100644 --- a/extensions/sql-database-projects/src/test/baselines/newSqlProjectWithScriptBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/newSqlProjectWithScriptBaseline.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database diff --git a/extensions/sql-database-projects/src/test/baselines/openSqlProjectBaseline.xml b/extensions/sql-database-projects/src/test/baselines/openSqlProjectBaseline.xml index 5733dab710..149e8d1dd8 100644 --- a/extensions/sql-database-projects/src/test/baselines/openSqlProjectBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/openSqlProjectBaseline.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database @@ -85,11 +85,11 @@ - + False master - + False master diff --git a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithAdditionalSqlCmdVariablesBaseline.xml b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithAdditionalSqlCmdVariablesBaseline.xml index edf5c08e40..28559b2a0c 100644 --- a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithAdditionalSqlCmdVariablesBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithAdditionalSqlCmdVariablesBaseline.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database @@ -89,11 +89,11 @@ - + False master - + False master diff --git a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithPrePostDeploymentError.xml b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithPrePostDeploymentError.xml index 9ad91fe7ff..4fd2441afe 100644 --- a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithPrePostDeploymentError.xml +++ b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithPrePostDeploymentError.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database @@ -85,11 +85,11 @@ - + False master - + False master diff --git a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithProjectReferenceBaseline.xml b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithProjectReferenceBaseline.xml index 82b0dc2f84..9ae8cde495 100644 --- a/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithProjectReferenceBaseline.xml +++ b/extensions/sql-database-projects/src/test/baselines/openSqlProjectWithProjectReferenceBaseline.xml @@ -7,7 +7,7 @@ 2.0 4.1 {BA5EBA11-C0DE-5EA7-ACED-BABB1E70A575} - Microsoft.Data.Tools.Schema.Sql.Sql130DatabaseSchemaProvider + Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider Database @@ -85,11 +85,11 @@ - + False master - + False master diff --git a/extensions/sql-database-projects/src/test/project.test.ts b/extensions/sql-database-projects/src/test/project.test.ts index 81b8231734..20694bece7 100644 --- a/extensions/sql-database-projects/src/test/project.test.ts +++ b/extensions/sql-database-projects/src/test/project.test.ts @@ -141,15 +141,15 @@ describe('Project: sqlproj content operations', function (): void { let uri = project.getSystemDacpacUri(constants.masterDacpac); let ssdtUri = project.getSystemDacpacSsdtUri(constants.masterDacpac); - should.equal(uri.fsPath, Uri.parse(path.join('$(NETCoreTargetsPath)', 'SystemDacpacs', '130', constants.masterDacpac)).fsPath); - should.equal(ssdtUri.fsPath, Uri.parse(path.join('$(DacPacRootPath)', 'Extensions', 'Microsoft', 'SQLDB', 'Extensions', 'SqlServer', '130', 'SqlSchemas', constants.masterDacpac)).fsPath); - - project.changeDSP(TargetPlatform.Sql150.toString()); - uri = project.getSystemDacpacUri(constants.masterDacpac); - ssdtUri = project.getSystemDacpacSsdtUri(constants.masterDacpac); should.equal(uri.fsPath, Uri.parse(path.join('$(NETCoreTargetsPath)', 'SystemDacpacs', '150', constants.masterDacpac)).fsPath); should.equal(ssdtUri.fsPath, Uri.parse(path.join('$(DacPacRootPath)', 'Extensions', 'Microsoft', 'SQLDB', 'Extensions', 'SqlServer', '150', 'SqlSchemas', constants.masterDacpac)).fsPath); + project.changeDSP(TargetPlatform.Sql130.toString()); + uri = project.getSystemDacpacUri(constants.masterDacpac); + ssdtUri = project.getSystemDacpacSsdtUri(constants.masterDacpac); + should.equal(uri.fsPath, Uri.parse(path.join('$(NETCoreTargetsPath)', 'SystemDacpacs', '130', constants.masterDacpac)).fsPath); + should.equal(ssdtUri.fsPath, Uri.parse(path.join('$(DacPacRootPath)', 'Extensions', 'Microsoft', 'SQLDB', 'Extensions', 'SqlServer', '130', 'SqlSchemas', constants.masterDacpac)).fsPath); + project.changeDSP(TargetPlatform.SqlAzureV12.toString()); uri = project.getSystemDacpacUri(constants.masterDacpac); ssdtUri = project.getSystemDacpacSsdtUri(constants.masterDacpac); @@ -163,15 +163,15 @@ describe('Project: sqlproj content operations', function (): void { let uri = project.getSystemDacpacUri(constants.msdbDacpac); let ssdtUri = project.getSystemDacpacSsdtUri(constants.msdbDacpac); - should.equal(uri.fsPath, Uri.parse(path.join('$(NETCoreTargetsPath)', 'SystemDacpacs', '130', constants.msdbDacpac)).fsPath); - should.equal(ssdtUri.fsPath, Uri.parse(path.join('$(DacPacRootPath)', 'Extensions', 'Microsoft', 'SQLDB', 'Extensions', 'SqlServer', '130', 'SqlSchemas', constants.msdbDacpac)).fsPath); - - project.changeDSP(TargetPlatform.Sql150.toString()); - uri = project.getSystemDacpacUri(constants.msdbDacpac); - ssdtUri = project.getSystemDacpacSsdtUri(constants.msdbDacpac); should.equal(uri.fsPath, Uri.parse(path.join('$(NETCoreTargetsPath)', 'SystemDacpacs', '150', constants.msdbDacpac)).fsPath); should.equal(ssdtUri.fsPath, Uri.parse(path.join('$(DacPacRootPath)', 'Extensions', 'Microsoft', 'SQLDB', 'Extensions', 'SqlServer', '150', 'SqlSchemas', constants.msdbDacpac)).fsPath); + project.changeDSP(TargetPlatform.Sql130.toString()); + uri = project.getSystemDacpacUri(constants.msdbDacpac); + ssdtUri = project.getSystemDacpacSsdtUri(constants.msdbDacpac); + should.equal(uri.fsPath, Uri.parse(path.join('$(NETCoreTargetsPath)', 'SystemDacpacs', '130', constants.msdbDacpac)).fsPath); + should.equal(ssdtUri.fsPath, Uri.parse(path.join('$(DacPacRootPath)', 'Extensions', 'Microsoft', 'SQLDB', 'Extensions', 'SqlServer', '130', 'SqlSchemas', constants.msdbDacpac)).fsPath); + project.changeDSP(TargetPlatform.SqlAzureV12.toString()); uri = project.getSystemDacpacUri(constants.msdbDacpac); ssdtUri = project.getSystemDacpacSsdtUri(constants.msdbDacpac);