Skip to content

Commit 431f1b7

Browse files
lcheunglcilcheunglci
committed
Merge branch 'main' into MergeShared-TdsEnums
2 parents c03f6fd + fc10bbc commit 431f1b7

File tree

24 files changed

+254
-71
lines changed

24 files changed

+254
-71
lines changed

‎CHANGELOG.md‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,34 @@ All notable changes to this project will be documented in this file.
44

55
The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
66

7+
## [Preview Release 4.0.0-preview3.21293.2] - 2021-10-20
8+
9+
This update brings the below changes over the previous release:
10+
11+
### Breaking changes over preview release v4.0.0-preview2
12+
13+
- Dropped support for .NET Core 2.1 [#1272](https://github.com/dotnet/SqlClient/pull/1272)
14+
- [.NET Framework] Exception will not be thrown if a User ID is provided in the connection string when using `Active Directory Integrated` authentication [#1359](https://github.com/dotnet/SqlClient/pull/1359)
15+
16+
### Added
17+
18+
- Add `GetFieldValueAsync<T>` and `GetFieldValue<T>` support for `XmlReader`, `TextReader`, `Stream` [#1019](https://github.com/dotnet/SqlClient/pull/1019)
19+
20+
### Fixed
21+
22+
- Fixed `FormatException` when opening a connection with event tracing enabled [#1291](https://github.com/dotnet/SqlClient/pull/1291)
23+
- Fixed improper initialization of `ActiveDirectoryAuthenticationProvider` [#1328](https://github.com/dotnet/SqlClient/pull/1328)
24+
- Fixed `MissingMethodException` when accessing `SqlAuthenticationParameters.ConnectionTimeout` [#1336](https://github.com/dotnet/SqlClient/pull/1336)
25+
- Fixed data corruption issues by reverting changes to async cancellations [#1352](https://github.com/dotnet/SqlClient/pull/1352)
26+
- Fixed performance degradation by reverting changes to MARS state machine [#1357](https://github.com/dotnet/SqlClient/pull/1357)
27+
- Fixed bug where environment variables are ignored when using `Active Directory Default` authentication [#1360](https://github.com/dotnet/SqlClient/pull/1360)
28+
29+
### Changed
30+
31+
- Removed attributes for classes used in Microsoft.VSDesigner due to lack of support for Microsoft.Data.SqlClient [#1296](https://github.com/dotnet/SqlClient/pull/1296)
32+
- Disable encryption when connecting to SQL LocalDB [#1312](https://github.com/dotnet/SqlClient/pull/1312)
33+
- Various code health and performance improvements. See [milestone](https://github.com/dotnet/SqlClient/milestone/31?closed=1) for more info.
34+
735
## [Preview Release 4.0.0-preview2.21264.2] - 2021-09-21
836

937
This update brings the below changes over the previous release:

‎release-notes/4.0/4.0.0-preview3.md‎

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
# Release Notes
2+
3+
## Microsoft.Data.SqlClient 4.0.0-preview3.21293.2 released 20 October 2021
4+
5+
This update brings the below changes over the previous release:
6+
7+
### Breaking changes over preview release v4.0.0-preview2
8+
9+
- Dropped support for .NET Core 2.1 [#1272](https://github.com/dotnet/SqlClient/pull/1272)
10+
- [.NET Framework] Exception will not be thrown if a User ID is provided in the connection string when using `Active Directory Integrated` authentication [#1359](https://github.com/dotnet/SqlClient/pull/1359)
11+
12+
### Added
13+
14+
- Add `GetFieldValueAsync<T>` and `GetFieldValue<T>` support for `XmlReader`, `TextReader`, `Stream` [#1019](https://github.com/dotnet/SqlClient/pull/1019). [Read more](#getfieldvalueasynct-and-getfieldvaluet-support-for-xmlreader-textreader-stream-types)
15+
16+
### Fixed
17+
18+
- Fixed `FormatException` when opening a connection with event tracing enabled [#1291](https://github.com/dotnet/SqlClient/pull/1291)
19+
- Fixed improper initialization of `ActiveDirectoryAuthenticationProvider` [#1328](https://github.com/dotnet/SqlClient/pull/1328)
20+
- Fixed `MissingMethodException` when accessing `SqlAuthenticationParameters.ConnectionTimeout` [#1336](https://github.com/dotnet/SqlClient/pull/1336)
21+
- Fixed data corruption issues by reverting changes to async cancellations [#1352](https://github.com/dotnet/SqlClient/pull/1352)
22+
- Fixed performance degradation by reverting changes to MARS state machine [#1357](https://github.com/dotnet/SqlClient/pull/1357)
23+
- Fixed bug where environment variables are ignored when using `Active Directory Default` authentication [#1360](https://github.com/dotnet/SqlClient/pull/1360)
24+
25+
### Changed
26+
27+
- Removed attributes for classes used in Microsoft.VSDesigner due to lack of support for Microsoft.Data.SqlClient [#1296](https://github.com/dotnet/SqlClient/pull/1296)
28+
- Disable encryption when connecting to SQL LocalDB [#1312](https://github.com/dotnet/SqlClient/pull/1312)
29+
- Various code health and performance improvements. See [milestone](https://github.com/dotnet/SqlClient/milestone/31?closed=1) for more info.
30+
31+
## New features over preview release v4.0.0-preview2
32+
33+
### `GetFieldValueAsync<T>` and `GetFieldValue<T>` support for `XmlReader`, `TextReader`, `Stream` types
34+
35+
`XmlReader`, `TextReader`, `Stream` types are now supported when using `GetFieldValueAsync<T>` and `GetFieldValue<T>`.
36+
37+
Example usage:
38+
39+
```cs
40+
using (SqlConnection connection = new SqlConnection(connectionString))
41+
{
42+
using (SqlCommand command = new SqlCommand(query, connection))
43+
{
44+
connection.Open();
45+
using (SqlDataReader reader = await command.ExecuteReaderAsync())
46+
{
47+
if (await reader.ReadAsync())
48+
{
49+
using (Stream stream = await reader.GetFieldValueAsync<Stream>(1))
50+
{
51+
// Continue to read from stream
52+
}
53+
}
54+
}
55+
}
56+
}
57+
```
58+
59+
## Target Platform Support
60+
61+
- .NET Framework 4.6.1+ (Windows x86, Windows x64)
62+
- .NET Core 3.1+ (Windows x86, Windows x64, Windows ARM64, Windows ARM, Linux, macOS)
63+
- .NET Standard 2.0+ (Windows x86, Windows x64, Windows ARM64, Windows ARM, Linux, macOS)
64+
65+
### Dependencies
66+
67+
#### .NET Framework
68+
69+
- Microsoft.Data.SqlClient.SNI 4.0.0-preview1.21232.1
70+
- Azure.Identity 1.3.0
71+
- Microsoft.Identity.Client 4.22.0
72+
- Microsoft.IdentityModel.JsonWebTokens 6.8.0
73+
- Microsoft.IdentityModel.Protocols.OpenIdConnect 6.8.0
74+
- System.Buffers 4.5.1
75+
- System.Configuration.ConfigurationManager 5.0.0
76+
- System.IO 4.3.0
77+
- System.Runtime.InteropServices.RuntimeInformation 4.3.0
78+
- System.Security.Cryptography.Algorithms 4.3.1
79+
- System.Security.Cryptography.Primitives 4.3.0
80+
- System.Text.Encodings.Web 4.7.2
81+
82+
#### .NET Core
83+
84+
- Microsoft.Data.SqlClient.SNI.runtime 4.0.0-preview1.21232.1
85+
- Azure.Identity 1.3.0
86+
- Microsoft.Identity.Client 4.22.0
87+
- Microsoft.IdentityModel.Protocols.OpenIdConnect 6.8.0
88+
- Microsoft.IdentityModel.JsonWebTokens 6.8.0
89+
- Microsoft.Win32.Registry 5.0.0
90+
- System.Buffers 4.5.1
91+
- System.Configuration.ConfigurationManager 5.0.0
92+
- System.Diagnostics.DiagnosticSource 5.0.0
93+
- System.IO 4.3.0
94+
- System.Runtime.Caching 5.0.0
95+
- System.Text.Encoding.CodePages 5.0.0
96+
- System.Text.Encodings.Web 4.7.2
97+
- System.Resources.ResourceManager 4.3.0
98+
- System.Security.Cryptography.Cng 5.0.0
99+
- System.Security.Principal.Windows 5.0.0
100+
101+
#### .NET Standard
102+
103+
- Microsoft.Data.SqlClient.SNI.runtime 4.0.0-preview1.21232.1
104+
- Azure.Identity 1.3.0
105+
- Microsoft.Identity.Client 4.22.0
106+
- Microsoft.IdentityModel.Protocols.OpenIdConnect 6.8.0
107+
- Microsoft.IdentityModel.JsonWebTokens 6.8.0
108+
- Microsoft.Win32.Registry 5.0.0
109+
- System.Buffers 4.5.1
110+
- System.Configuration.ConfigurationManager 5.0.0
111+
- System.IO 4.3.0
112+
- System.Runtime.Caching 5.0.0
113+
- System.Text.Encoding.CodePages 5.0.0
114+
- System.Text.Encodings.Web 4.7.2
115+
- System.Resources.ResourceManager 4.3.0
116+
- System.Runtime.Loader 4.3.0
117+
- System.Security.Cryptography.Cng 5.0.0
118+
- System.Security.Principal.Windows 5.0.0

‎release-notes/4.0/4.0.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ The following Microsoft.Data.SqlClient 4.0 preview releases have been shipped:
44

55
| Release Date | Version | Notes |
66
| :-- | :-- | :--: |
7+
| 2021/10/20 | 4.0.0-preview3.21293.2 | [release notes](4.0.0-preview3.md) |
78
| 2021/09/21 | 4.0.0-preview2.21264.2 | [release notes](4.0.0-preview2.md) |
89
| 2021/08/25 | 4.0.0-preview1.21237.2 | [release notes](4.0.0-preview1.md) |

‎release-notes/4.0/README.md‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@ The following Microsoft.Data.SqlClient 4.0 preview releases have been shipped:
44

55
| Release Date | Version | Notes |
66
| :-- | :-- | :--: |
7+
| 2021/10/20 | 4.0.0-preview3.21293.2 | [release notes](4.0.0-preview3.md) |
78
| 2021/09/21 | 4.0.0-preview2.21264.2 | [release notes](4.0.0-preview2.md) |
89
| 2021/08/25 | 4.0.0-preview1.21237.2 | [release notes](4.0.0-preview1.md) |

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -636,10 +636,10 @@
636636
</ItemGroup>
637637
<!-- Resources -->
638638
<ItemGroup>
639-
<Compile Include="Resources\$(ResxFileName).Designer.cs">
639+
<Compile Include="Resources\Strings.Designer.cs">
640640
<AutoGen>True</AutoGen>
641641
<DesignTime>True</DesignTime>
642-
<DependentUpon>$(ResxFileName).resx</DependentUpon>
642+
<DependentUpon>Strings.resx</DependentUpon>
643643
</Compile>
644644
<Compile Include="..\..\src\Resources\StringsHelper.cs">
645645
<Link>Resources\StringsHelper.cs</Link>

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlConnection.cs‎

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2267,15 +2267,6 @@ internal TdsParser Parser
22672267
}
22682268
}
22692269

2270-
internal bool Asynchronous
2271-
{
2272-
get
2273-
{
2274-
SqlConnectionString constr = (SqlConnectionString)ConnectionOptions;
2275-
return ((null != constr) ? constr.Asynchronous : SqlConnectionString.DEFAULT.Asynchronous);
2276-
}
2277-
}
2278-
22792270
//
22802271
// INTERNAL METHODS
22812272
//

‎src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlUtil.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -461,9 +461,9 @@ static internal Exception AuthenticationAndIntegratedSecurity()
461461
{
462462
return ADP.Argument(StringsHelper.GetString(Strings.SQL_AuthenticationAndIntegratedSecurity));
463463
}
464-
static internal Exception IntegratedWithUserIDAndPassword()
464+
static internal Exception IntegratedWithPassword()
465465
{
466-
return ADP.Argument(StringsHelper.GetString(Strings.SQL_IntegratedWithUserIDAndPassword));
466+
return ADP.Argument(StringsHelper.GetString(Strings.SQL_IntegratedWithPassword));
467467
}
468468
static internal Exception InteractiveWithPassword()
469469
{

‎src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.Designer.cs‎

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

‎src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.de.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2493,8 +2493,8 @@
24932493
<data name="SQL_AuthenticationAndIntegratedSecurity" xml:space="preserve">
24942494
<value>"Authentication" kann nicht mit "Integrated Security" verwendet werden.</value>
24952495
</data>
2496-
<data name="SQL_IntegratedWithUserIDAndPassword" xml:space="preserve">
2497-
<value>"Authentication=Active Directory Integrated" kann nicht mit den Schlüsselwörtern "User ID", "UID", "Password" oder "PWD" für die Verbindungszeichenfolge verwendet werden.</value>
2496+
<data name="SQL_IntegratedWithPassword" xml:space="preserve">
2497+
<value>"Authentication=Active Directory Integrated" kann nicht mit den Schlüsselwörtern "Password" oder "PWD" für die Verbindungszeichenfolge verwendet werden.</value>
24982498
</data>
24992499
<data name="SQL_InteractiveWithPassword" xml:space="preserve">
25002500
<value>"Authentication=Active Directory Interactive" kann nicht mit den Schlüsselwörtern "Password" oder "PWD" für die Verbindungszeichenfolge verwendet werden.</value>

‎src/Microsoft.Data.SqlClient/netfx/src/Resources/Strings.es.resx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2493,8 +2493,8 @@
24932493
<data name="SQL_AuthenticationAndIntegratedSecurity" xml:space="preserve">
24942494
<value>No se puede usar 'Authentication' con 'Integrated Security'.</value>
24952495
</data>
2496-
<data name="SQL_IntegratedWithUserIDAndPassword" xml:space="preserve">
2497-
<value>No se puede usar "Authentication=Active Directory Integrated" con las palabras clave de cadena de conexión "User ID", "UID", "Password" ni "PWD".</value>
2496+
<data name="SQL_IntegratedWithPassword" xml:space="preserve">
2497+
<value>Cannot use 'Authentication=Active Directory Integrated' with 'Password' or 'PWD' connection string keywords.</value>
24982498
</data>
24992499
<data name="SQL_InteractiveWithPassword" xml:space="preserve">
25002500
<value>No se puede usar "Authentication=Active Directory Interactive" con las palabras clave de cadena de conexión "Password" ni "PWD".</value>

0 commit comments

Comments
 (0)