Skip to content

Commit 5269fe9

Browse files
committed
Merge branch 'main' into dev/russellben/config-jsonc
2 parents 4474f38 + 0759bee commit 5269fe9

50 files changed

Lines changed: 625 additions & 213 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -377,3 +377,6 @@ MigrationBackup/
377377

378378
# MDS "Not Supported" GenAPI code
379379
**/notsupported/*.cs
380+
381+
# C# language server cache
382+
*.lscache

.vscode/mcp.json

Lines changed: 0 additions & 75 deletions
This file was deleted.

Directory.Packages.props

Lines changed: 36 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,33 @@
11
<Project>
2+
3+
<!-- ===================================================================== -->
4+
<!--
5+
Versions.props import strategy:
6+
7+
Each product has a Versions.props that computes its version properties (e.g.
8+
SqlClientPackageVersion). These files can be imported from two places:
9+
10+
1. Here, in Directory.Packages.props (Package mode only) — imports ALL
11+
Versions.props early so that centrally-managed PackageVersion items can
12+
reference the computed version values for sibling package pinning.
13+
14+
2. In each product's own csproj (conditional) — imports the product's own
15+
Versions.props so standalone / Project-mode builds still get versions.
16+
17+
To prevent double-evaluation when both paths fire, every Versions.props sets
18+
an import-guard property (e.g. SqlClientVersionsImported=true) on first load.
19+
The csproj-level import checks that guard and becomes a no-op if the file was
20+
already imported here.
21+
-->
22+
<ImportGroup Condition="'$(ReferenceType)' == 'Package'">
23+
<Import Project="src/Microsoft.Data.SqlClient/Versions.props" />
24+
<Import Project="src/Microsoft.SqlServer.Server/Versions.props" />
25+
<Import Project="src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props" />
26+
<Import Project="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props" />
27+
<Import Project="src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props" />
28+
<Import Project="src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props" />
29+
</ImportGroup>
30+
231
<PropertyGroup>
332
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
433
<!--
@@ -14,33 +43,23 @@
1443
<!-- ===================================================================== -->
1544
<!-- Driver Packages -->
1645

17-
<!-- Ordered from least dependent to most dependent, and then alphabetically. -->
18-
19-
<ItemGroup>
20-
<!--
21-
We never reference this package via its project, so we always need a
22-
version specified.
23-
-->
24-
<PackageVersion Include="Microsoft.SqlServer.Server" Version="1.0.0" />
25-
</ItemGroup>
26-
27-
<!--
28-
We only need other driver package versions specified when building via
29-
package references.
30-
-->
46+
<!-- The driver packages need version numbers when we build via Package references. -->
3147
<ItemGroup Condition="'$(ReferenceType)' == 'Package'">
48+
<PackageVersion
49+
Include="Microsoft.SqlServer.Server"
50+
Version="$(SqlServerPackageVersion)" />
3251
<PackageVersion
3352
Include="Microsoft.Data.SqlClient.Internal.Logging"
3453
Version="$(LoggingPackageVersion)" />
3554
<PackageVersion
3655
Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
3756
Version="$(AbstractionsPackageVersion)" />
38-
<PackageVersion
39-
Include="Microsoft.Data.SqlClient.Extensions.Azure"
40-
Version="$(AzurePackageVersion)" />
4157
<PackageVersion
4258
Include="Microsoft.Data.SqlClient"
4359
Version="$(SqlClientPackageVersion)" />
60+
<PackageVersion
61+
Include="Microsoft.Data.SqlClient.Extensions.Azure"
62+
Version="$(AzurePackageVersion)" />
4463
<PackageVersion
4564
Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider"
4665
Version="$(AkvProviderPackageVersion)" />

0 commit comments

Comments
 (0)