Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update SNI version to v2.1.0 + additional changes for preview release #705

Merged
merged 1 commit into from Aug 21, 2020
Merged

Update SNI version to v2.1.0 + additional changes for preview release #705

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/Microsoft.Data.SqlClient/netcore/ref/Microsoft.Data.SqlClient.cs
View file
Open in desktop
Expand Up @@ -619,6 +619,8 @@ public sealed partial class SqlConnection : System.Data.Common.DbConnection, Sys
[System.ComponentModel.BrowsableAttribute(false)]
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
public override string ServerVersion { get { throw null; } }
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ServerProcessId/*'/>
public int ServerProcessId { get { throw null; } }
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/State/*'/>
[System.ComponentModel.BrowsableAttribute(false)]
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
Expand Down
54 changes: 27 additions & 27 deletions src/Microsoft.Data.SqlClient/netcore/src/Resources/Strings.Designer.cs
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.cs
View file
Open in desktop
Expand Up @@ -775,6 +775,8 @@ public sealed partial class SqlConnection : System.Data.Common.DbConnection, Sys
[System.ComponentModel.BrowsableAttribute(false)]
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
public override string ServerVersion { get { throw null; } }
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/ServerProcessId/*'/>
public int ServerProcessId { get { throw null; } }
/// <include file='../../../../doc/snippets/Microsoft.Data.SqlClient/SqlConnection.xml' path='docs/members[@name="SqlConnection"]/State/*'/>
[System.ComponentModel.BrowsableAttribute(false)]
[System.ComponentModel.DesignerSerializationVisibilityAttribute(0)]
Expand Down
1 change: 1 addition & 0 deletions src/Microsoft.Data.SqlClient/tests/FunctionalTests/Microsoft.Data.SqlClient.Tests.csproj
View file
Open in desktop
Expand Up @@ -94,5 +94,6 @@
</ItemGroup>
<ItemGroup>
<None Condition="'$(TargetGroup)'=='netfx' AND $(ReferenceType)=='Project'" Include="$(BinFolder)$(Configuration).AnyCPU\Microsoft.Data.SqlClient\netfx\**\*SNI*.dll" CopyToOutputDirectory="PreserveNewest" />
<PackageReference Condition="$(ReferenceType.Contains('Package'))" Include="Microsoft.Identity.Client" Version="$(MicrosoftIdentityClientVersion)" />
</ItemGroup>
</Project>
4 changes: 2 additions & 2 deletions tools/props/Versions.props
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@
</PropertyGroup>
<!-- NetFx project dependencies -->
<PropertyGroup>
<MicrosoftDataSqlClientSniVersion>2.0.0</MicrosoftDataSqlClientSniVersion>
<MicrosoftDataSqlClientSniVersion>2.1.0</MicrosoftDataSqlClientSniVersion>
<SystemSecurityCryptographyAlgorithmsVersion>4.3.1</SystemSecurityCryptographyAlgorithmsVersion>
<SystemSecurityCryptographyPrimitivesVersion>4.3.0</SystemSecurityCryptographyPrimitivesVersion>
</PropertyGroup>
Expand All @@ -27,7 +27,7 @@
<!-- NetCore project dependencies -->
<PropertyGroup>
<MicrosoftWin32RegistryVersion>4.7.0</MicrosoftWin32RegistryVersion>
<MicrosoftDataSqlClientSNIRuntimeVersion>2.0.0</MicrosoftDataSqlClientSNIRuntimeVersion>
<MicrosoftDataSqlClientSNIRuntimeVersion>2.1.0</MicrosoftDataSqlClientSNIRuntimeVersion>
<SystemConfigurationConfigurationManagerVersion>4.7.0</SystemConfigurationConfigurationManagerVersion>
<SystemDiagnosticsDiagnosticSourceVersion>4.7.0</SystemDiagnosticsDiagnosticSourceVersion>
<SystemDiagnosticsPerformanceCounterVersion>4.7.0</SystemDiagnosticsPerformanceCounterVersion>
Expand Down
8 changes: 4 additions & 4 deletions tools/specs/Microsoft.Data.SqlClient.nuspec
View file
Open in desktop
Expand Up @@ -27,13 +27,13 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<tags>sqlclient microsoft.data.sqlclient</tags>
<dependencies>
<group targetFramework="net46">
<dependency id="Microsoft.Data.SqlClient.SNI" version="2.0.0" />
<dependency id="Microsoft.Data.SqlClient.SNI" version="2.1.0" />
<dependency id="Microsoft.Identity.Client" version="4.14.0" />
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="5.6.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
</group>
<group targetFramework="netcoreapp2.1">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.0.0" exclude="Compile" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.1.0" exclude="Compile" />
<dependency id="Microsoft.Win32.Registry" version="4.7.0" exclude="Compile" />
<dependency id="System.Security.Principal.Windows" version="4.7.0" exclude="Compile" />
<dependency id="System.Text.Encoding.CodePages" version="4.7.0" exclude="Compile" />
Expand All @@ -45,7 +45,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
</group>
<group targetFramework="netcoreapp3.1">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.0.0" exclude="Compile" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.1.0" exclude="Compile" />
<dependency id="Microsoft.Win32.Registry" version="4.7.0" exclude="Compile" />
<dependency id="System.Security.Principal.Windows" version="4.7.0" exclude="Compile" />
<dependency id="System.Text.Encoding.CodePages" version="4.7.0" exclude="Compile" />
Expand All @@ -57,7 +57,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="5.6.0" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.0.0" exclude="Compile" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="2.1.0" exclude="Compile" />
<dependency id="Microsoft.Win32.Registry" version="4.7.0" exclude="Compile" />
<dependency id="System.Buffers" version="4.5.1" exclude="Compile" />
<dependency id="System.Memory" version="4.5.4" exclude="Compile" />
Expand Down