From 142f38484aafbdf16ef1cd6e4e2b2dc88a046e35 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 5 Jan 2026 01:49:05 +0000
Subject: [PATCH 1/5] Initial plan


From 71689d1c57e971efda9fa2a2fab754bdf90b98ea Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 5 Jan 2026 01:59:29 +0000
Subject: [PATCH 2/5] Refactor SQL project detection to prioritize SDK
 attribute

Co-authored-by: JerrettDavis <2610199+JerrettDavis@users.noreply.github.com>
---
 .../database-first-sql-generation/README.md   |  6 ++--
 .../buildTransitive/JD.Efcpt.Build.targets    | 35 +++++++++++++------
 2 files changed, 27 insertions(+), 14 deletions(-)

diff --git a/samples/database-first-sql-generation/README.md b/samples/database-first-sql-generation/README.md
index eda279d..78c9b0d 100644
--- a/samples/database-first-sql-generation/README.md
+++ b/samples/database-first-sql-generation/README.md
@@ -81,10 +81,10 @@ database-first-sql-generation/
 
 ### Automatic Detection
 
-JD.Efcpt.Build uses MSBuild properties to detect SQL projects:
+JD.Efcpt.Build detects SQL projects by checking the project file's SDK attribute:
 
-- **Microsoft.Build.Sql**: Checks for `$(DSP)` property
-- **MSBuild.Sdk.SqlProj**: Checks for `$(SqlServerVersion)` property
+- **SDK-based projects**: Checks if the `Sdk` attribute contains `Microsoft.Build.Sql` or `MSBuild.Sdk.SqlProj`
+- **Legacy SSDT projects**: Falls back to checking MSBuild properties (`$(DSP)` or `$(SqlServerVersion)`)
 
 When detected, it runs SQL generation instead of EF Core generation.
 
diff --git a/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets b/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
index 5c1d5c5..341a430 100644
--- a/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
+++ b/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
@@ -10,20 +10,33 @@
     <!-- Derive UseNullableReferenceTypes from project's Nullable setting for zero-config scenarios -->
     <EfcptConfigUseNullableReferenceTypes Condition="'$(EfcptConfigUseNullableReferenceTypes)'=='' and ('$(Nullable)'=='enable' or '$(Nullable)'=='Enable')">true</EfcptConfigUseNullableReferenceTypes>
     <EfcptConfigUseNullableReferenceTypes Condition="'$(EfcptConfigUseNullableReferenceTypes)'=='' and '$(Nullable)'!=''">false</EfcptConfigUseNullableReferenceTypes>
+  </PropertyGroup>
 
-    <!--
-      SQL Project Detection: Detect if this is a SQL database project (not an EF Core consumer project).
+  <!--
+    SQL Project Detection: Detect if this is a SQL database project (not an EF Core consumer project).
 
-      Detection logic:
-      - Microsoft.Build.Sql SDK: Check for $(SqlServerVersion) or $(DSP) properties
-      - MSBuild.Sdk.SqlProj: Check for $(SqlServerVersion)
+    Detection logic (in priority order):
+    1. Check if project file Sdk attribute references Microsoft.Build.Sql or MSBuild.Sdk.SqlProj
+    2. Fall back to MSBuild properties ($(SqlServerVersion) or $(DSP)) for legacy SSDT projects
 
-      This must be in the targets file (not props) because SDK properties like SqlServerVersion
-      are not available when props files are evaluated.
-    -->
-    <_EfcptIsSqlProject Condition="'$(_EfcptIsSqlProject)'=='' and ('$(SqlServerVersion)' != '' or '$(DSP)' != '')">true</_EfcptIsSqlProject>
-    <_EfcptIsSqlProject Condition="'$(_EfcptIsSqlProject)'==''">false</_EfcptIsSqlProject>
-  </PropertyGroup>
+    This must be in the targets file (not props) because SDK properties like SqlServerVersion
+    are not available when props files are evaluated.
+  -->
+  <Target Name="_EfcptDetectSqlProject" BeforeTargets="BeforeBuild;BeforeRebuild;BeforeClean">
+    <PropertyGroup>
+      <!-- Read the project file content to check SDK attribute -->
+      <_EfcptProjectContent Condition="Exists('$(MSBuildProjectFullPath)')">$([System.IO.File]::ReadAllText('$(MSBuildProjectFullPath)'))</_EfcptProjectContent>
+      
+      <!-- Check if SDK attribute contains supported SQL SDKs -->
+      <_EfcptHasMicrosoftBuildSql Condition="$(_EfcptProjectContent.Contains('Microsoft.Build.Sql'))">true</_EfcptHasMicrosoftBuildSql>
+      <_EfcptHasMSBuildSdkSqlProj Condition="$(_EfcptProjectContent.Contains('MSBuild.Sdk.SqlProj'))">true</_EfcptHasMSBuildSdkSqlProj>
+      
+      <!-- Detect SQL project: SDK-based first, then property-based for legacy -->
+      <_EfcptIsSqlProject Condition="'$(_EfcptIsSqlProject)'=='' and ('$(_EfcptHasMicrosoftBuildSql)' == 'true' or '$(_EfcptHasMSBuildSdkSqlProj)' == 'true')">true</_EfcptIsSqlProject>
+      <_EfcptIsSqlProject Condition="'$(_EfcptIsSqlProject)'=='' and ('$(SqlServerVersion)' != '' or '$(DSP)' != '')">true</_EfcptIsSqlProject>
+      <_EfcptIsSqlProject Condition="'$(_EfcptIsSqlProject)'==''">false</_EfcptIsSqlProject>
+    </PropertyGroup>
+  </Target>
 
   <!--
     Determine the correct task assembly path based on MSBuild runtime and version.

