Skip to content

Commit 77e9130

Browse files
paulmedynskipaulmedynski
committed
Fix SqlServer sibling reference handling
1 parent f47f048 commit 77e9130

12 files changed

Lines changed: 109 additions & 51 deletions

File tree

‎Directory.Packages.props‎

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -9,38 +9,29 @@
99
graphs with packages they never asked for.
1010
-->
1111
<CentralPackageTransitivePinningEnabled>false</CentralPackageTransitivePinningEnabled>
12+
1213
</PropertyGroup>
1314

1415
<!-- ===================================================================== -->
1516
<!-- Driver Packages -->
1617

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-
-->
18+
<!-- The driver packages need versions numbers when we build via Package references. -->
3119
<ItemGroup Condition="'$(ReferenceType)' == 'Package'">
20+
<PackageVersion
21+
Include="Microsoft.SqlServer.Server"
22+
Version="$(SqlServerPackageVersion)" />
3223
<PackageVersion
3324
Include="Microsoft.Data.SqlClient.Internal.Logging"
3425
Version="$(LoggingPackageVersion)" />
3526
<PackageVersion
3627
Include="Microsoft.Data.SqlClient.Extensions.Abstractions"
3728
Version="$(AbstractionsPackageVersion)" />
38-
<PackageVersion
39-
Include="Microsoft.Data.SqlClient.Extensions.Azure"
40-
Version="$(AzurePackageVersion)" />
4129
<PackageVersion
4230
Include="Microsoft.Data.SqlClient"
4331
Version="$(SqlClientPackageVersion)" />
32+
<PackageVersion
33+
Include="Microsoft.Data.SqlClient.Extensions.Azure"
34+
Version="$(AzurePackageVersion)" />
4435
<PackageVersion
4536
Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider"
4637
Version="$(AkvProviderPackageVersion)" />

‎build.proj‎

Lines changed: 50 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@
33
<!-- Imports ========================================================= -->
44
<Import Project="src/Directory.Build.props" />
55

6+
<!-- Import each project's Versions.props to apply default version numbers in Package mode. -->
7+
<Import Project="src/Microsoft.SqlServer.Server/Versions.props" />
8+
<Import Project="src/Microsoft.Data.SqlClient.Internal/Logging/src/Versions.props" />
9+
<Import Project="src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Versions.props" />
10+
<Import Project="src/Microsoft.Data.SqlClient/Versions.props" />
11+
<Import Project="src/Microsoft.Data.SqlClient.Extensions/Azure/src/Versions.props" />
12+
<Import Project="src/Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider/src/Versions.props" />
13+
614
<!-- Build Parameters ================================================ -->
715
<!-- @TODO: Add a Help target that lists targets and these descriptions of the parameters -->
816
<PropertyGroup>
@@ -109,7 +117,7 @@
109117
Default value: [blank]
110118
Example: 1.0.1-dev2345
111119
-->
112-
<PackageVersionAbstractions Condition="'$(PackageVersionAbstractions)' == ''" />
120+
<PackageVersionAbstractions Condition="'$(PackageVersionAbstractions)' == ''">$(AbstractionsPackageVersion)</PackageVersionAbstractions>
113121
<PackageVersionAbstractionsArgument Condition="'$(PackageVersionAbstractions)' != ''">
114122
-p:AbstractionsPackageVersion=$(PackageVersionAbstractions)
115123
</PackageVersionAbstractionsArgument>
@@ -125,7 +133,7 @@
125133
Default value: [blank]
126134
Example: 1.0.1-dev2345
127135
-->
128-
<PackageVersionAkvProvider Condition="'$(PackageVersionAkvProvider)' == ''" />
136+
<PackageVersionAkvProvider Condition="'$(PackageVersionAkvProvider)' == ''">$(AkvProviderPackageVersion)</PackageVersionAkvProvider>
129137
<PackageVersionAkvProviderArgument Condition="'$(PackageVersionAkvProvider)' != ''">
130138
-p:AkvProviderPackageVersion=$(PackageVersionAkvProvider)
131139
</PackageVersionAkvProviderArgument>
@@ -141,9 +149,9 @@
141149
Default value: [blank]
142150
Example: 1.0.1-dev2345
143151
-->
144-
<PackageVersionAzure Condition="'$(PackageVersionAzure)' == ''" />
152+
<PackageVersionAzure Condition="'$(PackageVersionAzure)' == ''">$(AzurePackageVersion)</PackageVersionAzure>
145153
<PackageVersionAzureArgument Condition="'$(PackageVersionAzure)' != ''">
146-
-p:AzurePackageVersion=$(PackageVersionAbstractions)
154+
-p:AzurePackageVersion=$(PackageVersionAzure)
147155
</PackageVersionAzureArgument>
148156

