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

Update config Section name for Microsoft.Data.SqlClient #702

Merged
merged 7 commits into from
Aug 21, 2020
+69 −7
Merged

Update config Section name for Microsoft.Data.SqlClient #702

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
4b8c081
Update config Section name
cheenamalhotra Aug 20, 2020
44b9a9a
Update version info
cheenamalhotra Aug 20, 2020
6be125a
Update for backwards compatibility
cheenamalhotra Aug 21, 2020
cb48d9a
Revert version changes
cheenamalhotra Aug 21, 2020
a6ee0e7
touch-ups
cheenamalhotra Aug 21, 2020
f2668cb
Revert original name change
cheenamalhotra Aug 21, 2020
39ddd7d
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
2 changes: 1 addition & 1 deletion roadmap.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ The Microsoft.Data.SqlClient roadmap communicates project priorities for evolvin
| Microsoft.Data.SqlClient v1.0 (servicing) | As needed (see also [1.0 releases](https://github.com/dotnet/sqlclient/blob/master/release-notes/1.0)) | Closed |
| Microsoft.Data.SqlClient v1.1 (servicing) | As needed (see also [1.1 releases](https://github.com/dotnet/sqlclient/blob/master/release-notes/1.1)) | Closed |
| Microsoft.Data.SqlClient v2.0 (servicing) | As needed (see also [2.0 releases](https://github.com/dotnet/sqlclient/blob/master/release-notes/2.0)) | Closed |
| Microsoft.Data.SqlClient v2.1 | GA (General Availability) estimated for November 2020 | [SqlClient 2.1.0](https://github.com/dotnet/SqlClient/projects/6) |
| Microsoft.Data.SqlClient v3.0 | GA (General Availability) estimated for November 2020 | [SqlClient 3.0.0](https://github.com/dotnet/SqlClient/projects/6) |

> Note: Dates are calendar year (as opposed to fiscal year).

Expand Down
4 changes: 2 additions & 2 deletions ...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 @@ -25,7 +25,7 @@ static SqlAuthenticationProviderManager()
catch (ConfigurationErrorsException e)
{
// Don't throw an error for invalid config files
SqlClientEventSource.Log.TraceEvent("Unable to load custom SqlAuthenticationProviders. ConfigurationManager failed to load due to configuration errors: {0}", e);
SqlClientEventSource.Log.TraceEvent("Unable to load custom SqlClientAuthenticationProviders. ConfigurationManager failed to load due to configuration errors: {0}", e);
}

Instance = new SqlAuthenticationProviderManager(configurationSection);
Expand Down Expand Up @@ -129,7 +129,7 @@ private static SqlAuthenticationMethod AuthenticationEnumFromString(string authe
/// </summary>
internal class SqlAuthenticationProviderConfigurationSection : ConfigurationSection
{
public const string Name = "SqlAuthenticationProviders";
public const string Name = "SqlClientAuthenticationProviders";

/// <summary>
/// User-defined auth providers.
Expand Down
4 changes: 2 additions & 2 deletions ...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 @@ -32,7 +32,7 @@ static SqlAuthenticationProviderManager()
catch (ConfigurationErrorsException e)
{
// Don't throw an error for invalid config files
SqlClientEventSource.Log.TraceEvent("Unable to load custom SqlAuthenticationProviders. ConfigurationManager failed to load due to configuration errors: {0}", e);
SqlClientEventSource.Log.TraceEvent("Unable to load custom SqlClientAuthenticationProviders. ConfigurationManager failed to load due to configuration errors: {0}", e);
}
Instance = new SqlAuthenticationProviderManager(configurationSection);
Instance.SetProvider(SqlAuthenticationMethod.ActiveDirectoryIntegrated, activeDirectoryAuthProvider);
Expand Down Expand Up @@ -196,7 +196,7 @@ private static string GetProviderType(SqlAuthenticationProvider provider)
/// </summary>
internal class SqlAuthenticationProviderConfigurationSection : ConfigurationSection
{
public const string Name = "SqlAuthenticationProviders";
public const string Name = "SqlClientAuthenticationProviders";

/// <summary>
/// User-defined auth providers.
Expand Down
8 changes: 4 additions & 4 deletions tools/props/Versions.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@
<Project ToolsVersion="Latest" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<PropertyGroup>
<AssemblyFileVersion Condition="'$(AssemblyFileVersion)' == ''">1.0.0.0</AssemblyFileVersion>
<!-- This Assembly version corresponds to version of Microsoft.Data.SqlClient v2.0.0 Assembly. -->
<!-- This Assembly version corresponds to version of Microsoft.Data.SqlClient v3.0.0 Assembly. -->
<!-- Should only be changed in future when a non-backwards compatible driver is released. -->
<!-- Future Assembly Version values shall be Major.Minor.0.0; e.g. 3.0.0.0 -->
<AssemblyVersion>2.0.20168.4</AssemblyVersion>
<!-- Future Assembly Version values shall be Major.0.0.0; e.g. 4.0.0.0 -->
<AssemblyVersion>3.0.0.0</AssemblyVersion>
<MicrosoftDotNetGenAPIPackageVersion>1.0.0-beta.18578.2</MicrosoftDotNetGenAPIPackageVersion>
<NugetPackageVersion Condition="'$(NugetPackageVersion)' == ''">2.1.0-dev</NugetPackageVersion>
<NugetPackageVersion Condition="'$(NugetPackageVersion)' == ''">3.0.0-dev</NugetPackageVersion>
<Version>$(NugetPackageVersion)</Version>
</PropertyGroup>
<!-- NetFx project dependencies -->
Expand Down