From 088a03ad5da42ec0bb5f57a5c2906276a84d0b58 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 5 Jan 2026 02:03:12 +0000
Subject: [PATCH 3/5] Improve SQL project detection with dedicated MSBuild task

Co-authored-by: JerrettDavis <2610199+JerrettDavis@users.noreply.github.com>
---
 src/JD.Efcpt.Build.Tasks/DetectSqlProject.cs  | 73 +++++++++++++++++++
 .../buildTransitive/JD.Efcpt.Build.targets    | 20 +++--
 2 files changed, 82 insertions(+), 11 deletions(-)
 create mode 100644 src/JD.Efcpt.Build.Tasks/DetectSqlProject.cs

diff --git a/src/JD.Efcpt.Build.Tasks/DetectSqlProject.cs b/src/JD.Efcpt.Build.Tasks/DetectSqlProject.cs
new file mode 100644
index 0000000..cf9caa1
--- /dev/null
+++ b/src/JD.Efcpt.Build.Tasks/DetectSqlProject.cs
@@ -0,0 +1,73 @@
+using Microsoft.Build.Framework;
+using Microsoft.Build.Utilities;
+
+namespace JD.Efcpt.Build.Tasks;
+
+/// <summary>
+/// MSBuild task that detects whether the current project is a SQL database project.
+/// Uses the SqlProjectDetector to check for SDK-based projects first, then falls back to property-based detection.
+/// </summary>
+public sealed class DetectSqlProject : Microsoft.Build.Utilities.Task
+{
+    /// <summary>
+    /// Gets or sets the full path to the project file.
+    /// </summary>
+    [Required]
+    public string? ProjectPath { get; set; }
+
+    /// <summary>
+    /// Gets or sets the SqlServerVersion property (for legacy SSDT detection).
+    /// </summary>
+    public string? SqlServerVersion { get; set; }
+
+    /// <summary>
+    /// Gets or sets the DSP property (for legacy SSDT detection).
+    /// </summary>
+    public string? DSP { get; set; }
+
+    /// <summary>
+    /// Gets a value indicating whether the project is a SQL project.
+    /// </summary>
+    [Output]
+    public bool IsSqlProject { get; private set; }
+
+    /// <summary>
+    /// Executes the task to detect if the project is a SQL database project.
+    /// </summary>
+    /// <returns>True if the task executes successfully; otherwise, false.</returns>
+    public override bool Execute()
+    {
+        if (string.IsNullOrWhiteSpace(ProjectPath))
+        {
+            Log.LogError("ProjectPath is required.");
+            return false;
+        }
+
+        // First, check if project uses a modern SQL SDK via SDK attribute
+        var usesModernSdk = SqlProjectDetector.IsSqlProjectReference(ProjectPath);
+        
+        if (usesModernSdk)
+        {
+            IsSqlProject = true;
+            Log.LogMessage(MessageImportance.Low, 
+                "Detected SQL project via SDK attribute: {0}", ProjectPath);
+            return true;
+        }
+
+        // Fall back to property-based detection for legacy SSDT projects
+        var hasLegacyProperties = !string.IsNullOrEmpty(SqlServerVersion) || !string.IsNullOrEmpty(DSP);
+        
+        if (hasLegacyProperties)
+        {
+            IsSqlProject = true;
+            Log.LogMessage(MessageImportance.Low, 
+                "Detected SQL project via MSBuild properties (legacy SSDT): {0}", ProjectPath);
+            return true;
+        }
+
+        IsSqlProject = false;
+        Log.LogMessage(MessageImportance.Low, 
+            "Not a SQL project: {0}", ProjectPath);
+        return true;
+    }
+}
diff --git a/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets b/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
index 341a430..6045daa 100644
--- a/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
+++ b/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
@@ -22,18 +22,16 @@
     This must be in the targets file (not props) because SDK properties like SqlServerVersion
     are not available when props files are evaluated.
   -->
