Merge branch 'main' into tests/flaky-tests

Author: edwardneal

.github/workflows/issue-triage.lock.yml

@@ -19,8 +19,6 @@ safe-outputs:
   add-comment:
     max: 1
     hide-older-comments: true
-  add-labels:
-    max: 5
 ---
 
 # SqlClient Issue Auto-Triage
@@ -29,10 +27,10 @@ You are a triage specialist for **Microsoft.Data.SqlClient**.
 A new issue has just been opened. Your job is to:
 
 1. Read the issue silently using GitHub read tools
-2. Apply labels silently using `add_labels`
-3. Post **one** triage summary comment using `add_comment`
+2. Post **one** triage summary comment using `add_comment`
 
 That is the entire workflow. Do NOT call `add_comment` more than once.
+Do NOT call `add_labels`. Do NOT apply any labels.
 Do NOT post intermediate findings. Do NOT post separate comments for
 area detection, duplicate checking, or environment validation.
 Everything goes into the single triage summary at the end.
@@ -90,19 +88,9 @@ Proceed with all remaining triage steps regardless of missing environment detail
 
 ---
 
-## Actions (execute in this order)
+## Actions
 
-**First**: Call `add_labels` with at most 5 labels total (safe-outputs limit):
-- `Triage Needed :new:` (always)
-- Exactly **one** `Area\*` label from the table above (pick the single best match)
-- `Needs More Info :information_source:` if critical environment details are missing (bugs only)
-- `Repro Available :heavy_check_mark:` if repro steps are provided
-- `Regression :boom:` if this appears to be a regression
-
-If the issue spans multiple areas, pick the primary area as the label and mention
-other relevant areas in the triage summary comment instead.
-
-**Then**: Call `add_comment` exactly **once** with this markdown:
+Call `add_comment` exactly **once** with this markdown:
 
 ```
 ## 🔍 Triage Summary
@@ -111,7 +99,7 @@ other relevant areas in the triage summary comment instead.
 |-------|--------|
 | Issue type | <Bug / Feature / Question / Task> |
 | Environment | <All required environment details provided for investigation / ⚠️ Missing: list specific fields> |
-| Area | <Area label applied or "no match"> |
+| Area | <Best matching area from classification table> |
 | Duplicates | <None found / Potentially related: #NNN, #NNN> |
 | Regression | <Not indicated / Likely regression from vX.Y.Z / Inconclusive> |
 

.github/workflows/issue-triage.md

@@ -376,3 +376,6 @@ MigrationBackup/
 
 # MDS "Not Supported" GenAPI code
 **/notsupported/*.cs
+
+# C# language server cache
+*.lscache

.gitignore

@@ -1,4 +1,33 @@
 <Project>
+
+  <!-- ===================================================================== -->
+  <!--
+    Versions.props import strategy:
+
+    Each product has a Versions.props that computes its version properties (e.g.
+    SqlClientPackageVersion).  These files can be imported from two places:
+
+      1. Here, in Directory.Packages.props (Package mode only) — imports ALL
+         Versions.props early so that centrally-managed PackageVersion items can
+         reference the computed version values for sibling package pinning.
+
+      2. In each product's own csproj (conditional) — imports the product's own
+         Versions.props so standalone / Project-mode builds still get versions.
+
+    To prevent double-evaluation when both paths fire, every Versions.props sets
+    an import-guard property (e.g. SqlClientVersionsImported=true) on first load.
+    The csproj-level import checks that guard and becomes a no-op if the file was
+    already imported here.
+  -->
+  <ImportGroup Condition="'$(ReferenceType)' == 'Package'">
+    <Import Project="src/Microsoft.Data.SqlClient/Versions.props" />
+    <Import Project="src/Microsoft.SqlServer.Server/Versions.props" />
+    <Import Project="src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props" />
+    <Import Project="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props" />
+    <Import Project="src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props" />
+    <Import Project="src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props" />
+  </ImportGroup>
+
   <PropertyGroup>
     <ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
     <!--
@@ -14,33 +43,23 @@
   <!-- ===================================================================== -->
   <!-- Driver Packages -->
 
-  <!-- Ordered from least dependent to most dependent, and then alphabetically. -->
-
-  <ItemGroup>
-    <!--
-      We never reference this package via its project, so we always need a
-      version specified.
-    -->
-    <PackageVersion Include="Microsoft.SqlServer.Server" Version="1.0.0" />
-  </ItemGroup>
-
-  <!--
-    We only need other driver package versions specified when building via
-    package references.
-  -->
+  <!-- The driver packages need version numbers when we build via Package references. -->
   <ItemGroup Condition="'$(ReferenceType)' == 'Package'">
+    <PackageVersion
+      Include="Microsoft.SqlServer.Server"
+      Version="$(SqlServerPackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Internal.Logging"
       Version="$(LoggingPackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
       Version="$(AbstractionsPackageVersion)" />
-    <PackageVersion
-      Include="Microsoft.Data.SqlClient.Extensions.Azure"
-      Version="$(AzurePackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient"
       Version="$(SqlClientPackageVersion)" />
+    <PackageVersion
+      Include="Microsoft.Data.SqlClient.Extensions.Azure"
+      Version="$(AzurePackageVersion)" />
     <PackageVersion
       Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider"
       Version="$(AkvProviderPackageVersion)" />