Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Updating Microsoft.Build.Sql for utilising in Visual Studio #443

Merged
merged 12 commits into from
May 31, 2024
Merged

Updating Microsoft.Build.Sql for utilising in Visual Studio #443

Show file tree
Hide file tree
Changes from 8 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a2172b9
changes for opening sqlproj in VS
Ri7Sh Mar 12, 2024
7d258c2
fixing indentation
Ri7Sh Apr 20, 2024
715e39b
Update Sdk.props to prevent build failures
Ri7Sh Apr 25, 2024
4f52b40
fixing default build configurations
Ri7Sh May 13, 2024
cd45423
Adding available Platforms and Configurations
Ri7Sh May 13, 2024
4ffdc6b
Removing Properties folder as it is not correct way to include the ap…
Ri7Sh May 13, 2024
24c4f2c
Moving Platforms and Configurations to sdk.props
Ri7Sh May 13, 2024
42db6fb
Removing empty line
Ri7Sh May 14, 2024
c9b4743
Merge branch 'main' of https://github.com/microsoft/DacFx into sharma…
Ri7Sh May 17, 2024
7c51e06
Platforms and Configurations updated onlyif not added in sqlproj
Ri7Sh May 17, 2024
10ccf17
Removing CSharpDesignTimeTargets as it's imported in Microsoft.Data.T…
Ri7Sh May 17, 2024
ee3ea75
adding comment
Ri7Sh May 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 16 additions & 5 deletions src/Microsoft.Build.Sql/sdk/Sdk.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,12 +12,17 @@
<TargetFramework Condition="'$(TargetFramework)' == '' AND '$(NetCoreBuild)' == 'true'">netstandard2.1</TargetFramework>
</PropertyGroup>

<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
Ri7Sh marked this conversation as resolved.
Show resolved Hide resolved

<!-- Defaults from SSDT -->
<PropertyGroup>

<Platforms>AnyCPU</Platforms>
<Configurations>Debug;Release</Configurations>

<!-- Required -->
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<PlatformName Condition="'$(PlatformName)' == ''">$(Platform)</PlatformName>
<OutputType>Database</OutputType>

<!-- Optional -->
Expand All @@ -26,10 +31,16 @@
</PropertyGroup>

<PropertyGroup>
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">16.0</VisualStudioVersion>
<!-- Default to the v16.0 targets path if the targets file for the current VS version is not found -->
<VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
<!-- Default to the v17.0 targets path if the targets file for the current VS version is not found -->
<SSDTExists Condition="Exists('$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets')">True</SSDTExists>
<VisualStudioVersion Condition="'$(SSDTExists)' == ''">16.0</VisualStudioVersion>
<VisualStudioVersion Condition="'$(SSDTExists)' == ''">17.0</VisualStudioVersion>
</PropertyGroup>

<!-- building in Visual Studio requires some sort of TargetFrameworkVersion. So we condition to NetCoreBuild as false to avoid failures -->
zijchen marked this conversation as resolved.
Show resolved Hide resolved
<PropertyGroup Condition="'$(NetCoreBuild)'=='false'">
<TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<TargetFrameworkMoniker>.NETFramework,Version=$(TargetFrameworkVersion)</TargetFrameworkMoniker>
</PropertyGroup>

<ItemGroup>
Expand All @@ -38,4 +49,4 @@
<Build Remove="bin/**/*.sql" />
<Build Remove="obj/**/*.sql" />
</ItemGroup>
</Project>
</Project>
56 changes: 28 additions & 28 deletions src/Microsoft.Build.Sql/sdk/Sdk.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,30 +6,28 @@
<Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">