-  <Target Name="_EfcptDetectSqlProject" BeforeTargets="BeforeBuild;BeforeRebuild;BeforeClean">
+  <Target Name="_EfcptDetectSqlProject" BeforeTargets="BeforeBuild;BeforeRebuild">
+    <DetectSqlProject
+        ProjectPath="$(MSBuildProjectFullPath)"
+        SqlServerVersion="$(SqlServerVersion)"
+        DSP="$(DSP)">
+      <Output TaskParameter="IsSqlProject" PropertyName="_EfcptIsSqlProject" />
+    </DetectSqlProject>
+    
+    <!-- Set default to false if not already set (shouldn't happen but defensive) -->
     <PropertyGroup>
-      <!-- Read the project file content to check SDK attribute -->
-      <_EfcptProjectContent Condition="Exists('$(MSBuildProjectFullPath)')">$([System.IO.File]::ReadAllText('$(MSBuildProjectFullPath)'))</_EfcptProjectContent>
-      
-      <!-- Check if SDK attribute contains supported SQL SDKs -->
-      <_EfcptHasMicrosoftBuildSql Condition="$(_EfcptProjectContent.Contains('Microsoft.Build.Sql'))">true</_EfcptHasMicrosoftBuildSql>
-      <_EfcptHasMSBuildSdkSqlProj Condition="$(_EfcptProjectContent.Contains('MSBuild.Sdk.SqlProj'))">true</_EfcptHasMSBuildSdkSqlProj>
-      
-      <!-- Detect SQL project: SDK-based first, then property-based for legacy -->
-      <_EfcptIsSqlProject Condition="'$(_EfcptIsSqlProject)'=='' and ('$(_EfcptHasMicrosoftBuildSql)' == 'true' or '$(_EfcptHasMSBuildSdkSqlProj)' == 'true')">true</_EfcptIsSqlProject>
-      <_EfcptIsSqlProject Condition="'$(_EfcptIsSqlProject)'=='' and ('$(SqlServerVersion)' != '' or '$(DSP)' != '')">true</_EfcptIsSqlProject>
       <_EfcptIsSqlProject Condition="'$(_EfcptIsSqlProject)'==''">false</_EfcptIsSqlProject>
     </PropertyGroup>
   </Target>

From c1c621fe38e83f2371abf35d941096ecceda619e Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 5 Jan 2026 02:05:02 +0000
Subject: [PATCH 4/5] Register DetectSqlProject task with UsingTask declaration

Co-authored-by: JerrettDavis <2610199+JerrettDavis@users.noreply.github.com>
---
 src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets b/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
index 6045daa..1a92c8b 100644
--- a/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
+++ b/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
@@ -128,6 +128,9 @@
   <UsingTask TaskName="JD.Efcpt.Build.Tasks.AddSqlFileWarnings"
              AssemblyFile="$(_EfcptTaskAssembly)" />
 
+  <UsingTask TaskName="JD.Efcpt.Build.Tasks.DetectSqlProject"
+             AssemblyFile="$(_EfcptTaskAssembly)" />
+
   <!--
     SDK Version Check: Warns users when a newer SDK version is available.
     Opt-in via EfcptCheckForUpdates=true. Results are cached for 24 hours.

From ed2100bd1cb8db9b0ac65ca77483eed58426ed16 Mon Sep 17 00:00:00 2001
From: "copilot-swe-agent[bot]" <198982749+Copilot@users.noreply.github.com>
Date: Mon, 5 Jan 2026 02:10:12 +0000
Subject: [PATCH 5/5] Address code review feedback with clearer comments

Co-authored-by: JerrettDavis <2610199+JerrettDavis@users.noreply.github.com>
---
 src/JD.Efcpt.Build.Tasks/DetectSqlProject.cs              | 1 +
 src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/JD.Efcpt.Build.Tasks/DetectSqlProject.cs b/src/JD.Efcpt.Build.Tasks/DetectSqlProject.cs
index cf9caa1..b8fb150 100644
--- a/src/JD.Efcpt.Build.Tasks/DetectSqlProject.cs
+++ b/src/JD.Efcpt.Build.Tasks/DetectSqlProject.cs
@@ -7,6 +7,7 @@ namespace JD.Efcpt.Build.Tasks;
 /// MSBuild task that detects whether the current project is a SQL database project.
 /// Uses the SqlProjectDetector to check for SDK-based projects first, then falls back to property-based detection.
 /// </summary>
+// Note: Fully qualifying Task to avoid ambiguity with System.Threading.Tasks.Task
 public sealed class DetectSqlProject : Microsoft.Build.Utilities.Task
 {
     /// <summary>
diff --git a/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets b/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
index 1a92c8b..820d12b 100644
--- a/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
+++ b/src/JD.Efcpt.Build/buildTransitive/JD.Efcpt.Build.targets
@@ -30,7 +30,7 @@
       <Output TaskParameter="IsSqlProject" PropertyName="_EfcptIsSqlProject" />
     </DetectSqlProject>
     
-    <!-- Set default to false if not already set (shouldn't happen but defensive) -->
+    <!-- Defensive: ensure the property is always set, even if the task encounters an unexpected scenario -->
     <PropertyGroup>
       <_EfcptIsSqlProject Condition="'$(_EfcptIsSqlProject)'==''">false</_EfcptIsSqlProject>
     </PropertyGroup>