Skip to content

Commit 2fc320b

Browse files
authored
Synced ref project references with runtime projects (#2878)
This should enable ResolveAssemblyReferences to generate the correct binding redirects.
1 parent 68c4e41 commit 2fc320b

File tree

3 files changed

+24
-3
lines changed

3 files changed

+24
-3
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,12 @@
2727
<Compile Include="..\..\ref\Microsoft.Data.SqlClient.Batch.NetCoreApp.cs" />
2828
</ItemGroup>
2929
<ItemGroup>
30+
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)" />
31+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
32+
<PackageReference Include="Microsoft.SqlServer.Server" Version="$(MicrosoftSqlServerServerVersion)" />
3033
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
34+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
35+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
36+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
3137
</ItemGroup>
3238
</Project>

src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -839,9 +839,6 @@
839839
</ItemGroup>
840840

841841
<!-- Package References Etc -->
842-
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
843-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
844-
</ItemGroup>
845842
<ItemGroup>
846843
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)" />
847844
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
@@ -851,6 +848,7 @@
851848
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
852849
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
853850
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
851+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
854852
</ItemGroup>
855853
<Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
856854
<Import Project="$(ToolsDir)targets\ResolveContract.targets" Condition="'$(OSGroup)' == 'AnyOS'" />

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

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,11 +21,28 @@
2121
<Compile Include="Microsoft.Data.SqlClient.cs" />
2222
</ItemGroup>
2323
<ItemGroup>
24+
<Reference Include="System" />
25+
<Reference Include="System.Configuration" />
26+
<Reference Include="System.Runtime.Serialization" />
27+
<Reference Include="System.Security" />
28+
<Reference Include="System.Data" />
29+
<Reference Include="System.Xml" />
30+
<Reference Include="System.Runtime.Caching" />
2431
<Reference Include="System.EnterpriseServices" />
2532
<Reference Include="System.Transactions" />
2633
</ItemGroup>
2734
<ItemGroup>
35+
<PackageReference Include="Microsoft.Extensions.Caching.Memory" Version="$(MicrosoftExtensionsCachingMemoryVersion)" />
36+
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
37+
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
38+
<Version>$(MicrosoftDataSqlClientSniVersion)</Version>
39+
<PrivateAssets>All</PrivateAssets>
40+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
41+
</PackageReference>
2842
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
43+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
44+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
45+
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
2946
<PackageReference Include="System.Text.Json" Version="$(SystemTextJsonVersion)" />
3047
</ItemGroup>
3148
</Project>

0 commit comments

Comments
 (0)