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

[Release/2.0] Fix configSection collision with System.Data.SqlClient type #701

Merged
merged 10 commits into from
Aug 21, 2020
Merged

[Release/2.0] Fix configSection collision with System.Data.SqlClient type #701

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2c30cf2
Fix configSection collision with System.Data.SqlClient type.
cheenamalhotra Aug 20, 2020
46babf9
Merge branch '2.0-servicing' into 2.0-configSection
cheenamalhotra Aug 20, 2020
3699715
Update AssemblyVersion for 2.0-servicing branch
cheenamalhotra Aug 20, 2020
ccc964f
Null checks
cheenamalhotra Aug 20, 2020
68cf979
Minor edit
cheenamalhotra Aug 20, 2020
62152e4
Minor edit
cheenamalhotra Aug 20, 2020
3fc3ded
Update to adding new section
cheenamalhotra Aug 21, 2020
9576713
spell
cheenamalhotra Aug 21, 2020
5431660
touch-ups
cheenamalhotra Aug 21, 2020
bf78482
Apply review feedback
cheenamalhotra Aug 21, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion ...lient/netcore/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.NetCoreApp.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,11 @@ static SqlAuthenticationProviderManager()

try
{
configurationSection = (SqlAuthenticationProviderConfigurationSection)ConfigurationManager.GetSection(SqlAuthenticationProviderConfigurationSection.Name);
var section = ConfigurationManager.GetSection(SqlAuthenticationProviderConfigurationSection.Name);
if (null != section && ((ConfigurationSection)section).GetType().FullName.Contains("Microsoft.Data.SqlClient.SqlAuthenticationProviderConfigurationSection"))
{
configurationSection = (SqlAuthenticationProviderConfigurationSection)section;
}
}
catch (ConfigurationErrorsException e)
{
Expand Down
6 changes: 5 additions & 1 deletion ...oft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlAuthenticationProviderManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,11 @@ static SqlAuthenticationProviderManager()
SqlAuthenticationProviderConfigurationSection configurationSection = null;
try
{
configurationSection = (SqlAuthenticationProviderConfigurationSection)ConfigurationManager.GetSection(SqlAuthenticationProviderConfigurationSection.Name);
var section = ConfigurationManager.GetSection(SqlAuthenticationProviderConfigurationSection.Name);
if (null != section && ((ConfigurationSection)section).GetType().FullName.Contains("Microsoft.Data.SqlClient.SqlAuthenticationProviderConfigurationSection"))
{
configurationSection = (SqlAuthenticationProviderConfigurationSection)section;
}
}
catch (ConfigurationErrorsException e)
{
Expand Down
5 changes: 4 additions & 1 deletion tools/props/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
<Project ToolsVersion="Latest" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">1.0.0.0</AssemblyFileVersion>
<AssemblyVersion>$(AssemblyFileVersion)</AssemblyVersion>
<!-- This Assembly version corresponds to version of Microsoft.Data.SqlClient v2.0.0 Assembly. -->
<!-- Should only be changed in future when a non-backwards compatible driver is released. -->
<!-- Future Assembly Version values shall be Major.0.0.0; e.g. 3.0.0.0 -->
<AssemblyVersion>2.0.20168.4</AssemblyVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.18578.2</MicrosoftDotNetGenAPIPackageVersion>
<NugetPackageVersion Condition="'$(NugetPackageVersion)' == ''">2.0.0-dev</NugetPackageVersion>
<Version>$(NugetPackageVersion)</Version>
Expand Down