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

Change | Updating SNI version to 5.2.0 #2363

Merged
merged 6 commits into from Feb 21, 2024
Merged

Change | Updating SNI version to 5.2.0 #2363

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
9541feb
Adding VersionsNet8OrLater.props to tests
JRahnama Feb 14, 2024
b1bcefd
Merge branch 'main' of https://github.com/dotnet/SqlClient
JRahnama Feb 20, 2024
7a72c7b
Updating SNI version
JRahnama Feb 20, 2024
abb75cd
remove unwanted change
JRahnama Feb 20, 2024
3cedaac
trigger azure pipelines
JRahnama Feb 20, 2024
5eebc4d
updating nuspec
JRahnama Feb 20, 2024
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: 1 addition & 1 deletion src/Microsoft.Data.SqlClient/tests/Directory.Build.props
View file
Open in desktop
Expand Up @@ -4,7 +4,7 @@

<!-- Import parent Directory.build.props -->
<Import Project="..\..\Directory.Build.props" />

<PropertyGroup>
<OSGroup Condition="$(OSGroup) == ''">$(OS)</OSGroup>
<TargetsWindows Condition="'$(OSGroup)'=='Windows_NT'">true</TargetsWindows>
Expand Down
4 changes: 2 additions & 2 deletions tools/props/Versions.props
View file
Open in desktop
Expand Up @@ -23,7 +23,7 @@
</PropertyGroup>
<!-- NetFx project dependencies -->
<PropertyGroup>
<MicrosoftDataSqlClientSniVersion>5.2.0-preview1.23340.1</MicrosoftDataSqlClientSniVersion>
<MicrosoftDataSqlClientSniVersion>5.2.0</MicrosoftDataSqlClientSniVersion>
</PropertyGroup>
<!-- NetFx and NetCore project dependencies -->
<PropertyGroup>
Expand All @@ -38,7 +38,7 @@
<!-- NetCore project dependencies -->
<PropertyGroup>
<MicrosoftWin32RegistryVersion>5.0.0</MicrosoftWin32RegistryVersion>
<MicrosoftDataSqlClientSNIRuntimeVersion>5.2.0-preview1.23340.1</MicrosoftDataSqlClientSNIRuntimeVersion>
<MicrosoftDataSqlClientSNIRuntimeVersion>5.2.0</MicrosoftDataSqlClientSNIRuntimeVersion>
<SystemConfigurationConfigurationManagerVersion>6.0.1</SystemConfigurationConfigurationManagerVersion>
<MicrosoftSqlServerServerVersion>1.0.0</MicrosoftSqlServerServerVersion>
<SystemDiagnosticsPerformanceCounterVersion>6.0.1</SystemDiagnosticsPerformanceCounterVersion>
Expand Down
10 changes: 5 additions & 5 deletions tools/specs/Microsoft.Data.SqlClient.nuspec
View file
Open in desktop
Expand Up @@ -28,7 +28,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<tags>sqlclient microsoft.data.sqlclient</tags>
<dependencies>
<group targetFramework="net462">
<dependency id="Microsoft.Data.SqlClient.SNI" version="5.2.0-preview1.23340.1" />
<dependency id="Microsoft.Data.SqlClient.SNI" version="5.2.0" />
<dependency id="Azure.Identity" version="1.10.3" />
<dependency id="Microsoft.Identity.Client" version="4.56.0" />
<dependency id="Microsoft.IdentityModel.JsonWebTokens" version="6.35.0" />
Expand All @@ -39,7 +39,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Text.Encodings.Web" version="6.0.0" />
</group>
<group targetFramework="net8.0">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0-preview1.23340.1" exclude="Compile" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0" exclude="Compile" />
<dependency id="Azure.Identity" version="1.10.3" />
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Compile"/>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.35.0" />
Expand All @@ -49,7 +49,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Runtime.Caching" version="8.0.0" exclude="Compile" />
</group>
<group targetFramework="net6.0">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0-preview1.23340.1" exclude="Compile" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0" exclude="Compile" />
<dependency id="Azure.Identity" version="1.10.3" />
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Compile"/>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.35.0" />
Expand All @@ -59,7 +59,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Runtime.Caching" version="6.0.0" exclude="Compile" />
</group>
<group targetFramework="netstandard2.0">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0-preview1.23340.1" exclude="Compile" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0" exclude="Compile" />
<dependency id="Azure.Identity" version="1.10.3" />
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Compile"/>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.35.0" />
Expand All @@ -77,7 +77,7 @@ When using NuGet 3.x this package requires at least version 3.4.</description>
<dependency id="System.Security.Principal.Windows" version="5.0.0" exclude="Compile" />
</group>
<group targetFramework="netstandard2.1">
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0-preview1.23340.1" exclude="Compile" />
<dependency id="Microsoft.Data.SqlClient.SNI.runtime" version="5.2.0" exclude="Compile" />
<dependency id="Azure.Identity" version="1.10.3" />
<dependency id="Microsoft.Identity.Client" version="4.56.0" exclude="Compile"/>
<dependency id="Microsoft.IdentityModel.Protocols.OpenIdConnect" version="6.35.0" />
Expand Down