<!-- Default build configurations -->
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<OutputPath>bin\Release\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>False</TreatWarningsAsErrors>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<DefineDebug>false</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PropertyGroup>
<WarningLevel Condition=" '$(WarningLevel)' == '' ">4</WarningLevel>
<TreatWarningsAsErrors Condition=" '$(TreatWarningsAsErrors)' == '' ">false</TreatWarningsAsErrors>
<BuildScriptName Condition=" '$(BuildScriptName)' == '' ">$(MSBuildProjectName).sql</BuildScriptName>
<DefineTrace Condition=" '$(DefineTrace)' == '' ">true</DefineTrace>
<ErrorReport Condition=" '$(ErrorReport)' == '' ">prompt</ErrorReport>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<OutputPath>bin\Debug\</OutputPath>
<BuildScriptName>$(MSBuildProjectName).sql</BuildScriptName>
<TreatWarningsAsErrors>false</TreatWarningsAsErrors>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<DefineDebug>true</DefineDebug>
<DefineTrace>true</DefineTrace>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
<PropertyGroup Condition=" '$(Configuration)' == 'Release' ">
<OutputPath Condition=" '$(OutputPath)' == '' ">bin\Release\</OutputPath>
<DebugType Condition=" '$(DebugType)' == '' ">pdbonly</DebugType>
<Optimize Condition=" '$(Optimize)' == '' ">true</Optimize>
<DefineDebug Condition=" '$(DefineDebug)' == '' ">false</DefineDebug>
<DebugSymbols Condition=" '$(DebugSymbols)' == '' ">false</DebugSymbols>
</PropertyGroup>

<PropertyGroup Condition=" '$(Configuration)' == 'Debug' ">
<OutputPath Condition=" '$(OutputPath)' == '' ">bin\Debug\</OutputPath>
<DebugType Condition=" '$(DebugType)' == '' ">full</DebugType>
<Optimize Condition=" '$(Optimize)' == '' ">false</Optimize>
<DefineDebug Condition=" '$(DefineDebug)' == '' ">true</DefineDebug>
<DebugSymbols Condition=" '$(DebugSymbols)' == '' ">true</DebugSymbols>
</PropertyGroup>

<!-- Pack target properties -->
<PropertyGroup>
<PackageType>$(PackageType);DACPAC</PackageType>
Expand All @@ -39,9 +37,15 @@
<!-- Suppress NU5128 since SQL NuGet Packages have no target framework dependencies -->
<NoWarn>$(NoWarn),NU5128</NoWarn>
</PropertyGroup>

<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />

<PropertyGroup>
<CSharpDesignTimeTargetsPath Condition="'$(CSharpDesignTimeTargetsPath)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.CSharp.DesignTime.targets</CSharpDesignTimeTargetsPath>
</PropertyGroup>

<Import Project="$(CSharpDesignTimeTargetsPath)" Condition="'$(CSharpDesignTimeTargetsPath)' != '' and Exists('$(CSharpDesignTimeTargetsPath)')" />
<Target Name="CoreCompile" />
Ri7Sh marked this conversation as resolved.
Show resolved Hide resolved
<Target Name="CreateManifestResourceNames" />

<Import Condition="'$(NetCoreBuild)' == 'true'" Project="$(MSBuildThisFileDirectory)../tools/netstandard2.1/Microsoft.Data.Tools.Schema.SqlTasks.targets"/>
<Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' != ''" Project="$(SQLDBExtensionsRefPath)\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
<Import Condition="'$(NetCoreBuild)' != 'true' AND '$(SQLDBExtensionsRefPath)' == ''" Project="$(MSBuildExtensionsPath)\Microsoft\VisualStudio\v$(VisualStudioVersion)\SSDT\Microsoft.Data.Tools.Schema.SqlTasks.targets" />
Expand All @@ -62,10 +66,6 @@
<PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" IsImplicitlyDefined="true" />
</ItemGroup>

<ItemGroup>
<Folder Include="Properties" />
</ItemGroup>

<ItemGroup>
<!-- Remove files specified as PreDeploy, PostDeploy, and None scripts from build -->
<Build Remove="@(PreDeploy)" />
Expand Down
Loading