Skip to content

Commit f1172a6

Browse files
Fix Microsoft.SqlServer.Server netcore project package reference (#1654)
1 parent d8fcede commit f1172a6

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -942,9 +942,6 @@
942942
<LogicalName>Microsoft.Data.SqlClient.SqlMetaData.xml</LogicalName>
943943
</EmbeddedResource>
944944
</ItemGroup>
945-
<ItemGroup>
946-
<ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" />
947-
</ItemGroup>
948945
<ItemGroup>
949946
<PackageReference Condition="'$(TargetsWindows)' == 'true' and '$(IsUAPAssembly)' != 'true'" Include="Microsoft.Win32.Registry" Version="$(MicrosoftWin32RegistryVersion)" />
950947
<PackageReference Include="System.Configuration.ConfigurationManager" Version="$(SystemConfigurationConfigurationManagerVersion)" />
@@ -953,6 +950,9 @@
953950
<PackageReference Include="System.Text.Encoding.CodePages" Version="$(SystemTextEncodingCodePagesVersion)" />
954951
<PackageReference Include="System.Text.Encodings.Web" Version="$(SystemTextEncodingsWebVersion)" />
955952
<PackageReference Include="Microsoft.Data.SqlClient.SNI.runtime" Version="$(MicrosoftDataSqlClientSNIRuntimeVersion)" />
953+
<!-- Enable the project reference for debugging purposes. -->
954+
<!-- <ProjectReference Include="$(SqlServerSourceCode)\Microsoft.SqlServer.Server.csproj" /> -->
955+
<PackageReference Include="Microsoft.SqlServer.Server" Version="$(MicrosoftSqlServerServerVersion)" />
956956
<PackageReference Condition="$(TargetGroup) == 'netcoreapp' " Include="System.Diagnostics.DiagnosticSource" Version="$(SystemDiagnosticsDiagnosticSourceVersion)" />
957957
<PackageReference Include="Azure.Identity" Version="$(AzureIdentityVersion)" />
958958
<PackageReference Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />

tools/props/Versions.props

+1
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@
4040
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
4141
<MicrosoftDataSqlClientSNIRuntimeVersion>5.0.0-preview3.22165.1</MicrosoftDataSqlClientSNIRuntimeVersion>
4242
<SystemConfigurationConfigurationManagerVersion>5.0.0</SystemConfigurationConfigurationManagerVersion>
43+
<MicrosoftSqlServerServerVersion>1.0.0</MicrosoftSqlServerServerVersion>
4344
<SystemDiagnosticsDiagnosticSourceVersion>5.0.0</SystemDiagnosticsDiagnosticSourceVersion>
4445
<SystemDiagnosticsPerformanceCounterVersion>5.0.0</SystemDiagnosticsPerformanceCounterVersion>
4546
<SystemResourcesResourceManagerVersion>4.3.0</SystemResourcesResourceManagerVersion>

0 commit comments

Comments
 (0)