149157
<!--
@@ -166,7 +174,7 @@
166174
Default value: [blank]
167175
Example: 1.0.1-dev2345
168176
-->
169-
<PackageVersionLogging Condition="'$(PackageVersionLogging)' == ''" />
177+
<PackageVersionLogging Condition="'$(PackageVersionLogging)' == ''">$(LoggingPackageVersion)</PackageVersionLogging>
170178
<PackageVersionLoggingArgument Condition="'$(PackageVersionLogging)' != ''">
171179
-p:LoggingPackageVersion=$(PackageVersionLogging)
172180
</PackageVersionLoggingArgument>
@@ -190,7 +198,7 @@
190198
Default value: [blank]
191199
Example: 7.0.0-preview4
192200
-->
193-
<PackageVersionSqlClient Condition="'$(PackageVersionSqlClient)' == ''" />
201+
<PackageVersionSqlClient Condition="'$(PackageVersionSqlClient)' == ''">$(SqlClientPackageVersion)</PackageVersionSqlClient>
194202
<PackageVersionSqlClientArgument Condition="'$(PackageVersionSqlClient)' != ''">
195203
-p:SqlClientPackageVersion=$(PackageVersionSqlClient)
196204
</PackageVersionSqlClientArgument>
@@ -204,7 +212,7 @@
204212
Default value: [blank]
205213
Example: 1.0.0-dev2345
206214
-->
207-
<PackageVersionSqlServer Condition="'$(PackageVersionSqlServer)' == ''" />
215+
<PackageVersionSqlServer Condition="'$(PackageVersionSqlServer)' == ''">$(SqlServerPackageVersion)</PackageVersionSqlServer>
208216
<PackageVersionSqlServerArgument Condition="'$(PackageVersionSqlServer)' != ''">
209217
-p:SqlServerPackageVersion=$(PackageVersionSqlServer)
210218
</PackageVersionSqlServerArgument>
@@ -216,8 +224,9 @@
216224
references (eg, Abstractions from SqlClient) will be made as project references. If
217225
set to "Package", package references will be made instead. When running in
218226
package mode, target versions can be specified via PackageVersion* build
219-
parameters. If these are not provided, the central feed version will be used
220-
instead (see Directory.Packages.props). When running in project mode, the
227+
parameters. If these are not provided, defaults are evaluated from each
228+
package's Versions.props and applied via Directory.Packages.props. When
229+
running in project mode, the
221230
dependencies will be built automatically.
222231
223232
Applies to: TestSqlClientFunctional, TestSqlClientManual
@@ -231,7 +240,6 @@
231240
<ReferenceTypeArgument Condition="'$(ReferenceType.ToLower())' == 'package'">
232241
-p:ReferenceType=Package
233242
</ReferenceTypeArgument>
234-
235243
<!--
236244
SigningKeyPath
237245
Applies to: Build*, Pack*
@@ -395,7 +403,10 @@
395403
PlatformNotSupportedException. It generates the source for this using GenAPI which is built as
396404
the first step of this target.
397405
-->
398-
<Target Name="BuildSqlClientNotSupported">
406+
<PropertyGroup>
407+
<BuildSqlClientNotSupportedDependsOn Condition="'$(ReferenceType.ToLower())' == 'package'">PackAbstractions</BuildSqlClientNotSupportedDependsOn>
408+
</PropertyGroup>
409+
<Target Name="BuildSqlClientNotSupported" DependsOnTargets="$(BuildSqlClientNotSupportedDependsOn)">
399410
<PropertyGroup>
400411
<DotnetCommand>
401412
"$(DotnetPath)dotnet" build "$(GenApiProjectPath)"
@@ -429,6 +440,7 @@
429440
$(ReferenceTypeArgument)
430441
$(PackageVersionAbstractionsArgument)
431442
$(PackageVersionLoggingArgument)
443+
$(PackageVersionSqlServerArgument)
432444
</DotnetCommand>
433445
<!-- Convert more than one whitespace character into one space -->
434446
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -439,7 +451,10 @@
439451
</Target>
440452

