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

Move to Shared for SqlEnums.cs #1317

Merged
merged 38 commits into from
Oct 15, 2021
Merged

Move to Shared for SqlEnums.cs #1317

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
71d0fcc
Merge netfx to netcore for SqlEnums.cs
lcheunglci Oct 5, 2021
39bc22c
Move the netcore version of SqlEnums.cs into shared src and update th…
lcheunglci Oct 5, 2021
cf6d691
Update file to conform with coding style cleaning up IDE0900
lcheunglci Oct 5, 2021
9a25465
Update file to conform to coding style cleaning up IDE0090 IDE0066 an…
lcheunglci Oct 5, 2021
7392ad4
Fix the debug compiler error due to the ifdef
lcheunglci Oct 5, 2021
31d980c
Add the MDAC code comments from netfx back in
lcheunglci Oct 5, 2021
9b9033e
Resolve merge conflict
lcheunglci Oct 12, 2021
6c46392
Merging common code bases DbConnectionStringCommon (#1265)
DavoudEshtehari Oct 12, 2021
8a7a5f5
Fix broken links (#1341)
ErikEJ Oct 13, 2021
f88b7e4
Skip reliability tests on enclave server (#1340)
DavoudEshtehari Oct 13, 2021
7305c1c
Move to Shared -SqlDataRecord (#1309)
Kaur-Parminder Oct 13, 2021
7583486
Move into Shared for SqlCommandBuilder.cs (#1284)
lcheunglci Oct 13, 2021
1f7ae36
Replace some methods with body expressions
lcheunglci Oct 13, 2021
d8b59b6
Fixed ActiveDirectoryAuthenticationProvider constructors. (#1328)
smichtch Oct 13, 2021
b75dfb5
Move to Shared for SqlConnectionPoolGroupProviderInfo.cs (#1323)
lcheunglci Oct 13, 2021
d4c8ea0
Move into Shared SqlErrorCollection.cs (#1305)
lcheunglci Oct 13, 2021
b659f88
Move to Shared SmiEventSink and SmiEventSinkDefault (#1324)
Kaur-Parminder Oct 13, 2021
73919ca
Move into Shared SqlNotificationEventArgs.cs (#1314)
lcheunglci Oct 14, 2021
3a10d55
Move to shared - ValueUtilsSmi (#1326)
Kaur-Parminder Oct 14, 2021
39b416f
Merge netfx to netcore for SqlEnums.cs
lcheunglci Oct 5, 2021
5ec6d04
Move the netcore version of SqlEnums.cs into shared src and update th…
lcheunglci Oct 5, 2021
2647809
Update file to conform with coding style cleaning up IDE0900
lcheunglci Oct 5, 2021
a8ffab8
Update file to conform to coding style cleaning up IDE0090 IDE0066 an…
lcheunglci Oct 5, 2021
460d163
Fix the debug compiler error due to the ifdef
lcheunglci Oct 5, 2021
1487376
Add the MDAC code comments from netfx back in
lcheunglci Oct 5, 2021
cf867e4
Replace some methods with body expressions
lcheunglci Oct 13, 2021
04cdeff
Move to Shared for SqlException.cs (#1300)
lcheunglci Oct 15, 2021
1dc9647
Move the netcore version of SqlReferenceCollection.cs into share src …
lcheunglci Oct 15, 2021
bc4046f
Move to Shared for SqlDependency.cs (#1299)
lcheunglci Oct 15, 2021
4223dba
Resolve merge conflict
lcheunglci Oct 15, 2021
f08e121
Merge netfx to netcore for SqlEnums.cs
lcheunglci Oct 5, 2021
416eec5
Move the netcore version of SqlEnums.cs into shared src and update th…
lcheunglci Oct 5, 2021
1c5d278
Update file to conform with coding style cleaning up IDE0900
lcheunglci Oct 5, 2021
f527232
Update file to conform to coding style cleaning up IDE0090 IDE0066 an…
lcheunglci Oct 5, 2021
fcbe710
Fix the debug compiler error due to the ifdef
lcheunglci Oct 5, 2021
4235f41
Add the MDAC code comments from netfx back in
lcheunglci Oct 5, 2021
b88a666
Replace some methods with body expressions
lcheunglci Oct 13, 2021
61528ec
Resolve merge conflict
lcheunglci Oct 15, 2021
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
9 changes: 6 additions & 3 deletions release-notes/3.0/3.0.0.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,9 +102,12 @@ public SqlCommand
```

API Usage examples can be found here:
[SqlConnection retry sample](..\..\doc\samples\SqlConfigurableRetryLogic_OpenConnection.cs)
[SqlCommand retry sample](..\..\doc\samples\SqlConfigurableRetryLogic_SqlCommand.cs)
[Sample for retry logic options](..\..\doc\samples\SqlConfigurableRetryLogic_SqlRetryLogicOptions.cs)

[SqlConnection retry sample](../../doc/samples/SqlConfigurableRetryLogic_OpenConnection.cs)

[SqlCommand retry sample](../../doc/samples/SqlConfigurableRetryLogic_SqlCommand.cs)

[Sample for retry logic options](../../doc/samples/SqlConfigurableRetryLogic_SqlRetryLogicOptions.cs)

New configuration sections have also been introduced to do the same registration from configuration files, without having to modify existing code:

Expand Down
55 changes: 42 additions & 13 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft.Data.SqlClient.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,9 @@
<Compile Include="..\..\src\Microsoft\Data\Common\ActivityCorrelator.cs">
<Link>Microsoft\Data\Common\ActivityCorrelator.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\Common\DbConnectionStringCommon.cs">
<Link>Microsoft\Data\Common\DbConnectionStringCommon.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\Common\DbConnectionPoolKey.cs">
<Link>Microsoft\Data\Common\DbConnectionPoolKey.cs</Link>
</Compile>
Expand Down Expand Up @@ -154,6 +157,12 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiMetaData.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiMetaData.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlDataRecord.cs">
<Link>Microsoft\Data\SqlClient\Server\SqlDataRecord.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlDataRecord.netcore.cs">
<Link>Microsoft\Data\SqlClient\Server\SqlDataRecord.netcore.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs">
<Link>Microsoft\Data\SqlClient\ColumnEncryptionKeyInfo.cs</Link>
</Compile>
Expand Down Expand Up @@ -232,9 +241,15 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs">
<Link>Microsoft\Data\SqlClient\SqlColumnEncryptionKeyStoreProvider.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCommandBuilder.cs">
<Link>Microsoft\Data\SqlClient\SqlCommandBuilder.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlCommandSet.cs">
<Link>Microsoft\Data\SqlClient\SqlCommandSet.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlConnectionPoolProviderInfo.cs</Link>
</Compile>
Expand All @@ -244,9 +259,24 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDataAdapter.cs">
<Link>Microsoft\Data\SqlClient\SqlDataAdapter.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlDependency.cs">
<Link>Microsoft\Data\SqlClient\SqlDependency.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlEnums.cs">
<Link>Microsoft\Data\SqlClient\SqlEnums.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlErrorCollection.cs">
<Link>Microsoft\Data\SqlClient\SqlErrorCollection.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlException.cs">
<Link>Microsoft\Data\SqlClient\SqlException.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs">
<Link>Microsoft\Data\SqlClient\SqlInfoMessageEventHandler.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs">
<Link>Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlNotificationInfo.cs">
<Link>Microsoft\Data\SqlClient\SqlNotificationInfo.cs</Link>
</Compile>
Expand All @@ -265,6 +295,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs">
<Link>Microsoft\Data\SqlClient\SqlQueryMetadataCache.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlReferenceCollection.cs">
<Link>Microsoft\Data\SqlClient\SqlReferenceCollection.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs">
<Link>Microsoft\Data\SqlClient\SqlRowUpdatedEvent.cs</Link>
</Compile>
Expand Down Expand Up @@ -304,6 +337,9 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs">
<Link>Microsoft\Data\SqlClient\Server\SqlRecordBuffer.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs">
<Link>Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SignatureVerificationCache.cs">
<Link>Microsoft\Data\SqlClient\SignatureVerificationCache.cs</Link>
</Compile>
Expand All @@ -322,6 +358,12 @@
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiTypedGetterSetter.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiEventSink.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs">
<Link>Microsoft\Data\SqlClient\Server\SmiEventSink_Default.Common.cs</Link>
</Compile>
<Compile Include="..\..\src\Microsoft\Data\SqlClient\Reliability\Common\SqlRetryingEventArgs.cs">
<Link>Microsoft\Data\SqlClient\Reliability\SqlRetryingEventArgs.cs</Link>
</Compile>
Expand Down Expand Up @@ -458,15 +500,10 @@
</EmbeddedResource>
<Compile Include="Microsoft\Data\SqlClient\AAsyncCallContext.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\MetadataUtilsSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventSink.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiEventSink_Default.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiMetaDataProperty.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SmiXetterAccessMap.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\SqlDataRecord.cs" />
<Compile Include="Microsoft\Data\SqlClient\Server\ValueUtilsSmi.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDbColumn.cs" />
<Compile Include="Microsoft\Data\Common\DbConnectionOptions.cs" />
<Compile Include="Microsoft\Data\Common\DbConnectionStringCommon.cs" />
<Compile Include="$(CommonPath)\Microsoft\Data\ProviderBase\DbConnectionInternal.cs">
<Link>Common\Microsoft\Data\ProviderBase\DbConnectionInternal.cs</Link>
</Compile>
Expand Down Expand Up @@ -503,38 +540,30 @@
<Compile Include="Microsoft\Data\SqlClient\SqlClientDiagnosticListenerExtensions.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlClientFactory.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlCommand.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlCommandBuilder.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionFactory.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionHelper.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionPoolGroupProviderInfo.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionPoolKey.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionString.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlConnectionStringBuilder.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs">
<Link>Microsoft\Data\SqlClient\SqlConnectionTimeoutErrorInternal.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlDataReader.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependency.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyListener.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDependencyUtils.AppDomain.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlDelegatedTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlEnums.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlError.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlErrorCollection.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlEnclaveSession.cs">
<Link>Microsoft\Data\SqlClient\SqlEnclaveSession.cs</Link>
</Compile>
<Compile Include="Microsoft\Data\SqlClient\SqlException.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInfoMessageEvent.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalConnectionTds.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlInternalTransaction.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlMetadataFactory.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlNotificationEventArgs.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlParameter.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlReferenceCollection.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialStream.cs" />
<Compile Include="Microsoft\Data\SqlClient\SqlSequentialTextReader.cs" />
<Compile Include="..\..\src\Microsoft\Data\SqlClient\SqlStatistics.cs">
Expand Down
25 changes: 0 additions & 25 deletions src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/Server/SmiEventSink.cs
View file
Open in desktop

This file was deleted.

Loading