ckaczor/azuredatastudio
1
0
Fork 0
mirror of https://github.com/ckaczor/azuredatastudio.git synced 2026-01-18 01:25:37 -05:00
Code Issues Packages Projects Releases Wiki Activity

Update Microsoft.Build.Sql version to 0.1.7-preview (#21242)

Browse Source 
* 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
This commit is contained in:
Kim Santiago
2022-11-17 14:09:03 -08:00
committed by GitHub
parent 6e54d3fecf
commit 17d3489778
12 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
extensions/sql-database-projects/src/common/constants.ts
View File

@@ -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';

4
extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkImportAttributeBaseline.xml
View File

@@ -9,6 +9,6 @@
<Target Name="BeforeBuild">
<Delete Files="$(BaseIntermediateOutputPath)\project.assets.json" />
</Target>
<Import Project="Sdk.props" Sdk="Microsoft.Build.Sql" Version="0.1.3-preview" />
<Import Project="Sdk.targets" Sdk="Microsoft.Build.Sql" Version="0.1.3-preview" />
<Import Project="Sdk.props" Sdk="Microsoft.Build.Sql" Version="0.1.7-preview" />
<Import Project="Sdk.targets" Sdk="Microsoft.Build.Sql" Version="0.1.7-preview" />
</Project>

2
extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkNodeBaseline.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="0.1.3-preview" />
<Sdk Name="Microsoft.Build.Sql" Version="0.1.7-preview" />
<PropertyGroup>
<Name>TestProjectName</Name>
<ProjectGuid>{2C283C5D-9E4A-4313-8FF9-4E0CEE20B063}</ProjectGuid>

2
extensions/sql-database-projects/src/test/baselines/newSdkStyleSqlProjectSdkProjectAttributeBaseline.xml
View File

@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build" Sdk="Microsoft.Build.Sql/0.1.3-preview">
<Project DefaultTargets="Build" Sdk="Microsoft.Build.Sql/0.1.7-preview">
<PropertyGroup>
<Name>TestProjectName</Name>
<ProjectGuid>{2C283C5D-9E4A-4313-8FF9-4E0CEE20B063}</ProjectGuid>

2
extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectBaseline.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="0.1.3-preview" />
<Sdk Name="Microsoft.Build.Sql" Version="0.1.7-preview" />
<PropertyGroup>
<Name>TestProjectName</Name>
<ProjectGuid>{2C283C5D-9E4A-4313-8FF9-4E0CEE20B063}</ProjectGuid>

2
extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectNoProjectGuidBaseline.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="0.1.3-preview" />
<Sdk Name="Microsoft.Build.Sql" Version="0.1.7-preview" />
<PropertyGroup>
<Name>TestProjectName</Name>
<DSP>Microsoft.Data.Tools.Schema.Sql.Sql150DatabaseSchemaProvider</DSP>

2
extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithBuildRemoveBaseline.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="0.1.3-preview" />
<Sdk Name="Microsoft.Build.Sql" Version="0.1.7-preview" />
<PropertyGroup>
<Name>TestProjectName</Name>
<ProjectGuid>{2C283C5D-9E4A-4313-8FF9-4E0CEE20B063}</ProjectGuid>

2
extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithFilesSpecifiedBaseline.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="0.1.3-preview" />
<Sdk Name="Microsoft.Build.Sql" Version="0.1.7-preview" />
<PropertyGroup>
<Name>TestProjectName</Name>
<ProjectGuid>{2C283C5D-9E4A-4313-8FF9-4E0CEE20B063}</ProjectGuid>

2
extensions/sql-database-projects/src/test/baselines/openSdkStyleSqlProjectWithGlobsSpecifiedBaseline.xml
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<Project DefaultTargets="Build">
<Sdk Name="Microsoft.Build.Sql" Version="0.1.3-preview" />
<Sdk Name="Microsoft.Build.Sql" Version="0.1.7-preview" />
<PropertyGroup>
<Name>TestProjectName</Name>
<ProjectGuid>{2C283C5D-9E4A-4313-8FF9-4E0CEE20B063}</ProjectGuid>

5
extensions/sql-database-projects/src/tools/buildHelper.ts
View File

@@ -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 {