Skip to content

Commit 7b24693

Browse files
authored
Merge branch 'main' into merge-tdsparser-typealiases
2 parents 9ca5992 + 2151501 commit 7b24693

File tree

69 files changed

+1379
-4087
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

69 files changed

+1379
-4087
lines changed

BUILDGUIDE.md

Lines changed: 93 additions & 129 deletions
Large diffs are not rendered by default.

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Microsoft.Data.SqlClient is a .NET data provider for [Microsoft SQL Server]([url
1111
The Microsoft.Data.SqlClient package supports the following environments:
1212

1313
- .NET Framework 4.6.2+
14-
- .NET 6.0+
14+
- .NET 8.0
1515

1616
## Download
1717

RunProjectReferenceTests.cmd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ call :pauseOnError msbuild -t:Clean
2828

2929
echo Building .NET Framework %netfxVersion% Tests ...
3030
call :pauseOnError msbuild -p:Configuration="Release"
31-
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildAKVNetStAllOS
3231
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildAKVNetFx
3332
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetFx -p:TargetNetFxVersion=%netfxVersion%
3433

@@ -40,7 +39,6 @@ echo Building .NET %netcoreVersion% Tests ...
4039
call pause
4140
call :pauseOnError msbuild -t:Clean
4241
call :pauseOnError msbuild -p:Configuration="Release"
43-
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildAKVNetStAllOS
4442
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildAKVNetCoreAllOS
4543
call :pauseOnError msbuild -p:Configuration="Release" -t:BuildTestsNetCore -p:TargetNetCoreVersion=%netcoreVersion%
4644

buildAddons.cmd

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@ call :pauseOnError msbuild -p:configuration=Release -t:clean
22
call :pauseOnError msbuild -p:configuration=Release -t:BuildAllConfigurations
33
call :pauseOnError msbuild -p:configuration=Release -t:BuildAKVNetFx
44
call :pauseOnError msbuild -p:configuration=Release -t:BuildAKVNetCoreAllOS
5-
call :pauseOnError msbuild -p:configuration=Release -t:BuildAKVNetStAllOS
65
call :pauseOnError msbuild -p:configuration=Release -t:GenerateAKVProviderNugetPackage
76

87
goto :eof

contributing-workflow.md

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,6 @@ We use and recommend the following workflow:
3333
3434
## PR - CI Process
3535

36-
_[Coming Soon - Currently under development]_
37-
3836
The [SqlClient Continuous Integration](https://dev.azure.com/sqlclientdrivers-ci/sqlclient/) (CI) system will automatically perform the required builds and run tests (including the ones you are expected to run) for PRs. Builds and test runs must be clean.
3937

4038
If the CI build fails for any reason, the PR issue will be updated with a link that can be used to determine the cause of the failure.

doc/snippets/Microsoft.Data.SqlClient/SQLDebugging.xml

Lines changed: 0 additions & 14 deletions
This file was deleted.

eng/pipelines/dotnet-sqlclient-ci-core.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -384,7 +384,7 @@ stages:
384384
pool: $(defaultHostedPoolName)
385385
hostedPool: true
386386
images:
387-
MacOS12_Azure_Sql: macOS-12
387+
MacOSLatest_Azure_Sql: macos-latest
388388
TargetFrameworks: ${{parameters.targetFrameworksLinux }}
389389
netcoreVersionTestUtils: ${{parameters.netcoreVersionTestUtils }}
390390
buildPlatforms: [AnyCPU]

porting-cheat-sheet.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ For .NET Framework projects it may be necessary to include the following in your
3737
<DbProviderFactories>
3838
<add name="SqlClient Data Provider"
3939
invariant="Microsoft.Data.SqlClient"
40-
description=".Net Framework Data Provider for SqlServer"
40+
description=".Net Framework Data Provider for SqlServer"
4141
type="Microsoft.Data.SqlClient.SqlClientFactory, Microsoft.Data.SqlClient" />
4242
</DbProviderFactories>
4343
</system.data>
@@ -52,6 +52,7 @@ For .NET Framework projects it may be necessary to include the following in your
5252
| Can use DateTime object as value for SqlParameter with type `DbType.Time`. | Must use TimeSpan object as value for SqlParameter with type `DbType.Time`. |
5353
| Using DateTime object as value for SqlParameter with type `DbType.Date` would send date and time to SQL Server. | DateTime object's time components will be truncated when sent to SQL Server using `DbType.Date`. |
5454
| `Encrypt` defaults to `false`. | Starting in v4.0, default encryption settings were made more secure, requiring opt-in to non-encrypted connections. `Encrypt` defaults to `true` and the driver will always validate the server certificate based on `TrustServerCertificate`. (Previously, server certificates would only be validated if `Encrypt` was also `true`.)<br/><br/>If you need to turn off encryption, you must specify `Encrypt=false`. If you use encryption with a self-signed certificate on the server, you must specify `TrustServerCertificate=true`.<br/><br/>In v5.0, `SqlConnectionStringBuilder.Encrypt` is no longer a `bool`. It's a `SqlConnectionEncryptOption` with multiple values to support `Strict` encryption mode (TDS 8.0). It uses implicit conversion operators to remain code-backwards compatible, but it was a binary breaking change, requiring a recompile of applications. |
55+
| ConnectionString property uses non-backward compatible keywords with spaces. | The `SqlConnectionStringBuilder` has a `ConnectionString` property that can be used to get the connection string to connect with. The [`Microsoft.Data.SqlClient` connection string](https://learn.microsoft.com/en-us/dotnet/api/microsoft.data.sqlclient.sqlconnection.connectionstring) and the [`System.Data.SqlClient` connection string](https://learn.microsoft.com/en-us/dotnet/api/system.data.sqlclient.sqlconnection.connectionstring) do not support all of the same keywords, so be mindful of that. The `Microsoft.Data.SqlClient` also adds new aliases for some existing keywords. For example, `Microsoft.Data.SqlClient` now supports `Application Intent=ReadOnly` and `Multi Subnet Failover=True`, in addition to the previous `ApplicationIntent=ReadOnly` and `MultiSubnetFailover=True` (notice the spaces in the keywords). Unfortunately, the `SqlConnectionStringBuilder.ConnectionString` uses the new aliases with spaces, which do not exist and are unsupported in `System.Data.SqlClient`. This means if you build a connection string with `Microsoft.Data.SqlClient`, but attempt to use it in an application using `System.Data.SqlClient`, the connection string will not be valid for `System.Data.SqlClient`; you will need to sanitize the connection string by removing the spaces from the keywords. |
5556

5657
## .NET Framework to .NET Considerations
5758

src/Microsoft.Data.SqlClient.sln

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -128,7 +128,6 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Microsoft.Data.SqlClient",
128128
..\doc\snippets\Microsoft.Data.SqlClient\SqlCredential.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlCredential.xml
129129
..\doc\snippets\Microsoft.Data.SqlClient\SqlDataAdapter.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlDataAdapter.xml
130130
..\doc\snippets\Microsoft.Data.SqlClient\SqlDataReader.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlDataReader.xml
131-
..\doc\snippets\Microsoft.Data.SqlClient\SQLDebugging.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SQLDebugging.xml
132131
..\doc\snippets\Microsoft.Data.SqlClient\SqlDependency.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlDependency.xml
133132
..\doc\snippets\Microsoft.Data.SqlClient\SqlEnclaveAttestationParameters.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlEnclaveAttestationParameters.xml
134133
..\doc\snippets\Microsoft.Data.SqlClient\SqlEnclaveSession.xml = ..\doc\snippets\Microsoft.Data.SqlClient\SqlEnclaveSession.xml

src/Microsoft.Data.SqlClient/netcore/src/Common/System/Net/InternalException.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,8 @@
22
// The .NET Foundation licenses this file to you under the MIT license.
33
// See the LICENSE file in the project root for more information.
44

5+
#if NET && !NET8_0_OR_GREATER
6+
57
namespace System.Net
68
{
79
[Serializable]
@@ -21,3 +23,5 @@ public InternalException(string message, Exception innerException) : base(messag
2123
}
2224
}
2325
}
26+
27+
#endif

0 commit comments

Comments
 (0)