From a2172b9e48d607799e8dbaab73db7f466ececfc0 Mon Sep 17 00:00:00 2001
From: Rigvita Sharma <sharmari@microsoft.com>
Date: Tue, 12 Mar 2024 10:10:55 +0530
Subject: [PATCH 01/11] changes for opening sqlproj in VS

---
 src/Microsoft.Build.Sql/sdk/Sdk.props   |  6 ++++--
 src/Microsoft.Build.Sql/sdk/Sdk.targets | 11 +++++++++--
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.props b/src/Microsoft.Build.Sql/sdk/Sdk.props
index 3f97ad0..caca0da 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.props
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.props
@@ -12,6 +12,8 @@
     <TargetFramework Condition="'$(TargetFramework)' == '' AND '$(NetCoreBuild)' == 'true'">netstandard2.1</TargetFramework>
   </PropertyGroup>
 
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  
   <!-- Defaults from SSDT -->
   <PropertyGroup>
 
@@ -26,10 +28,10 @@
   </PropertyGroup>
 
   <PropertyGroup>
-    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">16.0</VisualStudioVersion>
+    <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
     <!-- Default to the v16.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>
   
   <ItemGroup>
diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets
index c000b78..5d98ad6 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.targets
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets
@@ -39,9 +39,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" />
+	<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" />
@@ -66,6 +72,7 @@
     <Folder Include="Properties" />
   </ItemGroup>
   
+  
   <ItemGroup>
     <!-- Remove files specified as PreDeploy, PostDeploy, and None scripts from build -->
     <Build Remove="@(PreDeploy)" />

From 7d258c295d66dc152eab90cbfb648ff57ce6139e Mon Sep 17 00:00:00 2001
From: Rigvita Sharma <sharmari@microsoft.com>
Date: Sat, 20 Apr 2024 15:34:27 +0530
Subject: [PATCH 02/11] fixing indentation

---
 src/Microsoft.Build.Sql/sdk/Sdk.targets | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets
index 5d98ad6..04e69b6 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.targets
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets
@@ -41,12 +41,12 @@
   </PropertyGroup>
   
   <PropertyGroup>
-		<CSharpDesignTimeTargetsPath Condition="'$(CSharpDesignTimeTargetsPath)'==''">$(MSBuildExtensionsPath)\Microsoft\VisualStudio\Managed\Microsoft.CSharp.DesignTime.targets</CSharpDesignTimeTargetsPath>
-	</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" />
-	<Target Name="CreateManifestResourceNames" />
+  <Import Project="$(CSharpDesignTimeTargetsPath)" Condition="'$(CSharpDesignTimeTargetsPath)' != '' and Exists('$(CSharpDesignTimeTargetsPath)')" />
+  <Target Name="CoreCompile" />
+  <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" />

From 715e39bac1e887b10f9be76b1bcb1fa1f8755606 Mon Sep 17 00:00:00 2001
From: Rigvita Sharma <sharmari@microsoft.com>
Date: Thu, 25 Apr 2024 15:26:06 +0530
Subject: [PATCH 03/11] Update Sdk.props to prevent build failures

Build tries to look for .netframeworkversion v4.0 which causes build failures. Setting TargetFrameworkVersion as 4.7.2 to prevent failures.
---
 src/Microsoft.Build.Sql/sdk/Sdk.props | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.props b/src/Microsoft.Build.Sql/sdk/Sdk.props
index caca0da..57453e0 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.props
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.props
@@ -29,10 +29,16 @@
 
   <PropertyGroup>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">17.0</VisualStudioVersion>
-    <!-- Default to the v16.0 targets path if the targets file for the current VS version is not found -->
+    <!-- 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)' == ''">17.0</VisualStudioVersion>
   </PropertyGroup>
+
+  <!-- building in Visual Studio requires some sort of TargetFrameworkVersion. So we condition to NetCoreBuild as false to avoid failures -->
+  <PropertyGroup Condition="'$(NetCoreBuild)'=='false'">
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkMoniker>.NETFramework,Version=$(TargetFrameworkVersion)</TargetFrameworkMoniker>
+  </PropertyGroup>
   
   <ItemGroup>
     <!-- Build default globbing pattern includes all sql files in all subfolders, excluding bin and obj -->
@@ -40,4 +46,4 @@
     <Build Remove="bin/**/*.sql" />
     <Build Remove="obj/**/*.sql" />
   </ItemGroup>
-</Project>
\ No newline at end of file
+</Project>

From 4f52b40bc1e1514832b6d0b979fb0f56f38dae7f Mon Sep 17 00:00:00 2001
From: Rigvita Sharma <sharmari@microsoft.com>
Date: Mon, 13 May 2024 16:23:04 +0530
Subject: [PATCH 04/11] fixing default build configurations