441453
<!-- BuildSqlClientRef: Builds the ref binaries project for SqlClient, which is OS-agnostic -->
442-
<Target Name="BuildSqlClientRef">
454+
<PropertyGroup>
455+
<BuildSqlClientRefDependsOn Condition="'$(ReferenceType.ToLower())' == 'package'">PackAbstractions</BuildSqlClientRefDependsOn>
456+
</PropertyGroup>
457+
<Target Name="BuildSqlClientRef" DependsOnTargets="$(BuildSqlClientRefDependsOn)">
443458
<PropertyGroup>
444459
<DotnetCommand>
445460
"$(DotnetPath)dotnet" build $(SqlClientRefProjectPath)
@@ -464,7 +479,10 @@
464479
</Target>
465480

466481
<!-- BuildSqlClientUnix: Builds all unix-specific SqlClient binaries -->
467-
<Target Name="BuildSqlClientUnix">
482+
<PropertyGroup>
483+
<BuildSqlClientUnixDependsOn Condition="'$(ReferenceType.ToLower())' == 'package'">PackAbstractions;PackLogging;PackSqlServer</BuildSqlClientUnixDependsOn>
484+
</PropertyGroup>
485+
<Target Name="BuildSqlClientUnix" DependsOnTargets="$(BuildSqlClientUnixDependsOn)">
468486
<PropertyGroup>
469487
<DotnetCommand>
470488
"$(DotnetPath)dotnet" build $(SqlClientProjectPath)
@@ -481,6 +499,7 @@
481499
$(ReferenceTypeArgument)
482500
$(PackageVersionAbstractionsArgument)
483501
$(PackageVersionLoggingArgument)
502+
$(PackageVersionSqlServerArgument)
484503
</DotnetCommand>
485504
<!-- Convert more than one whitespace character into one space -->
486505
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -491,7 +510,10 @@
491510
</Target>
492511

493512
<!-- BuildSqlClientWindows: Builds all windows-specific SqlClient binaries -->
494-
<Target Name="BuildSqlClientWindows">
513+
<PropertyGroup>
514+
<BuildSqlClientWindowsDependsOn Condition="'$(ReferenceType.ToLower())' == 'package'">PackAbstractions;PackLogging;PackSqlServer</BuildSqlClientWindowsDependsOn>
515+
</PropertyGroup>
516+
<Target Name="BuildSqlClientWindows" DependsOnTargets="$(BuildSqlClientWindowsDependsOn)">
495517
<PropertyGroup>
496518
<DotnetCommand>
497519
"$(DotnetPath)dotnet" build $(SqlClientProjectPath)
@@ -508,6 +530,7 @@
508530
$(ReferenceTypeArgument)
509531
$(PackageVersionAbstractionsArgument)
510532
$(PackageVersionLoggingArgument)
533+
$(PackageVersionSqlServerArgument)
511534
</DotnetCommand>
512535
<!-- Convert more than one whitespace character into one space -->
513536
<DotnetCommand>$([System.Text.RegularExpressions.Regex]::Replace($(DotnetCommand), "\s+", " "))</DotnetCommand>
@@ -670,7 +693,10 @@
670693
</PropertyGroup>
671694

672695
<!-- BuildAkvProvider: Builds Microsoft.Data.SqlClient.AlwaysEncrpyted.AzureKeyVaultProvider -->
673-
<Target Name="BuildAkvProvider">
696+
<PropertyGroup>
697+
<BuildAkvProviderDependsOn Condition="'$(ReferenceType.ToLower())' == 'package'">PackSqlClient;PackLogging</BuildAkvProviderDependsOn>
698+
</PropertyGroup>
699+
<Target Name="BuildAkvProvider" DependsOnTargets="$(BuildAkvProviderDependsOn)">
674700
<PropertyGroup>
675701
<DotnetCommand>
676702
"$(DotnetPath)dotnet" build "$(AkvProviderProjectPath)"
@@ -733,7 +759,10 @@
733759
</PropertyGroup>
734760

735761
<!-- BuildAbstractions: Builds Microsoft.Data.SqlClient.Extensions.Abstractions -->
736-
<Target Name="BuildAbstractions">
762+
<PropertyGroup>
763+
<BuildAbstractionsDependsOn Condition="'$(ReferenceType.ToLower())' == 'package'">PackLogging</BuildAbstractionsDependsOn>
764+
</PropertyGroup>
765+
<Target Name="BuildAbstractions" DependsOnTargets="$(BuildAbstractionsDependsOn)">
737766
<PropertyGroup>
738767
<DotnetCommand>
739768
"$(DotnetPath)dotnet" build "$(AbstractionsProjectPath)"
@@ -820,7 +849,10 @@
820849
</PropertyGroup>
821850

