Skip to content

Commit 881c490

Browse files
edwardnealedwardneal
authored
Sync ref project references with runtime projects (#3124)
1 parent a63d84b commit 881c490

File tree

4 files changed

+44
-26
lines changed

4 files changed

+44
-26
lines changed

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

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,27 @@
3131
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
3232
<Compile Include="Microsoft.Data.SqlClient.NetStandard.cs" />
3333
</ItemGroup>
34-
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
34+
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
35+
<PackageReference Condition="'$(TargetsWindows)' == 'true' and '$(IsUAPAssembly)' != 'true'" Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
36+
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
37+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
38+
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
39+
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
3540
<PackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" />
41+
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesVersion)" />
42+
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
43+
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
3644
</ItemGroup>
3745
<ItemGroup>
46+
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)" />
47+
<!-- Enable the project reference for debugging purposes. -->
48+
<!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" /> -->
49+
<PackageReference Include="Microsoft.SqlServer.Server" Version="$(MicrosoftSqlServerServerVersion)" />
50+
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
3851
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
52+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
53+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
54+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
55+
<PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />
3956
</ItemGroup>
4057
</Project>

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

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1005,13 +1005,7 @@
10051005
<PackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" />
10061006
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesVersion)" />
10071007
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
1008-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
10091008
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
1010-
<PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />
1011-
</ItemGroup>
1012-
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
1013-
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
1014-
<PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />
10151009
</ItemGroup>
10161010
<ItemGroup>
10171011
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)" />
@@ -1022,6 +1016,8 @@
10221016
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
10231017
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
10241018
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
1019+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
1020+
<PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />
10251021
</ItemGroup>
10261022
<Import Project="$(ToolsDir)targets\GenerateThisAssemblyCs.targets" />
10271023
<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
@@ -20,10 +20,27 @@
2020
<Compile Include="Microsoft.Data.SqlClient.cs" />
2121
</ItemGroup>
2222
<ItemGroup>
23+
<Reference Include="System" />
24+
<Reference Include="System.Configuration" />
25+
<Reference Include="System.Runtime.Serialization" />
26+
<Reference Include="System.Security" />
27+
<Reference Include="System.Data" />
28+
<Reference Include="System.Xml" />
29+
<Reference Include="System.Runtime.Caching" />
2330
<Reference Include="System.EnterpriseServices" />
2431
<Reference Include="System.Transactions" />
2532
</ItemGroup>
2633
<ItemGroup>
34+
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
35+
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
36+
<Version>$(MicrosoftDataSqlClientSniVersion)</Version>
37+
<PrivateAssets>All</PrivateAssets>
38+
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
39+
</PackageReference>
40+
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
2741
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
42+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
43+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
44+
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
2845
</ItemGroup>
2946
</Project>

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

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -97,8 +97,8 @@
9797
<Reference Include="System.Data" />
9898
<Reference Include="System.Xml" />
9999
<Reference Include="System.Runtime.Caching" />
100-
<Reference Include="System.Transactions" />
101100
<Reference Include="System.EnterpriseServices" />
101+
<Reference Include="System.Transactions" />
102102
</ItemGroup>
103103
<!-- Contains common items shared between NetFx and NetCore -->
104104
<ItemGroup>
@@ -730,29 +730,17 @@
730730
</COMReference>
731731
</ItemGroup>
732732
<ItemGroup>
733-
<PackageReference Include="System.Text.Encodings.Web">
734-
<Version>$(SystemTextEncodingsWebVersion)</Version>
735-
</PackageReference>
733+
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
736734
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
737735
<Version>$(MicrosoftDataSqlClientSniVersion)</Version>
738736
<PrivateAssets>All</PrivateAssets>
739737
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
740738
</PackageReference>
741-
<PackageReference Include="Azure.Identity">
742-
<Version>$(AzureIdentityVersion)</Version>
743-
</PackageReference>
744-
<PackageReference Include="Microsoft.Identity.Client">
745-
<Version>$(MicrosoftIdentityClientVersion)</Version>
746-
</PackageReference>
747-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect">
748-
<version>$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)</version>
749-
</PackageReference>
750-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens">
751-
<version>$(MicrosoftIdentityModelJsonWebTokensVersion)</version>
752-
</PackageReference>
753-
<PackageReference Include="System.Buffers">
754-
<Version>$(SystemBuffersVersion)</Version>
755-
</PackageReference>
739+
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
740+
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
741+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
742+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
743+
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
756744
</ItemGroup>
757745
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
758746
<Import Project="..\..\src\tools\targets\GenerateResourceStringsSource.targets" />

0 commit comments

Comments
 (0)