Skip to content

Commit 6ec0741

Browse files
benrr101edwardneal
benrr101
and
edwardneal
authored
Sync ref project references with runtime projects (#3180)
Co-authored-by: Edward Neal <55035479+edwardneal@users.noreply.github.com>
1 parent 081c4bf commit 6ec0741

File tree

3 files changed

+56
-20
lines changed

3 files changed

+56
-20
lines changed

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

Lines changed: 32 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,9 @@
33
<EnableDefaultCompileItems>false</EnableDefaultCompileItems>
44
<TargetFrameworks>net6.0;netstandard2.0;netstandard2.1</TargetFrameworks>
55
<TargetFrameworks Condition="$(ReferenceType)=='NetStandard' AND $(TargetNetStandardVersion)=='netstandard2.1'">netstandard2.1</TargetFrameworks>
6+
<OSGroup Condition="'$(OSGroup)' == ''">$(OS)</OSGroup>
7+
<TargetsWindows Condition="'$(OSGroup)'=='Windows_NT'">true</TargetsWindows>
8+
<TargetsUnix Condition="'$(OSGroup)'=='Unix'">true</TargetsUnix>
69
<IntermediateOutputPath>$(ObjFolder)$(Configuration)\$(AssemblyName)\ref\</IntermediateOutputPath>
710
<OutputPath>$(BinFolder)$(Configuration)\$(AssemblyName)\ref\</OutputPath>
811
<DocumentationFile>$(OutputPath)\$(TargetFramework)\Microsoft.Data.SqlClient.xml</DocumentationFile>
@@ -24,13 +27,41 @@
2427
<Compile Include="Microsoft.Data.SqlClient.cs" />
2528
<Compile Include="Microsoft.Data.SqlClient.Manual.cs" />
2629
</ItemGroup>
27-
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
30+
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
31+
<PackageReference Condition="'$(TargetsWindows)' == 'true' and '$(IsUAPAssembly)' != 'true'" Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
32+
<PackageReference Include="System.Runtime.Loader" Version="$(SystemRuntimeLoaderVersion)" />
2833
<PackageReference Include="System.Security.Cryptography.Cng" Version="$(SystemSecurityCryptographyCngVersion)" />
2934
</ItemGroup>
35+
<ItemGroup Condition="'$(TargetFramework)' == 'netstandard2.0'">
36+
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
37+
</ItemGroup>
38+
<ItemGroup Condition="'$(TargetsWindows)' == 'true' and '$(IsUAPAssembly)' != 'true'">
39+
<Reference Include="Microsoft.Win32.Registry" />
40+
</ItemGroup>
41+
<ItemGroup Condition="'$(OSGroup)' != 'AnyOS' AND '$(IsUAPAssembly)' == 'true'">
42+
<Reference Include="System.Collections.NonGeneric" />
43+
<Reference Include="System.Memory" />
44+
</ItemGroup>
3045
<ItemGroup Condition="'$(TargetGroup)' == 'netstandard'">
3146
<Compile Include="Microsoft.Data.SqlClient.NetStandard.cs" />
3247
</ItemGroup>
48+
<ItemGroup Condition="'$(TargetGroup)' == 'netcoreapp'">
49+
<PackageReference Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
50+
</ItemGroup>
3351
<ItemGroup>
52+
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
53+
<PackageReference Include="System.Security.Permissions" Version="$(SystemSecurityPermissionsVersion)" />
54+
<PackageReference Include="System.Security.Principal.Windows" Version="$(SystemSecurityPrincipalWindowsVersion)" />
55+
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesVersion)" />
56+
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
57+
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)" />
58+
<!-- Enable the project reference for debugging purposes. -->
59+
<!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" /> -->
60+
<PackageReference Include="Microsoft.SqlServer.Server" Version="$(MicrosoftSqlServerServerVersion)" />
61+
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
3462
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
63+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
64+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
65+
<PackageReference Include="System.Runtime.Caching" Version="$(SystemRuntimeCachingVersion)" />
3566
</ItemGroup>
3667
</Project>

‎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
@@ -92,8 +92,8 @@
9292
<Reference Include="System.Data" />
9393
<Reference Include="System.Xml" />
9494
<Reference Include="System.Runtime.Caching" />
95-
<Reference Include="System.Transactions" />
9695
<Reference Include="System.EnterpriseServices" />
96+
<Reference Include="System.Transactions" />
9797
</ItemGroup>
9898
<!-- Contains common items shared between NetFx and NetCore -->
9999
<ItemGroup>
@@ -716,29 +716,17 @@
716716
</COMReference>
717717
</ItemGroup>
718718
<ItemGroup>
719-
<PackageReference Include="System.Text.Encodings.Web">
720-
<Version>$(SystemTextEncodingsWebVersion)</Version>
721-
</PackageReference>
719+
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
722720
<PackageReference Include="Microsoft.Data.SqlClient.SNI">
723721
<Version>$(MicrosoftDataSqlClientSniVersion)</Version>
724722
<PrivateAssets>All</PrivateAssets>
725723
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
726724
</PackageReference>
727-
<PackageReference Include="Azure.Identity">
728-
<Version>$(AzureIdentityVersion)</Version>
729-
</PackageReference>
730-
<PackageReference Include="Microsoft.Identity.Client">
731-
<Version>$(MicrosoftIdentityClientVersion)</Version>
732-
</PackageReference>
733-
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect">
734-
<version>$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)</version>
735-
</PackageReference>
736-
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens">
737-
<version>$(MicrosoftIdentityModelJsonWebTokensVersion)</version>
738-
</PackageReference>
739-
<PackageReference Include="System.Buffers">
740-
<Version>$(SystemBuffersVersion)</Version>
741-
</PackageReference>
725+
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
726+
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
727+
<PackageReference Include="Microsoft.IdentityModel.Protocols.OpenIdConnect" Version="$(MicrosoftIdentityModelProtocolsOpenIdConnectVersion)" />
728+
<PackageReference Include="Microsoft.IdentityModel.JsonWebTokens" Version="$(MicrosoftIdentityModelJsonWebTokensVersion)" />
729+
<PackageReference Include="System.Buffers" Version="$(SystemBuffersVersion)" />
742730
</ItemGroup>
743731
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
744732
<Import Project="$(NetFxSource)tools\targets\GenerateResourceStringsSource.targets" />

0 commit comments

Comments
 (0)