822851
<!-- BuildAzure: Builds Microsoft.Data.SqlClient.Extensions.Azure -->
823-
<Target Name="BuildAzure">
852+
<PropertyGroup>
853+
<BuildAzureDependsOn Condition="'$(ReferenceType.ToLower())' == 'package'">PackAbstractions;PackLogging</BuildAzureDependsOn>
854+
</PropertyGroup>
855+
<Target Name="BuildAzure" DependsOnTargets="$(BuildAzureDependsOn)">
824856
<PropertyGroup>
825857
<DotnetCommand>
826858
"$(DotnetPath)dotnet" build "$(AzureProjectPath)"
@@ -983,6 +1015,7 @@
9831015
<DotnetCommand>
9841016
"$(DotnetPath)dotnet" pack $(SqlServerProjectPath)
9851017
-p:Configuration=$(Configuration)
1018+
-p:PackageOutputPath="$(PackagesDir)"
9861019
$(PackBuildArgument)
9871020
$(SigningKeyPathArgument)
9881021

‎doc/samples/Microsoft.Data.SqlClient.Samples.csproj‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,14 +14,20 @@
1414
<PackageReference Include="Azure.Identity" />
1515
<PackageReference Include="Azure.Core" />
1616
<PackageReference Include="Microsoft.Identity.Client" />
17-
<PackageReference Include="Microsoft.SqlServer.Server" />
1817
<PackageReference Include="Microsoft.Data.SqlClient" />
1918
<PackageReference Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" />
2019
<PackageReference Include="Microsoft.Data.SqlClient.Extensions.Azure" />
2120
<PackageReference Include="Newtonsoft.Json" />
2221
<PackageReference Include="System.Configuration.ConfigurationManager" />
2322
</ItemGroup>
2423

24+
<ItemGroup>
25+
<ProjectReference Include="../../src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
26+
Condition="'$(ReferenceType)' != 'Package'" />
27+
<PackageReference Include="Microsoft.SqlServer.Server"
28+
Condition="'$(ReferenceType)' == 'Package'" />
29+
</ItemGroup>
30+
2531
<!-- .NET Framework references -->
2632
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
2733
<PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />

‎src/Microsoft.Data.SqlClient.Extensions/Abstractions/src/Abstractions.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,9 @@
7171
<!-- Reference to Logging -->
7272
<ItemGroup>
7373
<ProjectReference Include="$(RepoRoot)/src/Microsoft.Data.SqlClient.Internal/Logging/src/Logging.csproj"
74-
Condition="'$(ReferenceType)' != 'Package' "/>
74+
Condition="'$(ReferenceType)' != 'Package' " />
7575
<PackageReference Include="Microsoft.Data.SqlClient.Internal.Logging"
76-
Condition="'$(ReferenceType)' == 'Package' "/>
76+
Condition="'$(ReferenceType)' == 'Package' " />
7777
</ItemGroup>
7878

7979
<!-- CodeGen Targets ================================================= -->

‎src/Microsoft.Data.SqlClient/notsupported/Microsoft.Data.SqlClient.csproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,11 @@
123123
Condition="'$(ReferenceType)' == 'Package'" />
124124
</ItemGroup>
125125

126+
<ItemGroup>
127+
<ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
128+
Condition="'$(ReferenceType)' != 'Package'" />
129+
</ItemGroup>
130+
126131
<!-- References to external packages that the API refers to -->
127132
<!-- References for netframework -->
128133
<ItemGroup Condition="'$(TargetFramework)' == 'net462'">
@@ -158,7 +163,7 @@
158163
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
159164
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
160165
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
161-
<PackageReference Include="Microsoft.SqlServer.Server" />
166+
<PackageReference Include="Microsoft.SqlServer.Server" Condition="'$(ReferenceType)' == 'Package'" />
162167
<PackageReference Include="System.Configuration.ConfigurationManager" />
163168
<PackageReference Include="System.Security.Cryptography.Pkcs" />
164169
<PackageReference Include="System.Text.Json" />
@@ -172,7 +177,7 @@
172177
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
173178
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
174179
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
175-
<PackageReference Include="Microsoft.SqlServer.Server" />
180+
<PackageReference Include="Microsoft.SqlServer.Server" Condition="'$(ReferenceType)' == 'Package'" />
176181
<PackageReference Include="System.Configuration.ConfigurationManager" />
177182
<PackageReference Include="System.Security.Cryptography.Pkcs" />
178183
</ItemGroup>

