Skip to content

Commit 2b30d77

Browse files
Last Changes for preview release (#705)
1 parent 9e23679 commit 2b30d77

File tree

6 files changed

+38
-33
lines changed

6 files changed

+38
-33
lines changed

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -619,6 +619,8 @@ public SqlConnection(string connectionString, Microsoft.Data.SqlClient.SqlCreden
619619
[System.ComponentModel.BrowsableAttribute(false)]
620620
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
621621
public override string ServerVersion { get { throw null; } }
622+
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ServerProcessId/*'/>
623+
public int ServerProcessId { get { throw null; } }
622624
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/State/*'/>
623625
[System.ComponentModel.BrowsableAttribute(false)]
624626
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]

src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs

Lines changed: 27 additions & 27 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -775,6 +775,8 @@ public SqlConnection(string connectionString, Microsoft.Data.SqlClient.SqlCreden
775775
[System.ComponentModel.BrowsableAttribute(false)]
776776
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
777777
public override string ServerVersion { get { throw null; } }
778+
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ServerProcessId/*'/>
779+
public int ServerProcessId { get { throw null; } }
778780
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/State/*'/>
779781
[System.ComponentModel.BrowsableAttribute(false)]
780782
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]

src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,5 +94,6 @@
9494
</ItemGroup>
9595
<ItemGroup>
9696
<None Condition="'$(TargetGroup)'=='netfx' AND $(ReferenceType)=='Project'" Include="$(BinFolder)$(Configuration).AnyCPU\Microsoft.Data.SqlClient\netfx\**\*SNI*.dll" CopyToOutputDirectory="PreserveNewest" />
97+
<PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
9798
</ItemGroup>
9899
</Project>

tools/props/Versions.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
</PropertyGroup>
1313
<!-- NetFx project dependencies -->
1414
<PropertyGroup>
15-
<MicrosoftDataSqlClientSniVersion>2.0.0</MicrosoftDataSqlClientSniVersion>
15+
<MicrosoftDataSqlClientSniVersion>2.1.0</MicrosoftDataSqlClientSniVersion>
1616
<SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
1717
<SystemSecurityCryptographyPrimitivesVersion>4.3.0</SystemSecurityCryptographyPrimitivesVersion>
1818
</PropertyGroup>
@@ -27,7 +27,7 @@
2727
<!-- NetCore project dependencies -->
2828
<PropertyGroup>
2929
<MicrosoftWin32RegistryVersion>4.7.0</MicrosoftWin32RegistryVersion>
30-
<MicrosoftDataSqlClientSNIRuntimeVersion>2.0.0</MicrosoftDataSqlClientSNIRuntimeVersion>
30+
<MicrosoftDataSqlClientSNIRuntimeVersion>2.1.0</MicrosoftDataSqlClientSNIRuntimeVersion>
3131
<SystemConfigurationConfigurationManagerVersion>4.7.0</SystemConfigurationConfigurationManagerVersion>
3232
<SystemDiagnosticsDiagnosticSourceVersion>4.7.0</SystemDiagnosticsDiagnosticSourceVersion>
3333
<SystemDiagnosticsPerformanceCounterVersion>4.7.0</SystemDiagnosticsPerformanceCounterVersion>

tools/specs/Microsoft.Data.SqlClient.nuspec

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
2727
<tags>sqlclient microsoft.data.sqlclient</tags>
2828
<dependencies>
2929
<group targetFramework="net46">
30-
<dependency id="Microsoft.Data.SqlClient.SNI" version="2.0.0" />
30+
<dependency id="Microsoft.Data.SqlClient.SNI" version="2.1.0" />
3131
<dependency id="Microsoft.Identity.Client" version="4.14.0" />
3232
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.6.0" />
3333
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
3434
</group>
3535
<group targetFramework="netcoreapp2.1">
36-
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.0.0" exclude="Compile" />
36+
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.1.0" exclude="Compile" />
3737
<dependency id="Microsoft.Win32.Registry" version="4.7.0" exclude="Compile" />
3838
<dependency id="System.Security.Principal.Windows" version="4.7.0" exclude="Compile" />
3939
<dependency id="System.Text.Encoding.CodePages" version="4.7.0" exclude="Compile" />
@@ -45,7 +45,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
4545
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
4646
</group>
4747
<group targetFramework="netcoreapp3.1">
48-
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.0.0" exclude="Compile" />
48+
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.1.0" exclude="Compile" />
4949
<dependency id="Microsoft.Win32.Registry" version="4.7.0" exclude="Compile" />
5050
<dependency id="System.Security.Principal.Windows" version="4.7.0" exclude="Compile" />
5151
<dependency id="System.Text.Encoding.CodePages" version="4.7.0" exclude="Compile" />
@@ -57,7 +57,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
5757
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
5858
</group>
5959
<group targetFramework="netstandard2.0">
60-
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.0.0" exclude="Compile" />
60+
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.1.0" exclude="Compile" />
6161
<dependency id="Microsoft.Win32.Registry" version="4.7.0" exclude="Compile" />
6262
<dependency id="System.Buffers" version="4.5.1" exclude="Compile" />
6363
<dependency id="System.Memory" version="4.5.4" exclude="Compile" />

0 commit comments

Comments
 (0)