---
 src/Microsoft.Build.Sql/sdk/Sdk.targets | 42 ++++++++++++-------------
 1 file changed, 20 insertions(+), 22 deletions(-)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets
index 04e69b6..89f2062 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.targets
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets
@@ -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>

From cd4542349eed939696715f3b919a644d67e832bf Mon Sep 17 00:00:00 2001
From: Rigvita Sharma <sharmari@microsoft.com>
Date: Mon, 13 May 2024 16:24:20 +0530
Subject: [PATCH 05/11] Adding available Platforms and Configurations

---
 src/Microsoft.Build.Sql/sdk/Sdk.targets | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets
index 89f2062..5af8db9 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.targets
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets
@@ -7,6 +7,8 @@
 
   <!-- Default build configurations -->
   <PropertyGroup>
+    <Platforms>AnyCPU</Platforms>
+    <Configurations>Debug;Release</Configurations>
     <WarningLevel Condition=" '$(WarningLevel)' == '' ">4</WarningLevel>
     <TreatWarningsAsErrors Condition=" '$(TreatWarningsAsErrors)' == '' ">false</TreatWarningsAsErrors>
     <BuildScriptName Condition=" '$(BuildScriptName)' == '' ">$(MSBuildProjectName).sql</BuildScriptName>

From 4ffdc6b9fd3805e64d4f25eb960fb6f1ee0204fd Mon Sep 17 00:00:00 2001
From: Rigvita Sharma <sharmari@microsoft.com>
Date: Mon, 13 May 2024 20:21:20 +0530
Subject: [PATCH 06/11] Removing Properties folder as it is not correct way to
 include the appdesigner

---
 src/Microsoft.Build.Sql/sdk/Sdk.targets | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets
index 5af8db9..aa84603 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.targets
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets
@@ -68,10 +68,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 -->

From 24c4f2c35f45ec284373a1b326dd17065332e92e Mon Sep 17 00:00:00 2001
From: Rigvita Sharma <sharmari@microsoft.com>
Date: Mon, 13 May 2024 20:28:32 +0530
Subject: [PATCH 07/11] Moving Platforms and Configurations to sdk.props

---
 src/Microsoft.Build.Sql/sdk/Sdk.props   | 5 ++++-
 src/Microsoft.Build.Sql/sdk/Sdk.targets | 2 --
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.props b/src/Microsoft.Build.Sql/sdk/Sdk.props
index 57453e0..3e999f9 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.props
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.props
@@ -16,10 +16,13 @@
   
   <!-- 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 -->
diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets
index aa84603..068aaba 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.targets
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets
@@ -7,8 +7,6 @@
 
   <!-- Default build configurations -->
   <PropertyGroup>
-    <Platforms>AnyCPU</Platforms>
-    <Configurations>Debug;Release</Configurations>
     <WarningLevel Condition=" '$(WarningLevel)' == '' ">4</WarningLevel>
     <TreatWarningsAsErrors Condition=" '$(TreatWarningsAsErrors)' == '' ">false</TreatWarningsAsErrors>
     <BuildScriptName Condition=" '$(BuildScriptName)' == '' ">$(MSBuildProjectName).sql</BuildScriptName>

From 42db6fb0deab1942899fe119d63285e88706e1ec Mon Sep 17 00:00:00 2001
From: Rigvita Sharma <sharmari@microsoft.com>
Date: Tue, 14 May 2024 13:59:15 +0530
Subject: [PATCH 08/11] Removing empty line

---
 src/Microsoft.Build.Sql/sdk/Sdk.targets | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets
index 068aaba..10fb171 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.targets
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets
@@ -66,7 +66,6 @@
     <PackageReference Condition="'$(NetCoreBuild)' == 'true'" Include="Microsoft.NETFramework.ReferenceAssemblies" Version="1.0.0" PrivateAssets="All" IsImplicitlyDefined="true" />
   </ItemGroup>
 
-  
   <ItemGroup>
     <!-- Remove files specified as PreDeploy, PostDeploy, and None scripts from build -->
     <Build Remove="@(PreDeploy)" />

From 7c51e06702e63845cb5363c93b5db684491227d5 Mon Sep 17 00:00:00 2001
From: Rigvita Sharma <sharmari@microsoft.com>
Date: Fri, 17 May 2024 14:34:43 +0530
Subject: [PATCH 09/11] Platforms and Configurations updated onlyif not added
 in sqlproj

---
 src/Microsoft.Build.Sql/sdk/Sdk.props | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.props b/src/Microsoft.Build.Sql/sdk/Sdk.props