‎src/Microsoft.Data.SqlClient/ref/Microsoft.Data.SqlClient.csproj‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,7 +114,6 @@
114114
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
115115
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
116116
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
117-
<PackageReference Include="Microsoft.SqlServer.Server" />
118117
<PackageReference Include="System.Configuration.ConfigurationManager" />
119118
<PackageReference Include="System.Security.Cryptography.Pkcs" />
120119
</ItemGroup>
@@ -126,7 +125,6 @@
126125
<PackageReference Include="Microsoft.Extensions.Caching.Memory" />
127126
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" />
128127
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" />
129-
<PackageReference Include="Microsoft.SqlServer.Server" />
130128
<PackageReference Include="System.Configuration.ConfigurationManager" />
131129
<PackageReference Include="System.Security.Cryptography.Pkcs" />
132130
<PackageReference Include="System.Text.Json" />

‎src/Microsoft.Data.SqlClient/tests/ManualTests/Microsoft.Data.SqlClient.ManualTests.csproj‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -333,6 +333,13 @@
333333

334334
<!-- References ====================================================== -->
335335
<!-- Test target references -->
336+
<ItemGroup>
337+
<ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
338+
Condition="'$(ReferenceType)' != 'Package'" />
339+
<PackageReference Include="Microsoft.SqlServer.Server"
340+
Condition="'$(ReferenceType)' == 'Package'" />
341+
</ItemGroup>
342+
336343
<ItemGroup>
337344
<!-- If the tests are compiled/running in "Package" mode, the reference to MDS will be to the -->
338345
<!-- nuget package. This enables ensuring the tests run successfully against a fully-packaged -->
@@ -378,7 +385,6 @@
378385
<ProjectReference Include="SQL/UdtTest/UDTs/Circle/Circle.csproj" />
379386
<ProjectReference Include="SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
380387
<ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
381-
<PackageReference Include="Microsoft.SqlServer.Server" />
382388
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
383389
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
384390
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />
@@ -411,7 +417,6 @@
411417
<ProjectReference Include="SQL/UdtTest/UDTs/Circle/Circle.csproj" />
412418
<ProjectReference Include="SQL/UdtTest/UDTs/Shapes/Shapes.csproj" />
413419
<ProjectReference Include="SQL/UdtTest/UDTs/Utf8String/Utf8String.csproj" />
414-
<PackageReference Include="Microsoft.SqlServer.Server" />
415420
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/Common/Microsoft.Data.SqlClient.TestCommon.csproj" />
416421
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/CustomConfigurableRetryLogic/CustomRetryLogicProvider.csproj" />
417422
<ProjectReference Include="$(RepoRoot)src/Microsoft.Data.SqlClient/tests/tools/Microsoft.Data.SqlClient.TestUtilities/Microsoft.Data.SqlClient.TestUtilities.csproj" />

‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Address/Address.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<RootNamespace>Address</RootNamespace>
44
<AssemblyName>Address</AssemblyName>
@@ -16,6 +16,9 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.SqlServer.Server" />
19+
<ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
20+
Condition="'$(ReferenceType)' != 'Package'" />
21+
<PackageReference Include="Microsoft.SqlServer.Server"
22+
Condition="'$(ReferenceType)' == 'Package'" />
2023
</ItemGroup>
2124
</Project>

‎src/Microsoft.Data.SqlClient/tests/ManualTests/SQL/UdtTest/UDTs/Circle/Circle.csproj‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22
<PropertyGroup>
33
<RootNamespace>Circle</RootNamespace>
44
<AssemblyName>Circle</AssemblyName>
@@ -16,6 +16,9 @@
1616
</PropertyGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.SqlServer.Server" />
19+
<ProjectReference Include="$(RepoRoot)src/Microsoft.SqlServer.Server/Microsoft.SqlServer.Server.csproj"
20+
Condition="'$(ReferenceType)' != 'Package'" />
21+
<PackageReference Include="Microsoft.SqlServer.Server"
22+
Condition="'$(ReferenceType)' == 'Package'" />
2023
</ItemGroup>
2124
</Project>

0 commit comments

Comments
 (0)