index 3e999f9..c34bd5d 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.props
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.props
@@ -16,10 +16,9 @@
   
   <!-- Defaults from SSDT -->
   <PropertyGroup>
-    <Platforms>AnyCPU</Platforms>
-    <Configurations>Debug;Release</Configurations>
-  
     <!-- Required -->
+    <Platforms Condition=" '$(Platforms)' == '' ">AnyCPU</Platforms>
+    <Configurations Condition=" '$(Configurations)' == '' ">Debug;Release</Configurations>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
     <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
     <PlatformName Condition="'$(PlatformName)' == ''">$(Platform)</PlatformName>

From 10ccf175a91a35dcca4b3f5d1cdd6953d6d8c462 Mon Sep 17 00:00:00 2001
From: Rigvita Sharma <sharmari@microsoft.com>
Date: Fri, 17 May 2024 14:52:18 +0530
Subject: [PATCH 10/11] Removing CSharpDesignTimeTargets as it's imported in
 Microsoft.Data.Tools.Schema.SqlTasks.targets

---
 src/Microsoft.Build.Sql/sdk/Sdk.targets | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets
index 10fb171..9d7cd4e 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.targets
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets
@@ -38,11 +38,6 @@
     <NoWarn>$(NoWarn),NU5128</NoWarn>
   </PropertyGroup>
   
-  <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" />
   <Target Name="CreateManifestResourceNames" />
 

From ee3ea757afdc1a56ccc59eaeeb63adc2acb5ab3e Mon Sep 17 00:00:00 2001
From: Rigvita Sharma <sharmari@microsoft.com>
Date: Fri, 17 May 2024 15:07:33 +0530
Subject: [PATCH 11/11] adding comment

---
 src/Microsoft.Build.Sql/sdk/Sdk.props   | 14 +++++++-------
 src/Microsoft.Build.Sql/sdk/Sdk.targets |  8 ++++++--
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.props b/src/Microsoft.Build.Sql/sdk/Sdk.props
index c34bd5d..b9e04f5 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.props
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.props
@@ -5,6 +5,8 @@
 -->
 <Project xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
 
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+
   <PropertyGroup>
     <NetCoreBuild Condition="'$(NetCoreBuild)' == '' And '$(MSBuildRuntimeType)' == 'Core'">true</NetCoreBuild>
     <NetCoreBuild Condition="'$(NetCoreBuild)' == '' And '$(MSBuildRuntimeType)' == 'Full'">false</NetCoreBuild>
@@ -12,7 +14,11 @@
     <TargetFramework Condition="'$(TargetFramework)' == '' AND '$(NetCoreBuild)' == 'true'">netstandard2.1</TargetFramework>
   </PropertyGroup>
 
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <!-- building in Visual Studio requires some sort of TargetFrameworkVersion. So we condition to NetCoreBuild as false to avoid failures -->
+  <PropertyGroup Condition="'$(NetCoreBuild)'=='false'">
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <TargetFrameworkMoniker>.NETFramework,Version=$(TargetFrameworkVersion)</TargetFrameworkMoniker>
+  </PropertyGroup>
   
   <!-- Defaults from SSDT -->
   <PropertyGroup>
@@ -36,12 +42,6 @@
     <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 -->
-  <PropertyGroup Condition="'$(NetCoreBuild)'=='false'">
-    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
-    <TargetFrameworkMoniker>.NETFramework,Version=$(TargetFrameworkVersion)</TargetFrameworkMoniker>
-  </PropertyGroup>
-  
   <ItemGroup>
     <!-- Build default globbing pattern includes all sql files in all subfolders, excluding bin and obj -->
     <Build Include="**/*.sql" />
diff --git a/src/Microsoft.Build.Sql/sdk/Sdk.targets b/src/Microsoft.Build.Sql/sdk/Sdk.targets
index 9d7cd4e..432794d 100644
--- a/src/Microsoft.Build.Sql/sdk/Sdk.targets
+++ b/src/Microsoft.Build.Sql/sdk/Sdk.targets
@@ -37,9 +37,13 @@
     <!-- Suppress NU5128 since SQL NuGet Packages have no target framework dependencies -->
     <NoWarn>$(NoWarn),NU5128</NoWarn>
   </PropertyGroup>
-  
-  <Target Name="CoreCompile" />
+
   <Target Name="CreateManifestResourceNames" />
+  <!-- CoreCompile is a target inside target Build on Microsoft.Common.targets that is not implemented there but allows us to personalize our compile/build flow, while
+    executing all the other targets inside Build regularly. We implement it before importing Common.targets because it's not implemented there, so it will not be
+    overriden when importing the targets.
+    -->
+  <Target Name="CoreCompile" />
 
   <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" />