From cf6df42d0218f5fb86bac22e7bd31e100bf2a168 Mon Sep 17 00:00:00 2001 From: Erik Ejlskov Jensen Date: Sat, 29 Nov 2025 14:20:02 +0100 Subject: [PATCH] Refactor and update sample project build. Scope: Make samples build with nor or minimal changes to actual snippets usied in docs. Added namespaces to organize code and prevent naming conflicts. Used filename as namespace, and for files with names of classes, added "CS" to namespace Adjusted `using` directives to include necessary references to make build pass. Wrapped code snippets in conditional compilation directives for mostly .NET Framework-specific APIs. Made some changes to the .csproj file to enable local "dotnet build" - happy to revert as needed. --- ...tionClientIdAzureAuthenticationProvider.cs | 2 +- .../AzureKeyVaultProviderExample_2_0.cs | 2 +- ...VaultProviderWithEnclaveProviderExample.cs | 6 ++-- ...tProviderWithEnclaveProviderExample_2_0.cs | 2 +- ...tProvider_ColumnEncryptionKeyCacheScope.cs | 2 +- ...ectionStringSettings_RetrieveFromConfig.cs | 4 ++- ...StringSettings_RetrieveFromConfigByName.cs | 4 ++- ...ngSettings_RetrieveFromConfigByProvider.cs | 4 ++- doc/samples/ConnectionStringsWeb_Encrypt.cs | 8 +++++- doc/samples/ConnectionStrings_Encrypt.cs | 6 ++-- ...viceCodeFlowAzureAuthenticationProvider.cs | 2 +- doc/samples/DataColumn_DataType.cs | 2 ++ doc/samples/DataTableReader_GetValues.cs | 2 ++ doc/samples/IBinarySerialize.cs | 2 +- doc/samples/IDbCommand_CommandTimeout.cs | 4 +++ doc/samples/Isolation_Snapshot.cs | 2 ++ doc/samples/Isolation_Snapshot1.cs | 2 ++ .../Microsoft.Data.SqlClient.Samples.csproj | 4 ++- .../DataWorks_IBinarySerialize_Sample.cs | 2 +- .../DataWorks_SqlFunctionAttribute_Sample.cs | 6 ++-- ...SqlUserDefinedAggregateAttribute_Sample.cs | 4 ++- ...orks_SqlUserDefinedTypeAttribute_Sample.cs | 4 ++- .../SqlFunctionAttribute_SqlFunction.cs | 4 ++- .../csharp/SqlMethod.cs | 2 ++ ...serDefinedAggregateAttribute_Aggregate1.cs | 4 ++- .../SqlUserDefinedTypeAttribute_Type1.cs | 8 ++++-- ...ustomKeyStoreProvider_CommandPrecedence.cs | 27 ++++++++++++++++-- ...omKeyStoreProvider_ConnectionPrecedence.cs | 28 +++++++++++++++++-- .../RegisterCustomKeyStoreProvider_Example.cs | 9 ++++-- doc/samples/SqlBatch_ExecuteReader.cs | 7 +++++ doc/samples/SqlBulkCopyOptions_Default.cs | 2 ++ ...lBulkCopyOptions_UseInternalTransaction.cs | 2 ++ doc/samples/SqlBulkCopy_BatchSize.cs | 3 ++ doc/samples/SqlBulkCopy_ColumnMapping.cs | 2 ++ .../SqlBulkCopy_ColumnMappingColNameIndex.cs | 2 ++ .../SqlBulkCopy_ColumnMappingCollection.cs | 2 ++ ...BulkCopy_ColumnMappingCollectionOrdinal.cs | 2 ++ ...BulkCopy_ColumnMappingDestinationColumn.cs | 2 ++ ...ulkCopy_ColumnMappingDestinationOrdinal.cs | 4 +++ .../SqlBulkCopy_ColumnMappingIndexColName.cs | 2 ++ .../SqlBulkCopy_ColumnMappingNameOrdinal.cs | 2 ++ .../SqlBulkCopy_ColumnMappingOrdersDetails.cs | 2 ++ .../SqlBulkCopy_ColumnMappingOrdinal.cs | 2 ++ .../SqlBulkCopy_ColumnMappingOrdinalName.cs | 2 ++ .../SqlBulkCopy_ColumnMappingRemove.cs | 2 ++ .../SqlBulkCopy_ColumnMappingRemoveAt.cs | 2 ++ doc/samples/SqlBulkCopy_ColumnOrderHint.cs | 2 ++ .../SqlBulkCopy_ColumnOrderHintCollection.cs | 2 ++ ...qlBulkCopy_ColumnOrderHintCollectionAdd.cs | 2 ++ ...lBulkCopy_ColumnOrderHintCollectionAdd2.cs | 2 ++ ...BulkCopy_ColumnOrderHintCollectionClear.cs | 2 ++ ...ulkCopy_ColumnOrderHintCollectionRemove.cs | 2 ++ ...kCopy_ColumnOrderHintCollectionRemoveAt.cs | 2 ++ .../SqlBulkCopy_ColumnOrderHintColumn.cs | 2 ++ .../SqlBulkCopy_ColumnOrderHintSortOrder.cs | 2 ++ doc/samples/SqlBulkCopy_ConnectionString.cs | 2 ++ doc/samples/SqlBulkCopy_DataRowState.cs | 2 ++ doc/samples/SqlBulkCopy_DataTable.cs | 2 ++ .../SqlBulkCopy_ExternalTransaction.cs | 2 ++ doc/samples/SqlBulkCopy_KeepIdentity.cs | 2 ++ doc/samples/SqlBulkCopy_NotifyAfter.cs | 2 ++ doc/samples/SqlBulkCopy_OrdersDetails.cs | 2 ++ doc/samples/SqlBulkCopy_RowArray.cs | 2 ++ doc/samples/SqlBulkCopy_Single.cs | 2 ++ doc/samples/SqlBulkCopy_Timeout.cs | 2 ++ doc/samples/SqlBulkCopy_WriteToServer.cs | 2 ++ doc/samples/SqlBytes_Stream.cs | 4 +++ doc/samples/SqlClientDiagnosticCounter.cs | 5 +++- doc/samples/SqlClientEventSource.cs | 4 ++- .../SqlClientFactory_DataSourceEnumerator.cs | 2 ++ doc/samples/SqlClientFactory_Netcoreapp.cs | 4 +++ doc/samples/SqlClientPermission_Demand.cs | 4 +++ ...SqlClient_AsyncProgramming_Cancellation.cs | 2 +- ...AsyncProgramming_DistributedTransaction.cs | 2 ++ ...lient_AsyncProgramming_MultipleCommands.cs | 3 ++ ...ent_AsyncProgramming_MultipleCommandsEx.cs | 5 +++- ...qlClient_AsyncProgramming_ProviderModel.cs | 4 ++- ...lClient_AsyncProgramming_SqlTransaction.cs | 2 ++ doc/samples/SqlClient_PerformanceCounter.cs | 6 ++-- doc/samples/SqlClient_RetrieveIdentity.cs | 2 +- doc/samples/SqlClient_Streaming_FromServer.cs | 2 +- .../SqlClient_Streaming_ServerToServer.cs | 2 +- doc/samples/SqlClient_Streaming_ToServer.cs | 2 +- doc/samples/SqlCommandBuilder_Create.cs | 2 +- .../SqlCommand_BeginExecuteNonQuery.cs | 2 ++ .../SqlCommand_BeginExecuteNonQueryForm.cs | 2 ++ doc/samples/SqlCommand_BeginExecuteReader.cs | 4 ++- ...Command_BeginExecuteReaderAsyncBehavior.cs | 2 +- ...qlCommand_BeginExecuteReaderAsyncSimple.cs | 2 ++ .../SqlCommand_BeginExecuteXmlReader.cs | 2 ++ .../SqlCommand_BeginExecuteXmlReaderAsync.cs | 4 ++- doc/samples/SqlCommand_Cancel.cs | 2 ++ doc/samples/SqlCommand_CommandText.cs | 4 +++ doc/samples/SqlCommand_CommandTimeout.cs | 2 ++ doc/samples/SqlCommand_Connection.cs | 2 +- doc/samples/SqlCommand_ExecuteNonQuery.cs | 2 +- .../SqlCommand_ExecuteNonQueryAsync.cs | 2 ++ .../SqlCommand_ExecuteNonQuery_SP_DML.cs | 4 +-- doc/samples/SqlCommand_ExecuteReader.cs | 4 +-- doc/samples/SqlCommand_ExecuteReader2.cs | 4 ++- ...lCommand_ExecuteReader_SequentialAccess.cs | 2 ++ doc/samples/SqlCommand_ExecuteScalar.cs | 2 ++ .../SqlCommand_ExecuteScalar_Return_Id.cs | 4 ++- doc/samples/SqlCommand_ExecuteXmlReader.cs | 18 +++++++----- doc/samples/SqlCommand_Intro.cs | 2 ++ doc/samples/SqlCommand_Prepare.cs | 2 +- doc/samples/SqlCommand_SqlCommand1.cs | 4 +++ doc/samples/SqlCommand_SqlCommand2.cs | 2 +- doc/samples/SqlCommand_StoredProcedure.cs | 5 +++- ...qlConfigurableRetryLogic_OpenConnection.cs | 2 ++ .../SqlConfigurableRetryLogic_SqlCommand.cs | 8 ++++++ ...igurableRetryLogic_SqlRetryLogicOptions.cs | 2 ++ ...bleRetryLogic_StepByStep_CustomProvider.cs | 2 +- ...bleRetryLogic_StepByStep_OpenConnection.cs | 2 ++ doc/samples/SqlConnectionStringBuilder.cs | 2 ++ doc/samples/SqlConnectionStringBuilder2.cs | 2 ++ doc/samples/SqlConnectionStringBuilder3.cs | 2 ++ ...ConnectionStringBuilder_ApplicationName.cs | 2 ++ ...onnectionStringBuilder_AttachDBFilename.cs | 2 ++ .../SqlConnectionStringBuilder_Clear.cs | 2 ++ ...lConnectionStringBuilder_ConnectTimeout.cs | 2 ++ .../SqlConnectionStringBuilder_ContainsKey.cs | 2 ++ .../SqlConnectionStringBuilder_DataSource.cs | 2 ++ ...lConnectionStringBuilder_InitialCatalog.cs | 2 ++ ...ConnectionStringBuilder_InjectionAttack.cs | 2 ++ ...nectionStringBuilder_IntegratedSecurity.cs | 2 ++ .../SqlConnectionStringBuilder_Keys.cs | 2 ++ ...nStringBuilder_MultipleActiveResultSets.cs | 2 ++ .../SqlConnectionStringBuilder_Password.cs | 2 ++ .../SqlConnectionStringBuilder_Remove.cs | 2 ++ .../SqlConnectionStringBuilder_TryGetValue.cs | 3 +- .../SqlConnectionStringBuilder_UserNamePwd.cs | 4 ++- .../SqlConnectionStringBuilder_Values.cs | 2 ++ .../SqlConnection_AccessTokenCallback.cs | 2 ++ doc/samples/SqlConnection_BeginTransaction.cs | 2 +- .../SqlConnection_BeginTransaction1.cs | 2 ++ .../SqlConnection_BeginTransaction2.cs | 2 +- .../SqlConnection_BeginTransaction3.cs | 2 +- doc/samples/SqlConnection_ConnectionString.cs | 2 ++ .../SqlConnection_ConnectionString1.cs | 2 ++ .../SqlConnection_ConnectionTimeout.cs | 2 ++ doc/samples/SqlConnection_CreateCommand.cs | 2 ++ doc/samples/SqlConnection_DataSource.cs | 2 ++ doc/samples/SqlConnection_Database.cs | 2 ++ doc/samples/SqlConnection_GetSchema.cs | 2 ++ .../SqlConnection_GetSchema_Restriction.cs | 2 ++ doc/samples/SqlConnection_GetSchema_Tables.cs | 2 ++ .../SqlConnection_InfoMessage_StateChange.cs | 2 +- doc/samples/SqlConnection_Open.cs | 2 ++ .../SqlConnection_OpenAsync_ContinueWith.cs | 2 ++ doc/samples/SqlConnection_PacketSize.cs | 2 ++ doc/samples/SqlConnection_Pooling.cs | 2 ++ .../SqlConnection_Pooling_Use_Statement.cs | 2 ++ doc/samples/SqlConnection_ServerVersion.cs | 2 +- doc/samples/SqlConnection_SqlConnection.cs | 2 ++ doc/samples/SqlConnection_SqlConnection1.cs | 2 ++ doc/samples/SqlConnection_WorkstationId.cs | 2 ++ doc/samples/SqlDataAdapter.cs | 2 ++ doc/samples/SqlDataAdapter_Batch.cs | 2 +- doc/samples/SqlDataAdapter_Concurrency.cs | 2 ++ doc/samples/SqlDataAdapter_Events.cs | 2 +- doc/samples/SqlDataAdapter_FillDataSet.cs | 2 +- doc/samples/SqlDataAdapter_MergeIdentity.cs | 4 ++- doc/samples/SqlDataAdapter_Paging.cs | 2 +- doc/samples/SqlDataAdapter_Properties.cs | 22 +++++++-------- ...Adapter_RetrieveIdentityStoredProcedure.cs | 4 ++- doc/samples/SqlDataAdapter_RowUpdated.cs | 4 +++ .../SqlDataAdapter_SPIdentityReturn.cs | 6 ++-- doc/samples/SqlDataAdapter_SelectCommand.cs | 4 +++ doc/samples/SqlDataAdapter_SqlDataAdapter.cs | 2 ++ doc/samples/SqlDataAdapter_SqlDataAdapter1.cs | 2 ++ doc/samples/SqlDataAdapter_SqlDataAdapter2.cs | 2 ++ doc/samples/SqlDataAdapter_SqlDataAdapter3.cs | 2 ++ doc/samples/SqlDataAdapter_TableMappings.cs | 2 +- doc/samples/SqlDataAdapter_Update.cs | 5 ++-- doc/samples/SqlDataReader_Close.cs | 2 ++ ...taReader_DataDiscoveryAndClassification.cs | 6 ++-- doc/samples/SqlDataReader_GetOrdinal.cs | 2 ++ doc/samples/SqlDataReader_GetSchemaTable.cs | 2 +- doc/samples/SqlDataReader_GetSqlXml.cs | 2 ++ doc/samples/SqlDataReader_HasRows.cs | 2 +- doc/samples/SqlDataReader_IsDBNull.cs | 2 ++ doc/samples/SqlDataReader_NextResult.cs | 2 +- doc/samples/SqlDataReader_Read.cs | 2 ++ doc/samples/SqlDataRecord.cs | 10 +++++-- doc/samples/SqlDataSourceEnumeratorExample.cs | 2 ++ .../SqlDataSourceEnumeratorVersionExample.cs | 2 ++ doc/samples/SqlDependency_Start.cs | 6 ++++ doc/samples/SqlError_State.cs | 2 +- doc/samples/SqlError_ToString.cs | 2 ++ doc/samples/SqlException_Errors1.cs | 2 ++ doc/samples/SqlException_Errors2.cs | 2 ++ doc/samples/SqlFunction.cs | 4 ++- doc/samples/SqlFunctionAttribute.cs | 2 ++ doc/samples/SqlGuid.cs | 2 ++ doc/samples/SqlInt32_IsNull.cs | 2 ++ doc/samples/SqlJsonExample.cs | 5 +++- doc/samples/SqlMetaData.cs | 8 ++++-- doc/samples/SqlMethod.cs | 8 ++++-- doc/samples/SqlParameter.cs | 2 ++ doc/samples/SqlParameterCollection_Add.cs | 4 ++- doc/samples/SqlParameterCollection_Add1.cs | 4 ++- doc/samples/SqlParameterCollection_Add3.cs | 4 ++- doc/samples/SqlParameterCollection_Add5.cs | 4 ++- doc/samples/SqlParameterCollection_Add6.cs | 6 +++- .../SqlParameterCollection_AddWithValue.cs | 2 ++ doc/samples/SqlParameterCollection_Count.cs | 4 ++- doc/samples/SqlParameterCollection_Remove.cs | 6 +++- doc/samples/SqlParameter_IsNullable.cs | 2 ++ doc/samples/SqlParameter_ParameterName.cs | 2 ++ doc/samples/SqlParameter_Precision.cs | 4 ++- doc/samples/SqlParameter_SqlParameter.cs | 4 ++- doc/samples/SqlParameter_SqlParameter1.cs | 4 ++- doc/samples/SqlParameter_SqlParameter2.cs | 4 ++- doc/samples/SqlParameter_SqlParameter4.cs | 2 ++ doc/samples/SqlParameter_SqlParameter5.cs | 4 ++- doc/samples/SqlParameter_SqlParameter6.cs | 4 ++- doc/samples/SqlParameter_Value.cs | 2 ++ doc/samples/SqlRowUpdatingEventArgs.cs | 6 +++- doc/samples/SqlString_Equals.cs | 2 +- doc/samples/SqlTransactionLocal.cs | 2 ++ doc/samples/SqlTransactionScope.cs | 2 ++ doc/samples/SqlUserDefinedAggregate.cs | 2 ++ doc/samples/SqlUserDefinedAggregate1.cs | 4 ++- doc/samples/SqlUserDefinedType.cs | 6 ++-- doc/samples/SqlUserDefinedType1.cs | 2 ++ doc/samples/SqlVectorExample.cs | 6 +++- doc/samples/TransactionIsolationLevels.cs | 4 +-- 228 files changed, 608 insertions(+), 135 deletions(-) diff --git a/doc/samples/ApplicationClientIdAzureAuthenticationProvider.cs b/doc/samples/ApplicationClientIdAzureAuthenticationProvider.cs index 5456f720fa..cbc5c1a38b 100644 --- a/doc/samples/ApplicationClientIdAzureAuthenticationProvider.cs +++ b/doc/samples/ApplicationClientIdAzureAuthenticationProvider.cs @@ -2,7 +2,7 @@ using System; using Microsoft.Data.SqlClient; -namespace CustomAppIdAuthProviderExample +namespace ApplicationClientIdAzureAuthenticationProvider { public class Program { diff --git a/doc/samples/AzureKeyVaultProviderExample_2_0.cs b/doc/samples/AzureKeyVaultProviderExample_2_0.cs index d4c64f9684..28a174ef4f 100644 --- a/doc/samples/AzureKeyVaultProviderExample_2_0.cs +++ b/doc/samples/AzureKeyVaultProviderExample_2_0.cs @@ -6,7 +6,7 @@ using Microsoft.Data.SqlClient; using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider; -namespace Microsoft.Data.SqlClient.Samples +namespace AzureKeyVaultProviderExample_2_0 { public class AzureKeyVaultProviderExample_2_0 { diff --git a/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample.cs b/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample.cs index 8b9423ffe8..1d44d463cb 100644 --- a/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample.cs +++ b/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample.cs @@ -1,4 +1,5 @@ -using System; +/* +using System; // using System.Collections.Generic; using System.Security.Cryptography; @@ -7,7 +8,7 @@ using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider; using Microsoft.IdentityModel.Clients.ActiveDirectory; -namespace AKVEnclaveExample +namespace AzureKeyVaultProviderWithEnclaveProviderExample { class Program { @@ -264,3 +265,4 @@ public CustomerRecord(int id, string fName, string lName) } } // +*/ diff --git a/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample_2_0.cs b/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample_2_0.cs index 79dfc9b84a..299ae81102 100644 --- a/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample_2_0.cs +++ b/doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample_2_0.cs @@ -6,7 +6,7 @@ using Microsoft.Data.SqlClient; using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider; -namespace AKVEnclaveExample_2_0 +namespace AzureKeyVaultProviderWithEnclaveProviderExample_2_0 { class Program { diff --git a/doc/samples/AzureKeyVaultProvider_ColumnEncryptionKeyCacheScope.cs b/doc/samples/AzureKeyVaultProvider_ColumnEncryptionKeyCacheScope.cs index 4b3b76eda0..e7f1b1716f 100644 --- a/doc/samples/AzureKeyVaultProvider_ColumnEncryptionKeyCacheScope.cs +++ b/doc/samples/AzureKeyVaultProvider_ColumnEncryptionKeyCacheScope.cs @@ -3,7 +3,7 @@ using Microsoft.Data.SqlClient; using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider; -namespace AzureKeyVaultProviderExample +namespace AzureKeyVaultProvider_ColumnEncryptionKeyCacheScope { // class Program diff --git a/doc/samples/ConnectionStringSettings_RetrieveFromConfig.cs b/doc/samples/ConnectionStringSettings_RetrieveFromConfig.cs index 441537605a..f0f8c40b9a 100644 --- a/doc/samples/ConnectionStringSettings_RetrieveFromConfig.cs +++ b/doc/samples/ConnectionStringSettings_RetrieveFromConfig.cs @@ -1,4 +1,6 @@ -using System; +namespace ConnectionStringSettings_RetrieveFromConfig; + +using System; // using System.Configuration; diff --git a/doc/samples/ConnectionStringSettings_RetrieveFromConfigByName.cs b/doc/samples/ConnectionStringSettings_RetrieveFromConfigByName.cs index 1d6109da4c..c18562ee65 100644 --- a/doc/samples/ConnectionStringSettings_RetrieveFromConfigByName.cs +++ b/doc/samples/ConnectionStringSettings_RetrieveFromConfigByName.cs @@ -1,4 +1,6 @@ -using System; +namespace ConnectionStringSettings_RetrieveFromConfigByName; + +using System; using System.Configuration; class Program diff --git a/doc/samples/ConnectionStringSettings_RetrieveFromConfigByProvider.cs b/doc/samples/ConnectionStringSettings_RetrieveFromConfigByProvider.cs index 89a785d9f7..645b30d744 100644 --- a/doc/samples/ConnectionStringSettings_RetrieveFromConfigByProvider.cs +++ b/doc/samples/ConnectionStringSettings_RetrieveFromConfigByProvider.cs @@ -1,4 +1,6 @@ -using System; +namespace ConnectionStringSettings_RetrieveFromConfigByProvider; + +using System; using System.Data; using Microsoft.Data.SqlClient; using System.Configuration; diff --git a/doc/samples/ConnectionStringsWeb_Encrypt.cs b/doc/samples/ConnectionStringsWeb_Encrypt.cs index 784d9c1034..79db4128d8 100644 --- a/doc/samples/ConnectionStringsWeb_Encrypt.cs +++ b/doc/samples/ConnectionStringsWeb_Encrypt.cs @@ -1,4 +1,8 @@ -using System; +/* +#if NETFRAMEWORK +namespace ConnectionStringsWeb_Encrypt; + +using System; using System.Configuration; using System.Web.Configuration; @@ -35,3 +39,5 @@ static void ToggleWebEncrypt() } // } +#endif +*/ diff --git a/doc/samples/ConnectionStrings_Encrypt.cs b/doc/samples/ConnectionStrings_Encrypt.cs index 2d47d11327..f94e75b520 100644 --- a/doc/samples/ConnectionStrings_Encrypt.cs +++ b/doc/samples/ConnectionStrings_Encrypt.cs @@ -1,4 +1,6 @@ -using System; +namespace ConnectionStrings_Encrypt; + +using System; using System.Configuration; class Program @@ -7,7 +9,7 @@ static void Main() { } // - static void ToggleConfigEncryption(string exeFile) + static void ToggleConfigEncryption(string exeConfigName) { // Takes the executable file name without the // .config extension. diff --git a/doc/samples/CustomDeviceCodeFlowAzureAuthenticationProvider.cs b/doc/samples/CustomDeviceCodeFlowAzureAuthenticationProvider.cs index 6c7900b2f2..c3ae174c1c 100644 --- a/doc/samples/CustomDeviceCodeFlowAzureAuthenticationProvider.cs +++ b/doc/samples/CustomDeviceCodeFlowAzureAuthenticationProvider.cs @@ -7,7 +7,7 @@ using Microsoft.Data.SqlClient; using Microsoft.Identity.Client; -namespace CustomDeviceCodeFlowAuthProviderExample +namespace CustomDeviceCodeFlowAzureAuthenticationProviderExample { /// /// Example demonstrating creating a custom device code flow authentication provider and attaching it to the driver. diff --git a/doc/samples/DataColumn_DataType.cs b/doc/samples/DataColumn_DataType.cs index 532a44361c..2ca4add78d 100644 --- a/doc/samples/DataColumn_DataType.cs +++ b/doc/samples/DataColumn_DataType.cs @@ -1,3 +1,5 @@ +namespace DataColumn_DataType; + using System; using System.Data; // diff --git a/doc/samples/DataTableReader_GetValues.cs b/doc/samples/DataTableReader_GetValues.cs index 634b858e31..324d17b3db 100644 --- a/doc/samples/DataTableReader_GetValues.cs +++ b/doc/samples/DataTableReader_GetValues.cs @@ -1,3 +1,5 @@ +namespace DataTableReader_GetValues; + // using System; using System.Data; diff --git a/doc/samples/IBinarySerialize.cs b/doc/samples/IBinarySerialize.cs index 64f314f86d..5e73c47de8 100644 --- a/doc/samples/IBinarySerialize.cs +++ b/doc/samples/IBinarySerialize.cs @@ -5,7 +5,7 @@ using Microsoft.SqlServer.Server; using System.Text; -namespace test +namespace IBinarySerializeCS { public class Class1 : IBinarySerialize diff --git a/doc/samples/IDbCommand_CommandTimeout.cs b/doc/samples/IDbCommand_CommandTimeout.cs index 8da5dd7c49..b4118bac9e 100644 --- a/doc/samples/IDbCommand_CommandTimeout.cs +++ b/doc/samples/IDbCommand_CommandTimeout.cs @@ -1,3 +1,6 @@ +#if NETFRAMEWORK +namespace IDbCommand_CommandTimeout; + // using System; using System.Xml; @@ -20,3 +23,4 @@ public void CreateSqlCommand() } // } +#endif diff --git a/doc/samples/Isolation_Snapshot.cs b/doc/samples/Isolation_Snapshot.cs index 9359608c3b..c8831bb1ca 100644 --- a/doc/samples/Isolation_Snapshot.cs +++ b/doc/samples/Isolation_Snapshot.cs @@ -1,3 +1,5 @@ +namespace Isolation_Snapshot; + using System; using System.Data; // diff --git a/doc/samples/Isolation_Snapshot1.cs b/doc/samples/Isolation_Snapshot1.cs index aa6481e147..5be53b51fa 100644 --- a/doc/samples/Isolation_Snapshot1.cs +++ b/doc/samples/Isolation_Snapshot1.cs @@ -1,3 +1,5 @@ +namespace Isolation_Snapshot1; + using System; using System.Data; // diff --git a/doc/samples/Microsoft.Data.SqlClient.Samples.csproj b/doc/samples/Microsoft.Data.SqlClient.Samples.csproj index fc4ec08983..e66e098c7d 100644 --- a/doc/samples/Microsoft.Data.SqlClient.Samples.csproj +++ b/doc/samples/Microsoft.Data.SqlClient.Samples.csproj @@ -1,6 +1,7 @@  + net8.0;net462 Library disable enable @@ -16,10 +17,11 @@ + - + diff --git a/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_IBinarySerialize_Sample.cs b/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_IBinarySerialize_Sample.cs index 3631912ba6..726d3b5f89 100644 --- a/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_IBinarySerialize_Sample.cs +++ b/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_IBinarySerialize_Sample.cs @@ -2,7 +2,7 @@ using System.IO; using Microsoft.SqlServer.Server; -namespace test +namespace DataWorks_IBinarySerialize_Sample { public class Class1 : IBinarySerialize { diff --git a/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlFunctionAttribute_Sample.cs b/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlFunctionAttribute_Sample.cs index e35b9cad21..aa3041c13c 100644 --- a/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlFunctionAttribute_Sample.cs +++ b/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlFunctionAttribute_Sample.cs @@ -1,4 +1,6 @@ -using System.IO; +namespace DataWorks_SqlFunctionAttribute_Sample; + +using System.IO; using System.Collections; using Microsoft.SqlServer.Server; @@ -20,4 +22,4 @@ public static IEnumerable GetFileDetails(string directoryPath) } } // -} \ No newline at end of file +} diff --git a/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlUserDefinedAggregateAttribute_Sample.cs b/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlUserDefinedAggregateAttribute_Sample.cs index 34999b5dd5..4876cf8028 100644 --- a/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlUserDefinedAggregateAttribute_Sample.cs +++ b/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlUserDefinedAggregateAttribute_Sample.cs @@ -1,4 +1,6 @@ -// +namespace DataWorks_SqlUserDefinedAggregateAttribute_Sample; + +// using System; using System.IO; using Microsoft.SqlServer.Server; diff --git a/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlUserDefinedTypeAttribute_Sample.cs b/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlUserDefinedTypeAttribute_Sample.cs index 90bfccfce4..3d967b9458 100644 --- a/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlUserDefinedTypeAttribute_Sample.cs +++ b/doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlUserDefinedTypeAttribute_Sample.cs @@ -1,4 +1,6 @@ -using System; +namespace DataWorks_SqlUserDefinedTypeAttribute_Sample; + +using System; using System.Data.SqlTypes; using Microsoft.SqlServer.Server; using System.Text; diff --git a/doc/samples/Microsoft.SqlServer.Server/csharp/SqlFunctionAttribute_SqlFunction.cs b/doc/samples/Microsoft.SqlServer.Server/csharp/SqlFunctionAttribute_SqlFunction.cs index 7317b1917b..46dbbb26e5 100644 --- a/doc/samples/Microsoft.SqlServer.Server/csharp/SqlFunctionAttribute_SqlFunction.cs +++ b/doc/samples/Microsoft.SqlServer.Server/csharp/SqlFunctionAttribute_SqlFunction.cs @@ -1,4 +1,6 @@ -using System.Collections; +namespace SqlFunctionAttribute_SqlFunction; + +using System.Collections; //----------------------------------------------------------------------------- // using System.Data.SqlTypes; diff --git a/doc/samples/Microsoft.SqlServer.Server/csharp/SqlMethod.cs b/doc/samples/Microsoft.SqlServer.Server/csharp/SqlMethod.cs index 9e41150c99..277fa8090e 100644 --- a/doc/samples/Microsoft.SqlServer.Server/csharp/SqlMethod.cs +++ b/doc/samples/Microsoft.SqlServer.Server/csharp/SqlMethod.cs @@ -1,3 +1,5 @@ +namespace SqlMethodCSExample; + using System; // using Microsoft.SqlServer.Server; diff --git a/doc/samples/Microsoft.SqlServer.Server/csharp/SqlUserDefinedAggregateAttribute_Aggregate1.cs b/doc/samples/Microsoft.SqlServer.Server/csharp/SqlUserDefinedAggregateAttribute_Aggregate1.cs index edf119d940..234f518228 100644 --- a/doc/samples/Microsoft.SqlServer.Server/csharp/SqlUserDefinedAggregateAttribute_Aggregate1.cs +++ b/doc/samples/Microsoft.SqlServer.Server/csharp/SqlUserDefinedAggregateAttribute_Aggregate1.cs @@ -1,4 +1,6 @@ -//----------------------------------------------------------------------------- +namespace SqlUserDefinedAggregateAttribute_Aggregate1; + +//----------------------------------------------------------------------------- // using System; using System.Data.SqlTypes; diff --git a/doc/samples/Microsoft.SqlServer.Server/csharp/SqlUserDefinedTypeAttribute_Type1.cs b/doc/samples/Microsoft.SqlServer.Server/csharp/SqlUserDefinedTypeAttribute_Type1.cs index 70f8d0ae7b..51352596c6 100644 --- a/doc/samples/Microsoft.SqlServer.Server/csharp/SqlUserDefinedTypeAttribute_Type1.cs +++ b/doc/samples/Microsoft.SqlServer.Server/csharp/SqlUserDefinedTypeAttribute_Type1.cs @@ -1,4 +1,6 @@ -//----------------------------------------------------------------------------- +namespace SqlUserDefinedTypeAttribute_Type1; + +//----------------------------------------------------------------------------- // using System; using System.Data.SqlTypes; @@ -78,8 +80,8 @@ public static Point Parse(SqlString s) string[] xy = str.Split(':'); Point pt = new Point(); - pt.X = Convert.Toint(xy[0]); - pt.Y = Convert.Toint(xy[1]); + pt.X = Convert.ToInt32(xy[0]); + pt.Y = Convert.ToInt32(xy[1]); return (pt); } diff --git a/doc/samples/RegisterCustomKeyStoreProvider_CommandPrecedence.cs b/doc/samples/RegisterCustomKeyStoreProvider_CommandPrecedence.cs index d70410df59..cf52e339a7 100644 --- a/doc/samples/RegisterCustomKeyStoreProvider_CommandPrecedence.cs +++ b/doc/samples/RegisterCustomKeyStoreProvider_CommandPrecedence.cs @@ -1,7 +1,14 @@ -// +namespace RegisterCustomKeyStoreProvider_CommandPrecedence; + +using System.Collections.Generic; +using Azure.Identity; +using Microsoft.Data.SqlClient; +using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider; + +// class Program { - static void Main() + static void Main(string connectionString) { Dictionary customKeyStoreProviders = new Dictionary(); MyCustomKeyStoreProvider firstProvider = new MyCustomKeyStoreProvider(); @@ -20,7 +27,7 @@ static void Main() using (SqlCommand command = connection.CreateCommand()) { customKeyStoreProviders.Clear(); - SqlColumnEncryptionAzureKeyVaultProvider azureKeyVaultProvider = new SqlColumnEncryptionAzureKeyVaultProvider(); + SqlColumnEncryptionAzureKeyVaultProvider azureKeyVaultProvider = new SqlColumnEncryptionAzureKeyVaultProvider(new DefaultAzureCredential()); customKeyStoreProviders.Add(SqlColumnEncryptionAzureKeyVaultProvider.ProviderName, azureKeyVaultProvider); // Registers the provider on the command // These providers will take precedence over connection-level providers and globally registered providers @@ -30,3 +37,17 @@ static void Main() } } // + +class MyCustomKeyStoreProvider : SqlColumnEncryptionKeyStoreProvider +{ + public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) + { + // Custom decryption logic here + return new byte[0]; + } + public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) + { + // Custom encryption logic here + return new byte[0]; + } +} diff --git a/doc/samples/RegisterCustomKeyStoreProvider_ConnectionPrecedence.cs b/doc/samples/RegisterCustomKeyStoreProvider_ConnectionPrecedence.cs index e51ec09c83..c5c50cf489 100644 --- a/doc/samples/RegisterCustomKeyStoreProvider_ConnectionPrecedence.cs +++ b/doc/samples/RegisterCustomKeyStoreProvider_ConnectionPrecedence.cs @@ -1,7 +1,15 @@ -// +namespace RegisterCustomKeyStoreProvider_ConnectionPrecedence; + +using System.Collections.Generic; +using Azure.Core; +using Azure.Identity; +using Microsoft.Data.SqlClient; +using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider; + +// class Program { - static void Main() + static void Main(string connectionString) { Dictionary customKeyStoreProviders = new Dictionary(); MyCustomKeyStoreProvider myProvider = new MyCustomKeyStoreProvider(); @@ -12,7 +20,7 @@ static void Main() using (SqlConnection connection = new SqlConnection(connectionString)) { customKeyStoreProviders.Clear(); - SqlColumnEncryptionAzureKeyVaultProvider azureKeyVaultProvider = new SqlColumnEncryptionAzureKeyVaultProvider(); + SqlColumnEncryptionAzureKeyVaultProvider azureKeyVaultProvider = new SqlColumnEncryptionAzureKeyVaultProvider(new DefaultAzureCredential()); customKeyStoreProviders.Add(SqlColumnEncryptionAzureKeyVaultProvider.ProviderName, azureKeyVaultProvider); // Registers the provider on the connection // These providers will take precedence over globally registered providers @@ -21,3 +29,17 @@ static void Main() } } // + +class MyCustomKeyStoreProvider : SqlColumnEncryptionKeyStoreProvider +{ + public override byte[] DecryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] encryptedColumnEncryptionKey) + { + // Custom decryption logic here + return new byte[0]; + } + public override byte[] EncryptColumnEncryptionKey(string masterKeyPath, string encryptionAlgorithm, byte[] columnEncryptionKey) + { + // Custom encryption logic here + return new byte[0]; + } +} diff --git a/doc/samples/RegisterCustomKeyStoreProvider_Example.cs b/doc/samples/RegisterCustomKeyStoreProvider_Example.cs index 334b1264c1..4e3df4afe1 100644 --- a/doc/samples/RegisterCustomKeyStoreProvider_Example.cs +++ b/doc/samples/RegisterCustomKeyStoreProvider_Example.cs @@ -1,4 +1,7 @@ -// +namespace RegisterCustomKeyStoreProvider_Example; + +// +using Azure.Identity; using Microsoft.Data.SqlClient; using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider; using System.Collections.Generic; @@ -15,7 +18,7 @@ void ExecuteSelectQuery(object user, SqlConnection connection) if (azureKeyVaultProvider is null) { // Create a new SqlColumnEncryptionAzureKeyVaultProvider with the user's credentials and save it for future use - azureKeyVaultProvider = new SqlColumnEncryptionAzureKeyVaultProvider(); + azureKeyVaultProvider = new SqlColumnEncryptionAzureKeyVaultProvider(new DefaultAzureCredential()); providerByUser[user] = azureKeyVaultProvider; } @@ -35,7 +38,7 @@ void ExecuteUpdateQuery(object user, SqlConnection connection) if (azureKeyVaultProvider is null) { // Create a new SqlColumnEncryptionAzureKeyVaultProvider with the user's credentials and save it for future use - azureKeyVaultProvider = new SqlColumnEncryptionAzureKeyVaultProvider(); + azureKeyVaultProvider = new SqlColumnEncryptionAzureKeyVaultProvider(new DefaultAzureCredential()); providerByUser[user] = azureKeyVaultProvider; } diff --git a/doc/samples/SqlBatch_ExecuteReader.cs b/doc/samples/SqlBatch_ExecuteReader.cs index eec4e09abf..5e1240ddfa 100644 --- a/doc/samples/SqlBatch_ExecuteReader.cs +++ b/doc/samples/SqlBatch_ExecuteReader.cs @@ -1,3 +1,9 @@ +#if NET +namespace SqlBatch_ExecuteReader; + +using System; +using System.Collections.Generic; + // using Microsoft.Data.SqlClient; @@ -41,3 +47,4 @@ static void RunBatch(string connString) } } // +#endif diff --git a/doc/samples/SqlBulkCopyOptions_Default.cs b/doc/samples/SqlBulkCopyOptions_Default.cs index 10d3283f75..2d91a19c13 100644 --- a/doc/samples/SqlBulkCopyOptions_Default.cs +++ b/doc/samples/SqlBulkCopyOptions_Default.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopyOptions_Default; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopyOptions_UseInternalTransaction.cs b/doc/samples/SqlBulkCopyOptions_UseInternalTransaction.cs index ee8d1446f1..ba7e333538 100644 --- a/doc/samples/SqlBulkCopyOptions_UseInternalTransaction.cs +++ b/doc/samples/SqlBulkCopyOptions_UseInternalTransaction.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopyOptions_UseInternalTransaction; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_BatchSize.cs b/doc/samples/SqlBulkCopy_BatchSize.cs index ee0a62b53c..4f89b8c348 100644 --- a/doc/samples/SqlBulkCopy_BatchSize.cs +++ b/doc/samples/SqlBulkCopy_BatchSize.cs @@ -1,3 +1,6 @@ +namespace SqlBulkCopy_BatchSize; + +using System; using Microsoft.Data.SqlClient; class Program diff --git a/doc/samples/SqlBulkCopy_ColumnMapping.cs b/doc/samples/SqlBulkCopy_ColumnMapping.cs index af72a4803d..0d6b03978f 100644 --- a/doc/samples/SqlBulkCopy_ColumnMapping.cs +++ b/doc/samples/SqlBulkCopy_ColumnMapping.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMapping; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnMappingColNameIndex.cs b/doc/samples/SqlBulkCopy_ColumnMappingColNameIndex.cs index 9c1e797bc8..ddb40807b7 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingColNameIndex.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingColNameIndex.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMappingColNameIndex; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_ColumnMappingCollection.cs b/doc/samples/SqlBulkCopy_ColumnMappingCollection.cs index 4cf90008c6..ff171965f5 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingCollection.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingCollection.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMappingCollection; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnMappingCollectionOrdinal.cs b/doc/samples/SqlBulkCopy_ColumnMappingCollectionOrdinal.cs index fa0db0ef4c..933ccfa566 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingCollectionOrdinal.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingCollectionOrdinal.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMappingCollectionOrdinal; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnMappingDestinationColumn.cs b/doc/samples/SqlBulkCopy_ColumnMappingDestinationColumn.cs index d46a58a261..da14888157 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingDestinationColumn.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingDestinationColumn.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMappingDestinationColumn; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_ColumnMappingDestinationOrdinal.cs b/doc/samples/SqlBulkCopy_ColumnMappingDestinationOrdinal.cs index 19e31f282d..afc64c7c19 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingDestinationOrdinal.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingDestinationOrdinal.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMappingDestinationOrdinal; + using System; using System.Data; // @@ -93,3 +95,5 @@ private static string GetConnectionString() } } // + + diff --git a/doc/samples/SqlBulkCopy_ColumnMappingIndexColName.cs b/doc/samples/SqlBulkCopy_ColumnMappingIndexColName.cs index fa0db0ef4c..d93a9f36ff 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingIndexColName.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingIndexColName.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMappingIndexColName; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnMappingNameOrdinal.cs b/doc/samples/SqlBulkCopy_ColumnMappingNameOrdinal.cs index bdda864974..fba846c3f9 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingNameOrdinal.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingNameOrdinal.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMappingNameOrdinal; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_ColumnMappingOrdersDetails.cs b/doc/samples/SqlBulkCopy_ColumnMappingOrdersDetails.cs index a488c621bc..b83815f9a6 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingOrdersDetails.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingOrdersDetails.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMappingOrdersDetails; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_ColumnMappingOrdinal.cs b/doc/samples/SqlBulkCopy_ColumnMappingOrdinal.cs index 671383133f..3fe10f5ac5 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingOrdinal.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingOrdinal.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMappingOrdinal; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_ColumnMappingOrdinalName.cs b/doc/samples/SqlBulkCopy_ColumnMappingOrdinalName.cs index 8ca91ee00e..c7cd765c8a 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingOrdinalName.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingOrdinalName.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopyColumnMappingOrdinalName; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_ColumnMappingRemove.cs b/doc/samples/SqlBulkCopy_ColumnMappingRemove.cs index f5dc29e254..e077f6e7ab 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingRemove.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingRemove.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMappingRemove; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnMappingRemoveAt.cs b/doc/samples/SqlBulkCopy_ColumnMappingRemoveAt.cs index 948b3ed05d..debdb12e38 100644 --- a/doc/samples/SqlBulkCopy_ColumnMappingRemoveAt.cs +++ b/doc/samples/SqlBulkCopy_ColumnMappingRemoveAt.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnMappingRemoveAt; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_ColumnOrderHint.cs b/doc/samples/SqlBulkCopy_ColumnOrderHint.cs index 9960debf20..7832d53926 100644 --- a/doc/samples/SqlBulkCopy_ColumnOrderHint.cs +++ b/doc/samples/SqlBulkCopy_ColumnOrderHint.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnOrderHint; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnOrderHintCollection.cs b/doc/samples/SqlBulkCopy_ColumnOrderHintCollection.cs index 4a92099ddb..b639a49199 100644 --- a/doc/samples/SqlBulkCopy_ColumnOrderHintCollection.cs +++ b/doc/samples/SqlBulkCopy_ColumnOrderHintCollection.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnOrderHintCollection; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionAdd.cs b/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionAdd.cs index 2d6599d525..f750ec2777 100644 --- a/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionAdd.cs +++ b/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionAdd.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnOrderHintCollectionAdd; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionAdd2.cs b/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionAdd2.cs index 4a92099ddb..04a7f0f213 100644 --- a/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionAdd2.cs +++ b/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionAdd2.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnOrderHintCollectionAdd2; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionClear.cs b/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionClear.cs index 0df1281b52..e081e498df 100644 --- a/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionClear.cs +++ b/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionClear.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnOrderHintCollectionClear; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionRemove.cs b/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionRemove.cs index ea9a8f4a46..a98bb44de4 100644 --- a/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionRemove.cs +++ b/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionRemove.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnOrderHintCollectionRemove; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionRemoveAt.cs b/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionRemoveAt.cs index b965599175..fb773fc419 100644 --- a/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionRemoveAt.cs +++ b/doc/samples/SqlBulkCopy_ColumnOrderHintCollectionRemoveAt.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnOrderHintCollectionRemoveAt; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnOrderHintColumn.cs b/doc/samples/SqlBulkCopy_ColumnOrderHintColumn.cs index 6a75e0289c..f70dde0b91 100644 --- a/doc/samples/SqlBulkCopy_ColumnOrderHintColumn.cs +++ b/doc/samples/SqlBulkCopy_ColumnOrderHintColumn.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnOrderHintColumn; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ColumnOrderHintSortOrder.cs b/doc/samples/SqlBulkCopy_ColumnOrderHintSortOrder.cs index 54cef5da53..6f35e32365 100644 --- a/doc/samples/SqlBulkCopy_ColumnOrderHintSortOrder.cs +++ b/doc/samples/SqlBulkCopy_ColumnOrderHintSortOrder.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ColumnOrderHintSortOrder; + // using System; using System.Data; diff --git a/doc/samples/SqlBulkCopy_ConnectionString.cs b/doc/samples/SqlBulkCopy_ConnectionString.cs index 50c3101369..3257789242 100644 --- a/doc/samples/SqlBulkCopy_ConnectionString.cs +++ b/doc/samples/SqlBulkCopy_ConnectionString.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ConnectionString; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_DataRowState.cs b/doc/samples/SqlBulkCopy_DataRowState.cs index 6e36e6a3e1..762456f190 100644 --- a/doc/samples/SqlBulkCopy_DataRowState.cs +++ b/doc/samples/SqlBulkCopy_DataRowState.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_DataRowState; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_DataTable.cs b/doc/samples/SqlBulkCopy_DataTable.cs index a3c8c98fae..4a4ac64f77 100644 --- a/doc/samples/SqlBulkCopy_DataTable.cs +++ b/doc/samples/SqlBulkCopy_DataTable.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_DataTable; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_ExternalTransaction.cs b/doc/samples/SqlBulkCopy_ExternalTransaction.cs index 92a95faf19..7af37c5107 100644 --- a/doc/samples/SqlBulkCopy_ExternalTransaction.cs +++ b/doc/samples/SqlBulkCopy_ExternalTransaction.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_ExternalTransaction; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_KeepIdentity.cs b/doc/samples/SqlBulkCopy_KeepIdentity.cs index da85715725..bf9f039166 100644 --- a/doc/samples/SqlBulkCopy_KeepIdentity.cs +++ b/doc/samples/SqlBulkCopy_KeepIdentity.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_KeepIdentity; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_NotifyAfter.cs b/doc/samples/SqlBulkCopy_NotifyAfter.cs index fb01bb9a5c..85ee4413f6 100644 --- a/doc/samples/SqlBulkCopy_NotifyAfter.cs +++ b/doc/samples/SqlBulkCopy_NotifyAfter.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_NotifyAfter; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_OrdersDetails.cs b/doc/samples/SqlBulkCopy_OrdersDetails.cs index 9fd713a548..9d11e69d27 100644 --- a/doc/samples/SqlBulkCopy_OrdersDetails.cs +++ b/doc/samples/SqlBulkCopy_OrdersDetails.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_OrdersDetails; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_RowArray.cs b/doc/samples/SqlBulkCopy_RowArray.cs index cce09d0233..838f5245af 100644 --- a/doc/samples/SqlBulkCopy_RowArray.cs +++ b/doc/samples/SqlBulkCopy_RowArray.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_RowArray; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_Single.cs b/doc/samples/SqlBulkCopy_Single.cs index e5b7f7538e..df6954ee79 100644 --- a/doc/samples/SqlBulkCopy_Single.cs +++ b/doc/samples/SqlBulkCopy_Single.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_Single; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_Timeout.cs b/doc/samples/SqlBulkCopy_Timeout.cs index b684e6879d..cdc366562a 100644 --- a/doc/samples/SqlBulkCopy_Timeout.cs +++ b/doc/samples/SqlBulkCopy_Timeout.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_Timeout; + using System; using System.Data; // diff --git a/doc/samples/SqlBulkCopy_WriteToServer.cs b/doc/samples/SqlBulkCopy_WriteToServer.cs index 107d36d65b..99d7ee1e53 100644 --- a/doc/samples/SqlBulkCopy_WriteToServer.cs +++ b/doc/samples/SqlBulkCopy_WriteToServer.cs @@ -1,3 +1,5 @@ +namespace SqlBulkCopy_WriteToServer; + using System; using System.Data; // diff --git a/doc/samples/SqlBytes_Stream.cs b/doc/samples/SqlBytes_Stream.cs index 5e5a49236a..0f7532da9c 100644 --- a/doc/samples/SqlBytes_Stream.cs +++ b/doc/samples/SqlBytes_Stream.cs @@ -1,3 +1,6 @@ +#if NETFRAMEWORK +namespace SqlBytes_Stream; + using System; using System.Data; // @@ -98,3 +101,4 @@ static private string GetConnectionString() } } // +#endif diff --git a/doc/samples/SqlClientDiagnosticCounter.cs b/doc/samples/SqlClientDiagnosticCounter.cs index 576563f6fd..6f78fa8b22 100644 --- a/doc/samples/SqlClientDiagnosticCounter.cs +++ b/doc/samples/SqlClientDiagnosticCounter.cs @@ -1,8 +1,11 @@ -// +namespace SqlClientDiagnosticCounter; + +// using System; using System.Collections.Generic; using System.Diagnostics.Tracing; using System.Linq; +using Microsoft.Data.SqlClient; // This listener class will listen for events from the SqlClientEventSource class. // SqlClientEventSource is an implementation of the EventSource class which gives diff --git a/doc/samples/SqlClientEventSource.cs b/doc/samples/SqlClientEventSource.cs index 40acc00c90..532b1d88e3 100644 --- a/doc/samples/SqlClientEventSource.cs +++ b/doc/samples/SqlClientEventSource.cs @@ -1,4 +1,6 @@ -// +namespace SqlClientEventSource; + +// using System; using System.Diagnostics.Tracing; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlClientFactory_DataSourceEnumerator.cs b/doc/samples/SqlClientFactory_DataSourceEnumerator.cs index f1e1a09992..875a75446f 100644 --- a/doc/samples/SqlClientFactory_DataSourceEnumerator.cs +++ b/doc/samples/SqlClientFactory_DataSourceEnumerator.cs @@ -1,3 +1,5 @@ +namespace SqlClientFactory_DataSourceEnumerator; + // using System; using System.Data; diff --git a/doc/samples/SqlClientFactory_Netcoreapp.cs b/doc/samples/SqlClientFactory_Netcoreapp.cs index e72d623067..0b011431dd 100644 --- a/doc/samples/SqlClientFactory_Netcoreapp.cs +++ b/doc/samples/SqlClientFactory_Netcoreapp.cs @@ -1,3 +1,6 @@ +#if NET +namespace SqlClientFactory_Netcoreapp; + using System; using System.Data.Common; using Microsoft.Data.SqlClient; @@ -18,3 +21,4 @@ private static DbProviderFactory GetFactory() } // } +#endif diff --git a/doc/samples/SqlClientPermission_Demand.cs b/doc/samples/SqlClientPermission_Demand.cs index a5cca1a35e..73b9fda992 100644 --- a/doc/samples/SqlClientPermission_Demand.cs +++ b/doc/samples/SqlClientPermission_Demand.cs @@ -1,3 +1,6 @@ +#if NETFRAMEWORK +namespace SqlClientPermission_Demand; + using System; using System.Data; // @@ -31,3 +34,4 @@ private bool CanRequestNotifications() } } // +#endif diff --git a/doc/samples/SqlClient_AsyncProgramming_Cancellation.cs b/doc/samples/SqlClient_AsyncProgramming_Cancellation.cs index d60fc6f99b..5485091e40 100644 --- a/doc/samples/SqlClient_AsyncProgramming_Cancellation.cs +++ b/doc/samples/SqlClient_AsyncProgramming_Cancellation.cs @@ -4,7 +4,7 @@ using System.Threading; using System.Threading.Tasks; -namespace Samples +namespace SqlClient_AsyncProgramming_Cancellation { class CancellationSample { diff --git a/doc/samples/SqlClient_AsyncProgramming_DistributedTransaction.cs b/doc/samples/SqlClient_AsyncProgramming_DistributedTransaction.cs index a517e0ea40..b044d72fb9 100644 --- a/doc/samples/SqlClient_AsyncProgramming_DistributedTransaction.cs +++ b/doc/samples/SqlClient_AsyncProgramming_DistributedTransaction.cs @@ -1,3 +1,5 @@ +namespace SqlClient_AsyncProgramming_DistributedTransaction; + using System; // using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlClient_AsyncProgramming_MultipleCommands.cs b/doc/samples/SqlClient_AsyncProgramming_MultipleCommands.cs index 6f53f2b55c..a2814ff5f0 100644 --- a/doc/samples/SqlClient_AsyncProgramming_MultipleCommands.cs +++ b/doc/samples/SqlClient_AsyncProgramming_MultipleCommands.cs @@ -1,5 +1,8 @@ +namespace SqlClient_AsyncProgramming_MultipleCommands; + using System; // +using System.Data; using System.Data.Common; using Microsoft.Data.SqlClient; using System.Threading.Tasks; diff --git a/doc/samples/SqlClient_AsyncProgramming_MultipleCommandsEx.cs b/doc/samples/SqlClient_AsyncProgramming_MultipleCommandsEx.cs index 47376ca18c..e8e4c4363c 100644 --- a/doc/samples/SqlClient_AsyncProgramming_MultipleCommandsEx.cs +++ b/doc/samples/SqlClient_AsyncProgramming_MultipleCommandsEx.cs @@ -1,5 +1,8 @@ +namespace SqlClient_AsyncProgramming_MultipleCommandsEx; + using System; // +using System.Data; using System.Data.Common; using Microsoft.Data.SqlClient; using System.Threading.Tasks; @@ -110,7 +113,7 @@ static async Task ReadingAndUpdatingData() private static string GetConnectionString() { // To avoid storing the connection string in your code, you can retrieve it from a configuration file. - return "Data Source=(local);Integrated Security=SSPI;Initial Catalog=AdventureWorks;MultipleActiveResultSets=True"; + return "Data Source=(local);Integrated Security=SSPI;Initial Catalog=AdventureWorks;MultipleActiveResultSets=True"; } } // diff --git a/doc/samples/SqlClient_AsyncProgramming_ProviderModel.cs b/doc/samples/SqlClient_AsyncProgramming_ProviderModel.cs index 7653e3947d..f32133ba61 100644 --- a/doc/samples/SqlClient_AsyncProgramming_ProviderModel.cs +++ b/doc/samples/SqlClient_AsyncProgramming_ProviderModel.cs @@ -1,10 +1,12 @@ +namespace SqlClient_AsyncProgramming_ProviderModel; + using System; // using System.Data.Common; using Microsoft.Data.SqlClient; using System.Threading.Tasks; -class program +class Program { static async Task PerformDBOperationsUsingProviderModel(string connectionString) { diff --git a/doc/samples/SqlClient_AsyncProgramming_SqlTransaction.cs b/doc/samples/SqlClient_AsyncProgramming_SqlTransaction.cs index 86659b3c98..b9c94abaf6 100644 --- a/doc/samples/SqlClient_AsyncProgramming_SqlTransaction.cs +++ b/doc/samples/SqlClient_AsyncProgramming_SqlTransaction.cs @@ -1,3 +1,5 @@ +namespace SqlClient_AsyncProgramming_SqlTransaction; + using System; // using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlClient_PerformanceCounter.cs b/doc/samples/SqlClient_PerformanceCounter.cs index e015d6f6b1..eea0b6f183 100644 --- a/doc/samples/SqlClient_PerformanceCounter.cs +++ b/doc/samples/SqlClient_PerformanceCounter.cs @@ -1,10 +1,11 @@ -// +#if NETFRAMEWORK +// using System; using Microsoft.Data.SqlClient; using System.Diagnostics; using System.Runtime.InteropServices; -namespace PerformanceCounterTest +namespace SqlClient_PerformanceCounter { class Program { @@ -171,3 +172,4 @@ private static string GetSqlConnectionStringDifferent() } } // +#endif diff --git a/doc/samples/SqlClient_RetrieveIdentity.cs b/doc/samples/SqlClient_RetrieveIdentity.cs index ba08be607a..c26c5cc7c7 100644 --- a/doc/samples/SqlClient_RetrieveIdentity.cs +++ b/doc/samples/SqlClient_RetrieveIdentity.cs @@ -2,7 +2,7 @@ using System.Data; using Microsoft.Data.SqlClient; -namespace AutoNumberTest +namespace SqlClient_RetrieveIdentity { class Program { diff --git a/doc/samples/SqlClient_Streaming_FromServer.cs b/doc/samples/SqlClient_Streaming_FromServer.cs index a139b828e6..0bdff0d380 100644 --- a/doc/samples/SqlClient_Streaming_FromServer.cs +++ b/doc/samples/SqlClient_Streaming_FromServer.cs @@ -6,7 +6,7 @@ using System.Threading.Tasks; using System.Xml; -namespace StreamingFromServer +namespace SqlClient_Streaming_FromServer { class Program { diff --git a/doc/samples/SqlClient_Streaming_ServerToServer.cs b/doc/samples/SqlClient_Streaming_ServerToServer.cs index 42efe6fa32..ee50cc53c2 100644 --- a/doc/samples/SqlClient_Streaming_ServerToServer.cs +++ b/doc/samples/SqlClient_Streaming_ServerToServer.cs @@ -6,7 +6,7 @@ using System.Threading; using System.Threading.Tasks; -namespace StreamingFromServerToAnother +namespace SqlClient_Streaming_ServerToServer { class Program { diff --git a/doc/samples/SqlClient_Streaming_ToServer.cs b/doc/samples/SqlClient_Streaming_ToServer.cs index 6ee858db1c..efcec16dba 100644 --- a/doc/samples/SqlClient_Streaming_ToServer.cs +++ b/doc/samples/SqlClient_Streaming_ToServer.cs @@ -6,7 +6,7 @@ using System.Threading; using System.Threading.Tasks; -namespace StreamingToServer +namespace SqlClient_Streaming_ToServer { class Program { diff --git a/doc/samples/SqlCommandBuilder_Create.cs b/doc/samples/SqlCommandBuilder_Create.cs index 13322368af..b21847b7f5 100644 --- a/doc/samples/SqlCommandBuilder_Create.cs +++ b/doc/samples/SqlCommandBuilder_Create.cs @@ -2,7 +2,7 @@ using System.Data; using Microsoft.Data.SqlClient; -namespace SqlCommandBuilderCS +namespace SqlCommandBuilder_Create { class Program { diff --git a/doc/samples/SqlCommand_BeginExecuteNonQuery.cs b/doc/samples/SqlCommand_BeginExecuteNonQuery.cs index 7cae30238f..84e358367b 100644 --- a/doc/samples/SqlCommand_BeginExecuteNonQuery.cs +++ b/doc/samples/SqlCommand_BeginExecuteNonQuery.cs @@ -1,3 +1,5 @@ +namespace SqlCommand_BeginExecuteNonQuery; + // using System; using System.Data; diff --git a/doc/samples/SqlCommand_BeginExecuteNonQueryForm.cs b/doc/samples/SqlCommand_BeginExecuteNonQueryForm.cs index d800ebde16..d1ed580eac 100644 --- a/doc/samples/SqlCommand_BeginExecuteNonQueryForm.cs +++ b/doc/samples/SqlCommand_BeginExecuteNonQueryForm.cs @@ -1,3 +1,4 @@ +/* This does not compile, as multiple methods are missing. // using System; using System.Collections.Generic; @@ -188,3 +189,4 @@ private void HandleCallback(IAsyncResult result) } } // +*/ diff --git a/doc/samples/SqlCommand_BeginExecuteReader.cs b/doc/samples/SqlCommand_BeginExecuteReader.cs index 00f42fa9ce..28f54224a0 100644 --- a/doc/samples/SqlCommand_BeginExecuteReader.cs +++ b/doc/samples/SqlCommand_BeginExecuteReader.cs @@ -1,3 +1,5 @@ +namespace SqlCommand_BeginExecuteReader; + // using System; using Microsoft.Data.SqlClient; @@ -97,4 +99,4 @@ private static string GetConnectionString() "Initial Catalog=AdventureWorks"; } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlCommand_BeginExecuteReaderAsyncBehavior.cs b/doc/samples/SqlCommand_BeginExecuteReaderAsyncBehavior.cs index e7e0a617b9..2d67007a67 100644 --- a/doc/samples/SqlCommand_BeginExecuteReaderAsyncBehavior.cs +++ b/doc/samples/SqlCommand_BeginExecuteReaderAsyncBehavior.cs @@ -10,7 +10,7 @@ using System.Windows.Forms; using Microsoft.Data.SqlClient; -namespace Microsoft.Data.SqlClient.Samples +namespace SqlCommand_BeginExecuteReaderAsyncBehavior { public partial class Form1 : Form { diff --git a/doc/samples/SqlCommand_BeginExecuteReaderAsyncSimple.cs b/doc/samples/SqlCommand_BeginExecuteReaderAsyncSimple.cs index 2c5d74a8f4..0ec8237da8 100644 --- a/doc/samples/SqlCommand_BeginExecuteReaderAsyncSimple.cs +++ b/doc/samples/SqlCommand_BeginExecuteReaderAsyncSimple.cs @@ -1,3 +1,5 @@ +namespace SqlCommand_BeginExecuteReaderAsyncSimple; + // using System; using System.Data; diff --git a/doc/samples/SqlCommand_BeginExecuteXmlReader.cs b/doc/samples/SqlCommand_BeginExecuteXmlReader.cs index 6935d7d117..29e7d9fc31 100644 --- a/doc/samples/SqlCommand_BeginExecuteXmlReader.cs +++ b/doc/samples/SqlCommand_BeginExecuteXmlReader.cs @@ -1,3 +1,5 @@ +namespace SqlCommand_BeginExecuteXmlReader; + // using System; using System.Data; diff --git a/doc/samples/SqlCommand_BeginExecuteXmlReaderAsync.cs b/doc/samples/SqlCommand_BeginExecuteXmlReaderAsync.cs index 35195c95a7..021033f6bb 100644 --- a/doc/samples/SqlCommand_BeginExecuteXmlReaderAsync.cs +++ b/doc/samples/SqlCommand_BeginExecuteXmlReaderAsync.cs @@ -1,3 +1,4 @@ +/* This does not compile, as multiple methods are missing. // using System; using System.Collections.Generic; @@ -9,7 +10,7 @@ using Microsoft.Data.SqlClient; using System.Xml; -namespace Microsoft.AdoDotNet.CodeSamples +namespace SqlCommand_BeginExecuteXmlReaderAsync { public partial class Form1 : Form { @@ -188,3 +189,4 @@ private void Form1_Load(object sender, System.EventArgs e) } } // +*/ diff --git a/doc/samples/SqlCommand_Cancel.cs b/doc/samples/SqlCommand_Cancel.cs index 6b15101662..bf8b163f61 100644 --- a/doc/samples/SqlCommand_Cancel.cs +++ b/doc/samples/SqlCommand_Cancel.cs @@ -1,3 +1,5 @@ +namespace SqlCommand_Cancel; + // using System; using System.Data; diff --git a/doc/samples/SqlCommand_CommandText.cs b/doc/samples/SqlCommand_CommandText.cs index b86ad952c3..76e1ccbed7 100644 --- a/doc/samples/SqlCommand_CommandText.cs +++ b/doc/samples/SqlCommand_CommandText.cs @@ -1,3 +1,6 @@ +#if NETFRAMEWORK +namespace SqlCommand_CommandText; + // using System; using System.Xml; @@ -21,3 +24,4 @@ public void CreateCommand() // } +#endif diff --git a/doc/samples/SqlCommand_CommandTimeout.cs b/doc/samples/SqlCommand_CommandTimeout.cs index 0236205d0b..2aea75b993 100644 --- a/doc/samples/SqlCommand_CommandTimeout.cs +++ b/doc/samples/SqlCommand_CommandTimeout.cs @@ -1,3 +1,5 @@ +namespace SqlCommand_CommandTimeout; + // using System; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlCommand_Connection.cs b/doc/samples/SqlCommand_Connection.cs index c939012b0d..c130118dd0 100644 --- a/doc/samples/SqlCommand_Connection.cs +++ b/doc/samples/SqlCommand_Connection.cs @@ -4,7 +4,7 @@ using Microsoft.Data.SqlClient; -namespace SqlCommandCS +namespace SqlCommand_Connection { class Program { diff --git a/doc/samples/SqlCommand_ExecuteNonQuery.cs b/doc/samples/SqlCommand_ExecuteNonQuery.cs index 53ecbdecdb..62ec1c9481 100644 --- a/doc/samples/SqlCommand_ExecuteNonQuery.cs +++ b/doc/samples/SqlCommand_ExecuteNonQuery.cs @@ -3,7 +3,7 @@ using System.Data; using Microsoft.Data.SqlClient; -namespace SqlCommandCS +namespace SqlCommand_ExecuteNonQuery { class Program { diff --git a/doc/samples/SqlCommand_ExecuteNonQueryAsync.cs b/doc/samples/SqlCommand_ExecuteNonQueryAsync.cs index d1f8fc5db8..80cf7e0bbc 100644 --- a/doc/samples/SqlCommand_ExecuteNonQueryAsync.cs +++ b/doc/samples/SqlCommand_ExecuteNonQueryAsync.cs @@ -1,3 +1,5 @@ +namespace SqlCommand_ExecuteNonQueryAsync; + using System; // using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlCommand_ExecuteNonQuery_SP_DML.cs b/doc/samples/SqlCommand_ExecuteNonQuery_SP_DML.cs index 6b35ce142b..82a707c2ee 100644 --- a/doc/samples/SqlCommand_ExecuteNonQuery_SP_DML.cs +++ b/doc/samples/SqlCommand_ExecuteNonQuery_SP_DML.cs @@ -2,7 +2,7 @@ using System.Data; using Microsoft.Data.SqlClient; -namespace SqlCommandCS +namespace SqlCommand_ExecuteNonQuery_SP_DML { class Program { @@ -39,8 +39,6 @@ private static void CreateCommand(string connectionString) { using (SqlConnection connection = new SqlConnection(connectionString)) { - SqlCommand command = new SqlCommand(connection); - // // Assumes connection is a valid SqlConnection. connection.Open(); diff --git a/doc/samples/SqlCommand_ExecuteReader.cs b/doc/samples/SqlCommand_ExecuteReader.cs index 2632ef138d..2cf2a1952d 100644 --- a/doc/samples/SqlCommand_ExecuteReader.cs +++ b/doc/samples/SqlCommand_ExecuteReader.cs @@ -1,10 +1,10 @@ +namespace SqlCommand_ExecuteReader; + // using System; using System.Data; using Microsoft.Data.SqlClient; - - class Program { static void Main() diff --git a/doc/samples/SqlCommand_ExecuteReader2.cs b/doc/samples/SqlCommand_ExecuteReader2.cs index 86c3f66a7a..c1bd399483 100644 --- a/doc/samples/SqlCommand_ExecuteReader2.cs +++ b/doc/samples/SqlCommand_ExecuteReader2.cs @@ -1,3 +1,5 @@ +namespace SqlCommand_ExecuteReader2; + // using System; using System.Data; @@ -29,5 +31,5 @@ private static void CreateCommand(string queryString, } } } - // } +// diff --git a/doc/samples/SqlCommand_ExecuteReader_SequentialAccess.cs b/doc/samples/SqlCommand_ExecuteReader_SequentialAccess.cs index 864e183428..f3025ae5f4 100644 --- a/doc/samples/SqlCommand_ExecuteReader_SequentialAccess.cs +++ b/doc/samples/SqlCommand_ExecuteReader_SequentialAccess.cs @@ -1,3 +1,5 @@ +namespace SqlCommand_ExecuteReader_SequentialAccess; + using System; using System.Data; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlCommand_ExecuteScalar.cs b/doc/samples/SqlCommand_ExecuteScalar.cs index a6d81b71ef..2b08e9fcd1 100644 --- a/doc/samples/SqlCommand_ExecuteScalar.cs +++ b/doc/samples/SqlCommand_ExecuteScalar.cs @@ -1,3 +1,5 @@ +namespace SqlCommand_ExecuteScalar; + // using System; using System.Data; diff --git a/doc/samples/SqlCommand_ExecuteScalar_Return_Id.cs b/doc/samples/SqlCommand_ExecuteScalar_Return_Id.cs index 61f8029a16..233f3fba6f 100644 --- a/doc/samples/SqlCommand_ExecuteScalar_Return_Id.cs +++ b/doc/samples/SqlCommand_ExecuteScalar_Return_Id.cs @@ -1,4 +1,6 @@ -using System; +namespace SqlCommand_ExecuteScalar_Return_Id; + +using System; using System.Data; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlCommand_ExecuteXmlReader.cs b/doc/samples/SqlCommand_ExecuteXmlReader.cs index 6d1ed5a148..666cdb17d4 100644 --- a/doc/samples/SqlCommand_ExecuteXmlReader.cs +++ b/doc/samples/SqlCommand_ExecuteXmlReader.cs @@ -1,17 +1,21 @@ +namespace SqlCommand_ExecuteXmlReader; + // using System; using System.Data; using Microsoft.Data.SqlClient; -static void CreateXMLReader(string queryString, - string connectionString) +public class Sample { - using (SqlConnection connection = new SqlConnection( - connectionString)) + static void CreateXMLReader(string queryString, string connectionString) { - connection.Open(); - SqlCommand command = new SqlCommand(queryString, connection); - System.Xml.XmlReader reader = command.ExecuteXmlReader(); + using (SqlConnection connection = new SqlConnection( + connectionString)) + { + connection.Open(); + SqlCommand command = new SqlCommand(queryString, connection); + System.Xml.XmlReader reader = command.ExecuteXmlReader(); + } } } // diff --git a/doc/samples/SqlCommand_Intro.cs b/doc/samples/SqlCommand_Intro.cs index 5c16f78fd5..7e56fea639 100644 --- a/doc/samples/SqlCommand_Intro.cs +++ b/doc/samples/SqlCommand_Intro.cs @@ -1,3 +1,5 @@ +namespace SqlCommand_Intro; + // using System; using System.Data; diff --git a/doc/samples/SqlCommand_Prepare.cs b/doc/samples/SqlCommand_Prepare.cs index 6812494a7f..d2e9c7286e 100644 --- a/doc/samples/SqlCommand_Prepare.cs +++ b/doc/samples/SqlCommand_Prepare.cs @@ -3,7 +3,7 @@ using System.Data; using Microsoft.Data.SqlClient; -namespace SqlPrepareCS +namespace SqlCommand_Prepare { class Program { diff --git a/doc/samples/SqlCommand_SqlCommand1.cs b/doc/samples/SqlCommand_SqlCommand1.cs index 3eac5a9c38..da4c1adcc1 100644 --- a/doc/samples/SqlCommand_SqlCommand1.cs +++ b/doc/samples/SqlCommand_SqlCommand1.cs @@ -1,3 +1,6 @@ +#if NETFRAMEWORK +namespace SqlCommand_SqlCommand1; + // using System; using System.Xml; @@ -22,3 +25,4 @@ public void CreateCommand() // } +#endif diff --git a/doc/samples/SqlCommand_SqlCommand2.cs b/doc/samples/SqlCommand_SqlCommand2.cs index f564bc909f..df7923aa7b 100644 --- a/doc/samples/SqlCommand_SqlCommand2.cs +++ b/doc/samples/SqlCommand_SqlCommand2.cs @@ -4,7 +4,7 @@ using Microsoft.Data.SqlClient; -namespace SqlCommandCS +namespace SqlCommand_SqlCommand2 { class Program { diff --git a/doc/samples/SqlCommand_StoredProcedure.cs b/doc/samples/SqlCommand_StoredProcedure.cs index 2b9ef3e048..24afee099b 100644 --- a/doc/samples/SqlCommand_StoredProcedure.cs +++ b/doc/samples/SqlCommand_StoredProcedure.cs @@ -1,6 +1,9 @@ -using System; +namespace SqlCommand_StoredProcedure; + +using System; using System.Data; using Microsoft.Data.SqlClient; + class Program { static void Main() diff --git a/doc/samples/SqlConfigurableRetryLogic_OpenConnection.cs b/doc/samples/SqlConfigurableRetryLogic_OpenConnection.cs index dca259fecf..b31d4cfbb0 100644 --- a/doc/samples/SqlConfigurableRetryLogic_OpenConnection.cs +++ b/doc/samples/SqlConfigurableRetryLogic_OpenConnection.cs @@ -1,3 +1,5 @@ +namespace SqlConfigurableRetryLogic_OpenConnection; + using System; // using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlConfigurableRetryLogic_SqlCommand.cs b/doc/samples/SqlConfigurableRetryLogic_SqlCommand.cs index 71ace67def..63f7c70ebe 100644 --- a/doc/samples/SqlConfigurableRetryLogic_SqlCommand.cs +++ b/doc/samples/SqlConfigurableRetryLogic_SqlCommand.cs @@ -1,3 +1,5 @@ +namespace SqlConfigurableRetryLogic_SqlCommand; + using System; using System.Threading.Tasks; using Microsoft.Data.SqlClient; @@ -148,6 +150,8 @@ private static void RetryCommandSync(SqlRetryLogicBaseProvider provider, string cmd.ExecuteNonQuery(); } // +private class RetryCommandSample2 +{ // private static void RetryCommand(SqlRetryLogicBaseProvider provider) { @@ -195,6 +199,9 @@ private static async Task RetryCommandAsync(SqlRetryLogicBaseProvider provider, await cmd.ExecuteNonQueryAsync(); } // +} +private class RetryCommandSample3 +{ // private static void RetryCommand(SqlRetryLogicBaseProvider provider) { @@ -243,3 +250,4 @@ private static async Task RetryCommandBeginExecuteAsync(SqlRetryLogicBaseProvide } // } +} diff --git a/doc/samples/SqlConfigurableRetryLogic_SqlRetryLogicOptions.cs b/doc/samples/SqlConfigurableRetryLogic_SqlRetryLogicOptions.cs index fc03987a9a..17b7bbb746 100644 --- a/doc/samples/SqlConfigurableRetryLogic_SqlRetryLogicOptions.cs +++ b/doc/samples/SqlConfigurableRetryLogic_SqlRetryLogicOptions.cs @@ -1,3 +1,5 @@ +namespace SqlConfigurableRetryLogic_SqlRetryLogicOptions; + using System; using System.Text.RegularExpressions; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlConfigurableRetryLogic_StepByStep_CustomProvider.cs b/doc/samples/SqlConfigurableRetryLogic_StepByStep_CustomProvider.cs index a30e05389d..5a20909377 100644 --- a/doc/samples/SqlConfigurableRetryLogic_StepByStep_CustomProvider.cs +++ b/doc/samples/SqlConfigurableRetryLogic_StepByStep_CustomProvider.cs @@ -5,7 +5,7 @@ using System.Threading.Tasks; using Microsoft.Data.SqlClient; -namespace CustomCRL_Doc +namespace SqlConfigurableRetryLogic_StepByStep_CustomProvider { class Program { diff --git a/doc/samples/SqlConfigurableRetryLogic_StepByStep_OpenConnection.cs b/doc/samples/SqlConfigurableRetryLogic_StepByStep_OpenConnection.cs index 4ae3bc4c5f..cd925fde74 100644 --- a/doc/samples/SqlConfigurableRetryLogic_StepByStep_OpenConnection.cs +++ b/doc/samples/SqlConfigurableRetryLogic_StepByStep_OpenConnection.cs @@ -1,3 +1,5 @@ +namespace SqlConfigurableRetryLogic_StepByStep_OpenConnection; + using System; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlConnectionStringBuilder.cs b/doc/samples/SqlConnectionStringBuilder.cs index d1d22254f1..0737fb1f0b 100644 --- a/doc/samples/SqlConnectionStringBuilder.cs +++ b/doc/samples/SqlConnectionStringBuilder.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder2.cs b/doc/samples/SqlConnectionStringBuilder2.cs index 534f760c31..af868e0245 100644 --- a/doc/samples/SqlConnectionStringBuilder2.cs +++ b/doc/samples/SqlConnectionStringBuilder2.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder2; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder3.cs b/doc/samples/SqlConnectionStringBuilder3.cs index fc691489fe..44021140b3 100644 --- a/doc/samples/SqlConnectionStringBuilder3.cs +++ b/doc/samples/SqlConnectionStringBuilder3.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder3; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_ApplicationName.cs b/doc/samples/SqlConnectionStringBuilder_ApplicationName.cs index c60bb282a2..40d2466f7f 100644 --- a/doc/samples/SqlConnectionStringBuilder_ApplicationName.cs +++ b/doc/samples/SqlConnectionStringBuilder_ApplicationName.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_ApplicationName; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_AttachDBFilename.cs b/doc/samples/SqlConnectionStringBuilder_AttachDBFilename.cs index 0b0402b1ec..6f6c44a6c7 100644 --- a/doc/samples/SqlConnectionStringBuilder_AttachDBFilename.cs +++ b/doc/samples/SqlConnectionStringBuilder_AttachDBFilename.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_AttachDBFilename; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_Clear.cs b/doc/samples/SqlConnectionStringBuilder_Clear.cs index b91587ebe0..9b40cbc537 100644 --- a/doc/samples/SqlConnectionStringBuilder_Clear.cs +++ b/doc/samples/SqlConnectionStringBuilder_Clear.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_Clear; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_ConnectTimeout.cs b/doc/samples/SqlConnectionStringBuilder_ConnectTimeout.cs index 7c700150bc..40c863caf7 100644 --- a/doc/samples/SqlConnectionStringBuilder_ConnectTimeout.cs +++ b/doc/samples/SqlConnectionStringBuilder_ConnectTimeout.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_ConnectTimeout; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_ContainsKey.cs b/doc/samples/SqlConnectionStringBuilder_ContainsKey.cs index 7a9fd3b13a..3d53fdc4f8 100644 --- a/doc/samples/SqlConnectionStringBuilder_ContainsKey.cs +++ b/doc/samples/SqlConnectionStringBuilder_ContainsKey.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_ContainsKey; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_DataSource.cs b/doc/samples/SqlConnectionStringBuilder_DataSource.cs index 14ef063e11..3687f95c73 100644 --- a/doc/samples/SqlConnectionStringBuilder_DataSource.cs +++ b/doc/samples/SqlConnectionStringBuilder_DataSource.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_DataSource; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_InitialCatalog.cs b/doc/samples/SqlConnectionStringBuilder_InitialCatalog.cs index 9e057d44cb..05e3e49c55 100644 --- a/doc/samples/SqlConnectionStringBuilder_InitialCatalog.cs +++ b/doc/samples/SqlConnectionStringBuilder_InitialCatalog.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_InitialCatalog; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_InjectionAttack.cs b/doc/samples/SqlConnectionStringBuilder_InjectionAttack.cs index e91c629ac4..782994f296 100644 --- a/doc/samples/SqlConnectionStringBuilder_InjectionAttack.cs +++ b/doc/samples/SqlConnectionStringBuilder_InjectionAttack.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_InjectionAttack; + using System; using System.Data; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlConnectionStringBuilder_IntegratedSecurity.cs b/doc/samples/SqlConnectionStringBuilder_IntegratedSecurity.cs index b2e6773559..ab21fd3786 100644 --- a/doc/samples/SqlConnectionStringBuilder_IntegratedSecurity.cs +++ b/doc/samples/SqlConnectionStringBuilder_IntegratedSecurity.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_IntegratedSecurity; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_Keys.cs b/doc/samples/SqlConnectionStringBuilder_Keys.cs index 1c31194cb1..ab71709bfc 100644 --- a/doc/samples/SqlConnectionStringBuilder_Keys.cs +++ b/doc/samples/SqlConnectionStringBuilder_Keys.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_Keys; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_MultipleActiveResultSets.cs b/doc/samples/SqlConnectionStringBuilder_MultipleActiveResultSets.cs index 849951f4b1..1ea7f3557a 100644 --- a/doc/samples/SqlConnectionStringBuilder_MultipleActiveResultSets.cs +++ b/doc/samples/SqlConnectionStringBuilder_MultipleActiveResultSets.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_MultipleActiveResultSets; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_Password.cs b/doc/samples/SqlConnectionStringBuilder_Password.cs index 5bc1d011b9..f3f66f7614 100644 --- a/doc/samples/SqlConnectionStringBuilder_Password.cs +++ b/doc/samples/SqlConnectionStringBuilder_Password.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_Password; + using System; // using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlConnectionStringBuilder_Remove.cs b/doc/samples/SqlConnectionStringBuilder_Remove.cs index 835b8906c3..ab4c7d60d6 100644 --- a/doc/samples/SqlConnectionStringBuilder_Remove.cs +++ b/doc/samples/SqlConnectionStringBuilder_Remove.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_Remove; + using System; using System.Data; // diff --git a/doc/samples/SqlConnectionStringBuilder_TryGetValue.cs b/doc/samples/SqlConnectionStringBuilder_TryGetValue.cs index 6724adeb94..257b50569e 100644 --- a/doc/samples/SqlConnectionStringBuilder_TryGetValue.cs +++ b/doc/samples/SqlConnectionStringBuilder_TryGetValue.cs @@ -1,9 +1,10 @@ +namespace SqlConnectionStringBuilder_TryGetValue; + using System; using System.Data; // using Microsoft.Data.SqlClient; - class Program { static void Main() diff --git a/doc/samples/SqlConnectionStringBuilder_UserNamePwd.cs b/doc/samples/SqlConnectionStringBuilder_UserNamePwd.cs index efd4455c1b..1f186969bb 100644 --- a/doc/samples/SqlConnectionStringBuilder_UserNamePwd.cs +++ b/doc/samples/SqlConnectionStringBuilder_UserNamePwd.cs @@ -1,4 +1,6 @@ -using System; +namespace SqlConnectionStringBuilder_UserNamePwd; + +using System; using System.Data; using Microsoft.Data.SqlClient; using System.Configuration; diff --git a/doc/samples/SqlConnectionStringBuilder_Values.cs b/doc/samples/SqlConnectionStringBuilder_Values.cs index 553a02e5fb..af4509c703 100644 --- a/doc/samples/SqlConnectionStringBuilder_Values.cs +++ b/doc/samples/SqlConnectionStringBuilder_Values.cs @@ -1,3 +1,5 @@ +namespace SqlConnectionStringBuilder_Values; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_AccessTokenCallback.cs b/doc/samples/SqlConnection_AccessTokenCallback.cs index bcd10cfe56..05dee19ccb 100644 --- a/doc/samples/SqlConnection_AccessTokenCallback.cs +++ b/doc/samples/SqlConnection_AccessTokenCallback.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_AccessTokenCallback; + // using System; using System.Collections.Concurrent; diff --git a/doc/samples/SqlConnection_BeginTransaction.cs b/doc/samples/SqlConnection_BeginTransaction.cs index 13f9c0414d..671ba32a88 100644 --- a/doc/samples/SqlConnection_BeginTransaction.cs +++ b/doc/samples/SqlConnection_BeginTransaction.cs @@ -3,7 +3,7 @@ // using Microsoft.Data.SqlClient; -namespace Transaction1CS +namespace SqlConnection_BeginTransaction { class Program { diff --git a/doc/samples/SqlConnection_BeginTransaction1.cs b/doc/samples/SqlConnection_BeginTransaction1.cs index c7b7b6b651..a85bb64e8b 100644 --- a/doc/samples/SqlConnection_BeginTransaction1.cs +++ b/doc/samples/SqlConnection_BeginTransaction1.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_BeginTransaction1; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_BeginTransaction2.cs b/doc/samples/SqlConnection_BeginTransaction2.cs index 1be9f5987d..005abe726d 100644 --- a/doc/samples/SqlConnection_BeginTransaction2.cs +++ b/doc/samples/SqlConnection_BeginTransaction2.cs @@ -3,7 +3,7 @@ // using Microsoft.Data.SqlClient; -namespace Transaction1CS +namespace SqlConnection_BeginTransaction2 { class Program { diff --git a/doc/samples/SqlConnection_BeginTransaction3.cs b/doc/samples/SqlConnection_BeginTransaction3.cs index c68284f6d9..f9dc1a09c0 100644 --- a/doc/samples/SqlConnection_BeginTransaction3.cs +++ b/doc/samples/SqlConnection_BeginTransaction3.cs @@ -3,7 +3,7 @@ // using Microsoft.Data.SqlClient; -namespace Transaction1CS +namespace SqlConnection_BeginTransaction3 { class Program { diff --git a/doc/samples/SqlConnection_ConnectionString.cs b/doc/samples/SqlConnection_ConnectionString.cs index 0b5ed5a00b..ed724cc667 100644 --- a/doc/samples/SqlConnection_ConnectionString.cs +++ b/doc/samples/SqlConnection_ConnectionString.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_ConnectionString; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_ConnectionString1.cs b/doc/samples/SqlConnection_ConnectionString1.cs index 4af89c40da..0b32e7ec71 100644 --- a/doc/samples/SqlConnection_ConnectionString1.cs +++ b/doc/samples/SqlConnection_ConnectionString1.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_ConnectionString1; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_ConnectionTimeout.cs b/doc/samples/SqlConnection_ConnectionTimeout.cs index 0ad488ebde..827344c4b0 100644 --- a/doc/samples/SqlConnection_ConnectionTimeout.cs +++ b/doc/samples/SqlConnection_ConnectionTimeout.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_ConnectionTimeout; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_CreateCommand.cs b/doc/samples/SqlConnection_CreateCommand.cs index 0325c59058..2b27322336 100644 --- a/doc/samples/SqlConnection_CreateCommand.cs +++ b/doc/samples/SqlConnection_CreateCommand.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_CreateCommand; + using System.Data; // using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlConnection_DataSource.cs b/doc/samples/SqlConnection_DataSource.cs index 779a5af14f..155bed3a68 100644 --- a/doc/samples/SqlConnection_DataSource.cs +++ b/doc/samples/SqlConnection_DataSource.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_DataSource; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_Database.cs b/doc/samples/SqlConnection_Database.cs index 4cedb11b22..b386290b94 100644 --- a/doc/samples/SqlConnection_Database.cs +++ b/doc/samples/SqlConnection_Database.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_Database; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_GetSchema.cs b/doc/samples/SqlConnection_GetSchema.cs index 8ca75b225e..34a30c15a1 100644 --- a/doc/samples/SqlConnection_GetSchema.cs +++ b/doc/samples/SqlConnection_GetSchema.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_GetSchema; + // using System; using System.Data; diff --git a/doc/samples/SqlConnection_GetSchema_Restriction.cs b/doc/samples/SqlConnection_GetSchema_Restriction.cs index 209b0b8c3a..9164ec5a49 100644 --- a/doc/samples/SqlConnection_GetSchema_Restriction.cs +++ b/doc/samples/SqlConnection_GetSchema_Restriction.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_GetSchema_Restriction; + // using System; using System.Data; diff --git a/doc/samples/SqlConnection_GetSchema_Tables.cs b/doc/samples/SqlConnection_GetSchema_Tables.cs index 34f04439a6..8c9afbec5e 100644 --- a/doc/samples/SqlConnection_GetSchema_Tables.cs +++ b/doc/samples/SqlConnection_GetSchema_Tables.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_GetSchema_Tables; + // using System; using System.Data; diff --git a/doc/samples/SqlConnection_InfoMessage_StateChange.cs b/doc/samples/SqlConnection_InfoMessage_StateChange.cs index 06e7ec0578..3cec5b959c 100644 --- a/doc/samples/SqlConnection_InfoMessage_StateChange.cs +++ b/doc/samples/SqlConnection_InfoMessage_StateChange.cs @@ -2,7 +2,7 @@ using System.Data; using Microsoft.Data.SqlClient; -namespace ClassLibraryTest +namespace SqlConnection_InfoMessage_StateChange { public class Class1 { diff --git a/doc/samples/SqlConnection_Open.cs b/doc/samples/SqlConnection_Open.cs index 932b17fe3f..55b3aa3dbe 100644 --- a/doc/samples/SqlConnection_Open.cs +++ b/doc/samples/SqlConnection_Open.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_Open; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_OpenAsync_ContinueWith.cs b/doc/samples/SqlConnection_OpenAsync_ContinueWith.cs index 1bc63d3af0..da7ea1f69a 100644 --- a/doc/samples/SqlConnection_OpenAsync_ContinueWith.cs +++ b/doc/samples/SqlConnection_OpenAsync_ContinueWith.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_OpenAsync_ContinueWith; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_PacketSize.cs b/doc/samples/SqlConnection_PacketSize.cs index 7503818c30..75424466ac 100644 --- a/doc/samples/SqlConnection_PacketSize.cs +++ b/doc/samples/SqlConnection_PacketSize.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_PacketSize; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_Pooling.cs b/doc/samples/SqlConnection_Pooling.cs index f3a0522c55..d274ffda29 100644 --- a/doc/samples/SqlConnection_Pooling.cs +++ b/doc/samples/SqlConnection_Pooling.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_Pooling; + using System; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlConnection_Pooling_Use_Statement.cs b/doc/samples/SqlConnection_Pooling_Use_Statement.cs index ac37da5972..cb22a1893a 100644 --- a/doc/samples/SqlConnection_Pooling_Use_Statement.cs +++ b/doc/samples/SqlConnection_Pooling_Use_Statement.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_Pooling_Use_Statement; + using System; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlConnection_ServerVersion.cs b/doc/samples/SqlConnection_ServerVersion.cs index c057e63f56..55f8b16ea1 100644 --- a/doc/samples/SqlConnection_ServerVersion.cs +++ b/doc/samples/SqlConnection_ServerVersion.cs @@ -3,7 +3,7 @@ // using Microsoft.Data.SqlClient; -namespace SqlConnection1CS +namespace SqlConnection_ServerVersion { class Program { diff --git a/doc/samples/SqlConnection_SqlConnection.cs b/doc/samples/SqlConnection_SqlConnection.cs index 59e5587e5a..13a9832ce1 100644 --- a/doc/samples/SqlConnection_SqlConnection.cs +++ b/doc/samples/SqlConnection_SqlConnection.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_SqlConnection; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_SqlConnection1.cs b/doc/samples/SqlConnection_SqlConnection1.cs index 19a9d5c5a5..808974e0a9 100644 --- a/doc/samples/SqlConnection_SqlConnection1.cs +++ b/doc/samples/SqlConnection_SqlConnection1.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_SqlConnection1; + using System; using System.Data; // diff --git a/doc/samples/SqlConnection_WorkstationId.cs b/doc/samples/SqlConnection_WorkstationId.cs index 2edd6d878f..23919884be 100644 --- a/doc/samples/SqlConnection_WorkstationId.cs +++ b/doc/samples/SqlConnection_WorkstationId.cs @@ -1,3 +1,5 @@ +namespace SqlConnection_WorkstationId; + using System; using System.Data; // diff --git a/doc/samples/SqlDataAdapter.cs b/doc/samples/SqlDataAdapter.cs index aed3c92111..95587f550d 100644 --- a/doc/samples/SqlDataAdapter.cs +++ b/doc/samples/SqlDataAdapter.cs @@ -1,3 +1,5 @@ +namespace SqlDataAdapterCS; + using System; using System.Data; // diff --git a/doc/samples/SqlDataAdapter_Batch.cs b/doc/samples/SqlDataAdapter_Batch.cs index f7deb7e87d..425677dfab 100644 --- a/doc/samples/SqlDataAdapter_Batch.cs +++ b/doc/samples/SqlDataAdapter_Batch.cs @@ -2,7 +2,7 @@ using Microsoft.Data.SqlClient; using System.Data; -namespace DataAdapterTest +namespace SqlDataAdapter_Batch { class Program { diff --git a/doc/samples/SqlDataAdapter_Concurrency.cs b/doc/samples/SqlDataAdapter_Concurrency.cs index fd40eb9f7f..0a69e4aad8 100644 --- a/doc/samples/SqlDataAdapter_Concurrency.cs +++ b/doc/samples/SqlDataAdapter_Concurrency.cs @@ -1,3 +1,5 @@ +namespace SqlDataAdapter_Concurrency; + // using System; using System.Data; diff --git a/doc/samples/SqlDataAdapter_Events.cs b/doc/samples/SqlDataAdapter_Events.cs index deacdeb298..1c8188b046 100644 --- a/doc/samples/SqlDataAdapter_Events.cs +++ b/doc/samples/SqlDataAdapter_Events.cs @@ -2,7 +2,7 @@ using Microsoft.Data.SqlClient; using System.Data; -namespace DataAdapterTest +namespace SqlDataAdapter_Events { class Program { diff --git a/doc/samples/SqlDataAdapter_FillDataSet.cs b/doc/samples/SqlDataAdapter_FillDataSet.cs index 0365bedc40..378b2d7e74 100644 --- a/doc/samples/SqlDataAdapter_FillDataSet.cs +++ b/doc/samples/SqlDataAdapter_FillDataSet.cs @@ -2,7 +2,7 @@ using Microsoft.Data.SqlClient; using System.Data; -namespace DataAdapterTest +namespace SqlDataAdapter_FillDataSet { class Program { diff --git a/doc/samples/SqlDataAdapter_MergeIdentity.cs b/doc/samples/SqlDataAdapter_MergeIdentity.cs index 010beda2c7..aa0b2b6fa5 100644 --- a/doc/samples/SqlDataAdapter_MergeIdentity.cs +++ b/doc/samples/SqlDataAdapter_MergeIdentity.cs @@ -1,4 +1,6 @@ -using System; +namespace SqlDataAdapter_MergeIdentity; + +using System; using System.Data; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlDataAdapter_Paging.cs b/doc/samples/SqlDataAdapter_Paging.cs index 511c05ba16..c5f7a50322 100644 --- a/doc/samples/SqlDataAdapter_Paging.cs +++ b/doc/samples/SqlDataAdapter_Paging.cs @@ -2,7 +2,7 @@ using Microsoft.Data.SqlClient; using System.Data; -namespace DataAdapterTest +namespace SqlDataAdapter_Paging { class Program { diff --git a/doc/samples/SqlDataAdapter_Properties.cs b/doc/samples/SqlDataAdapter_Properties.cs index d66385c5d8..aa59283844 100644 --- a/doc/samples/SqlDataAdapter_Properties.cs +++ b/doc/samples/SqlDataAdapter_Properties.cs @@ -1,10 +1,11 @@ -// +namespace SqlDataAdapter_Properties; + +// using System; using System.Data; using System.Data.Common; using Microsoft.Data.SqlClient; using System.Linq; -using CSDataAdapterOperations.Properties; class Program { @@ -189,18 +190,15 @@ private static void ShowDataTable(DataTable table) } } -namespace CSDataAdapterOperations.Properties +internal sealed partial class Settings : System.Configuration.ApplicationSettingsBase { - internal sealed partial class Settings : System.Configuration.ApplicationSettingsBase - { - private static readonly Settings defaultInstance = - ((Settings)(System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); + private static readonly Settings defaultInstance = + ((Settings)(System.Configuration.ApplicationSettingsBase.Synchronized(new Settings()))); - public static Settings Default => defaultInstance; + public static Settings Default => defaultInstance; - [System.Configuration.ApplicationScopedSetting()] - [System.Configuration.DefaultSettingValue("Data Source=(local);Initial Catalog=MySchool;Integrated Security=True")] - public string MySchoolConnectionString => ((string)(this["MySchoolConnectionString"])); - } + [System.Configuration.ApplicationScopedSetting()] + [System.Configuration.DefaultSettingValue("Data Source=(local);Initial Catalog=MySchool;Integrated Security=True")] + public string MySchoolConnectionString => ((string)(this["MySchoolConnectionString"])); } // diff --git a/doc/samples/SqlDataAdapter_RetrieveIdentityStoredProcedure.cs b/doc/samples/SqlDataAdapter_RetrieveIdentityStoredProcedure.cs index 976de4e3b1..e66352456a 100644 --- a/doc/samples/SqlDataAdapter_RetrieveIdentityStoredProcedure.cs +++ b/doc/samples/SqlDataAdapter_RetrieveIdentityStoredProcedure.cs @@ -1,4 +1,6 @@ -using System; +namespace SqlDataAdapter_RetrieveIdentityStoredProcedure; + +using System; using System.Data; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlDataAdapter_RowUpdated.cs b/doc/samples/SqlDataAdapter_RowUpdated.cs index ea303f0e9d..bcd44fb46a 100644 --- a/doc/samples/SqlDataAdapter_RowUpdated.cs +++ b/doc/samples/SqlDataAdapter_RowUpdated.cs @@ -1,3 +1,6 @@ +#if NETFRAMEWORK +namespace SqlDataAdapter_RowUpdated; + using System; using System.Data; // @@ -75,3 +78,4 @@ private static void PrintEventArgs(SqlRowUpdatedEventArgs args) } } // +#endif diff --git a/doc/samples/SqlDataAdapter_SPIdentityReturn.cs b/doc/samples/SqlDataAdapter_SPIdentityReturn.cs index 41628b5478..d94e87cd01 100644 --- a/doc/samples/SqlDataAdapter_SPIdentityReturn.cs +++ b/doc/samples/SqlDataAdapter_SPIdentityReturn.cs @@ -1,4 +1,6 @@ -// +namespace SqlDataAdapter_SPIdentityReturn; + +// using System; using System.Data; using Microsoft.Data.SqlClient; @@ -49,7 +51,7 @@ private static void ReturnIdentity(string connectionString) adapter.Update(categories); // Retrieve the ReturnValue. - Int rowCount = (Int)adapter.InsertCommand.Parameters["@RowCount"].Value; + int rowCount = (int)adapter.InsertCommand.Parameters["@RowCount"].Value; Console.WriteLine("ReturnValue: {0}", rowCount.ToString()); Console.WriteLine("All Rows:"); diff --git a/doc/samples/SqlDataAdapter_SelectCommand.cs b/doc/samples/SqlDataAdapter_SelectCommand.cs index aecd1db331..b55809494e 100644 --- a/doc/samples/SqlDataAdapter_SelectCommand.cs +++ b/doc/samples/SqlDataAdapter_SelectCommand.cs @@ -1,3 +1,6 @@ +#if NETFRAMEWORK +namespace SqlDataAdapter_SelectCommand; + using System; using System.Data; // @@ -26,3 +29,4 @@ private static DataSet SelectRows(DataSet dataset, } } // +#endif diff --git a/doc/samples/SqlDataAdapter_SqlDataAdapter.cs b/doc/samples/SqlDataAdapter_SqlDataAdapter.cs index f48edacc8a..ae642d5f9a 100644 --- a/doc/samples/SqlDataAdapter_SqlDataAdapter.cs +++ b/doc/samples/SqlDataAdapter_SqlDataAdapter.cs @@ -1,3 +1,5 @@ +namespace SqlDataAdapter_SqlDataAdapter; + using System; using System.Data; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlDataAdapter_SqlDataAdapter1.cs b/doc/samples/SqlDataAdapter_SqlDataAdapter1.cs index f8fd5a2015..9f04ed8865 100644 --- a/doc/samples/SqlDataAdapter_SqlDataAdapter1.cs +++ b/doc/samples/SqlDataAdapter_SqlDataAdapter1.cs @@ -1,3 +1,5 @@ +namespace SqlDataAdapter_SqlDataAdapter1; + using System; using System.Data; // diff --git a/doc/samples/SqlDataAdapter_SqlDataAdapter2.cs b/doc/samples/SqlDataAdapter_SqlDataAdapter2.cs index 275dd4c02a..6b73c91cae 100644 --- a/doc/samples/SqlDataAdapter_SqlDataAdapter2.cs +++ b/doc/samples/SqlDataAdapter_SqlDataAdapter2.cs @@ -1,3 +1,5 @@ +namespace SqlDataAdapter_SqlDataAdapter2; + using System; using System.Data; // diff --git a/doc/samples/SqlDataAdapter_SqlDataAdapter3.cs b/doc/samples/SqlDataAdapter_SqlDataAdapter3.cs index 721e9ef75b..67866484f7 100644 --- a/doc/samples/SqlDataAdapter_SqlDataAdapter3.cs +++ b/doc/samples/SqlDataAdapter_SqlDataAdapter3.cs @@ -1,3 +1,5 @@ +namespace SqlDataAdapter_SqlDataAdapter3; + using System; using System.Data; // diff --git a/doc/samples/SqlDataAdapter_TableMappings.cs b/doc/samples/SqlDataAdapter_TableMappings.cs index 4f2fc112e3..7023963cd3 100644 --- a/doc/samples/SqlDataAdapter_TableMappings.cs +++ b/doc/samples/SqlDataAdapter_TableMappings.cs @@ -3,7 +3,7 @@ using System.Data; using System.Data.Common; -namespace DataAdapterTest +namespace SqlDataAdapter_TableMappings { class Program { diff --git a/doc/samples/SqlDataAdapter_Update.cs b/doc/samples/SqlDataAdapter_Update.cs index 9b1e194bd1..3dfad3708f 100644 --- a/doc/samples/SqlDataAdapter_Update.cs +++ b/doc/samples/SqlDataAdapter_Update.cs @@ -1,7 +1,8 @@ -using System; +namespace SqlDataAdapterUpdateExample; + +using System; using System.Data; using Microsoft.Data.SqlClient; - class Program { static void Main() diff --git a/doc/samples/SqlDataReader_Close.cs b/doc/samples/SqlDataReader_Close.cs index 102fa6de85..5371195f65 100644 --- a/doc/samples/SqlDataReader_Close.cs +++ b/doc/samples/SqlDataReader_Close.cs @@ -1,3 +1,5 @@ +namespace SqlDataReader_Close; + using System; using System.Data; // diff --git a/doc/samples/SqlDataReader_DataDiscoveryAndClassification.cs b/doc/samples/SqlDataReader_DataDiscoveryAndClassification.cs index 352cb20fe9..50ac888839 100644 --- a/doc/samples/SqlDataReader_DataDiscoveryAndClassification.cs +++ b/doc/samples/SqlDataReader_DataDiscoveryAndClassification.cs @@ -1,4 +1,6 @@ -// +namespace SqlDataReader_DataDiscoveryAndClassification; + +// using System; using Microsoft.Data.SqlClient; using Microsoft.Data.SqlClient.DataClassification; @@ -170,7 +172,7 @@ private static void PrintSensitivityClassification(SqlDataReader reader, bool ra Console.WriteLine($"Sensitivity Rank: {sp.SensitivityRank.ToString()}"); } } - Console.Writeline($"reader.SensitivityClassification.SensitivityRank : {reader.SensitivityClassification.SensitivityRank.ToString()}"); + Console.WriteLine($"reader.SensitivityClassification.SensitivityRank : {reader.SensitivityClassification.SensitivityRank.ToString()}"); } } diff --git a/doc/samples/SqlDataReader_GetOrdinal.cs b/doc/samples/SqlDataReader_GetOrdinal.cs index ff69173616..ab602f55eb 100644 --- a/doc/samples/SqlDataReader_GetOrdinal.cs +++ b/doc/samples/SqlDataReader_GetOrdinal.cs @@ -1,3 +1,5 @@ +namespace SqlDataReader_GetOrdinal; + using System; using System.Data; // diff --git a/doc/samples/SqlDataReader_GetSchemaTable.cs b/doc/samples/SqlDataReader_GetSchemaTable.cs index 5f540ae5d9..dd28eb7b14 100644 --- a/doc/samples/SqlDataReader_GetSchemaTable.cs +++ b/doc/samples/SqlDataReader_GetSchemaTable.cs @@ -2,7 +2,7 @@ using Microsoft.Data.SqlClient; using System.Data; -namespace NextResultCS +namespace SqlDataReader_GetSchemaTable { class Program { diff --git a/doc/samples/SqlDataReader_GetSqlXml.cs b/doc/samples/SqlDataReader_GetSqlXml.cs index 6545b8b187..4c8e3932f9 100644 --- a/doc/samples/SqlDataReader_GetSqlXml.cs +++ b/doc/samples/SqlDataReader_GetSqlXml.cs @@ -1,3 +1,5 @@ +namespace SqlDataReader_GetSqlXml; + using System; using System.Data; // diff --git a/doc/samples/SqlDataReader_HasRows.cs b/doc/samples/SqlDataReader_HasRows.cs index caeb01f1d6..01e567a0a4 100644 --- a/doc/samples/SqlDataReader_HasRows.cs +++ b/doc/samples/SqlDataReader_HasRows.cs @@ -2,7 +2,7 @@ using Microsoft.Data.SqlClient; using System.Data; -namespace NextResultCS +namespace SqlDataReader_HasRows { class Program { diff --git a/doc/samples/SqlDataReader_IsDBNull.cs b/doc/samples/SqlDataReader_IsDBNull.cs index 903ac8f424..890ff262b7 100644 --- a/doc/samples/SqlDataReader_IsDBNull.cs +++ b/doc/samples/SqlDataReader_IsDBNull.cs @@ -1,3 +1,5 @@ +namespace SqlDataReader_IsDBNull; + using System; using System.Data; // diff --git a/doc/samples/SqlDataReader_NextResult.cs b/doc/samples/SqlDataReader_NextResult.cs index 4dccf5a55f..722ed88004 100644 --- a/doc/samples/SqlDataReader_NextResult.cs +++ b/doc/samples/SqlDataReader_NextResult.cs @@ -4,7 +4,7 @@ using Microsoft.Data.SqlClient; using System.Data; -namespace NextResultCS +namespace SqlDataReader_NextResult { class Program { diff --git a/doc/samples/SqlDataReader_Read.cs b/doc/samples/SqlDataReader_Read.cs index 3a61b61cfd..586ff8995b 100644 --- a/doc/samples/SqlDataReader_Read.cs +++ b/doc/samples/SqlDataReader_Read.cs @@ -1,3 +1,5 @@ +namespace SqlDataReader_Read; + using System; using System.Data; // diff --git a/doc/samples/SqlDataRecord.cs b/doc/samples/SqlDataRecord.cs index 009656d354..f81de5b850 100644 --- a/doc/samples/SqlDataRecord.cs +++ b/doc/samples/SqlDataRecord.cs @@ -1,8 +1,11 @@ +#if NETFRAMEWORK +namespace SqlDataRecordCS; + using System; using System.Data; using System.Data.Sql; using System.Data.SqlTypes; -using Microsoft.Data.SqlClient.Server; +using Microsoft.SqlServer.Server; public sealed partial class SqlDataRecordTester { @@ -10,7 +13,7 @@ private SqlDataRecordTester() { } -[Microsoft.Data.SqlClient.Server.SqlProcedure] +[SqlProcedure] public static void CallTestMethods() { CreateNewRecord(); @@ -21,7 +24,7 @@ public static void CallTestMethods() // //using Microsoft.Data.SqlClient.Server; -[Microsoft.Data.SqlClient.Server.SqlProcedure] +[SqlProcedure] public static void CreateNewRecord() { @@ -73,3 +76,4 @@ public static void CreateNewRecord1() } } +#endif diff --git a/doc/samples/SqlDataSourceEnumeratorExample.cs b/doc/samples/SqlDataSourceEnumeratorExample.cs index 279881c672..746e739dfa 100644 --- a/doc/samples/SqlDataSourceEnumeratorExample.cs +++ b/doc/samples/SqlDataSourceEnumeratorExample.cs @@ -1,3 +1,5 @@ +namespace SqlDataSourceEnumeratorExample; + using System; // using Microsoft.Data.Sql; diff --git a/doc/samples/SqlDataSourceEnumeratorVersionExample.cs b/doc/samples/SqlDataSourceEnumeratorVersionExample.cs index 73eefc1235..a985419ac6 100644 --- a/doc/samples/SqlDataSourceEnumeratorVersionExample.cs +++ b/doc/samples/SqlDataSourceEnumeratorVersionExample.cs @@ -1,3 +1,5 @@ +namespace SqlDataSourceEnumeratorVersionExample; + using System; // using Microsoft.Data.Sql; diff --git a/doc/samples/SqlDependency_Start.cs b/doc/samples/SqlDependency_Start.cs index a822072ec6..3f225024a7 100644 --- a/doc/samples/SqlDependency_Start.cs +++ b/doc/samples/SqlDependency_Start.cs @@ -1,3 +1,7 @@ +/* +#if NETFRAMEWORK +namespace SqlDependencyExample; + using System; using System.Data; using System.Configuration; @@ -80,3 +84,5 @@ private string GetSQL() } // } +#endif +*/ diff --git a/doc/samples/SqlError_State.cs b/doc/samples/SqlError_State.cs index f4f10738af..9dfac72a9e 100644 --- a/doc/samples/SqlError_State.cs +++ b/doc/samples/SqlError_State.cs @@ -4,7 +4,7 @@ using System.Collections.Generic; using System.Text; -namespace Classic_WebData_SqlError.StateCS +namespace SqlError_State { class Program { diff --git a/doc/samples/SqlError_ToString.cs b/doc/samples/SqlError_ToString.cs index b6645049a2..2a216f0867 100644 --- a/doc/samples/SqlError_ToString.cs +++ b/doc/samples/SqlError_ToString.cs @@ -1,3 +1,5 @@ +namespace SqlError_ToString; + using System; using System.Data; // diff --git a/doc/samples/SqlException_Errors1.cs b/doc/samples/SqlException_Errors1.cs index 30c54b08f2..7c1a54c815 100644 --- a/doc/samples/SqlException_Errors1.cs +++ b/doc/samples/SqlException_Errors1.cs @@ -1,3 +1,5 @@ +namespace SqlException_Error1; + using System; using System.Data; // diff --git a/doc/samples/SqlException_Errors2.cs b/doc/samples/SqlException_Errors2.cs index d72b6cd7c8..b3fb41acd0 100644 --- a/doc/samples/SqlException_Errors2.cs +++ b/doc/samples/SqlException_Errors2.cs @@ -1,3 +1,5 @@ +namespace SqlException_Error2; + using System; using System.Data; // diff --git a/doc/samples/SqlFunction.cs b/doc/samples/SqlFunction.cs index ffc4b21638..abd196b307 100644 --- a/doc/samples/SqlFunction.cs +++ b/doc/samples/SqlFunction.cs @@ -1,8 +1,10 @@ +namespace SqlFunctionCS; + using System.Collections; //----------------------------------------------------------------------------- // using System.Data.SqlTypes; -using Microsoft.Data.SqlClient.Server; +using Microsoft.SqlServer.Server; public partial class UserDefinedFunctions { diff --git a/doc/samples/SqlFunctionAttribute.cs b/doc/samples/SqlFunctionAttribute.cs index 28a027caad..83d9db28f7 100644 --- a/doc/samples/SqlFunctionAttribute.cs +++ b/doc/samples/SqlFunctionAttribute.cs @@ -1,3 +1,5 @@ +namespace SqlFunctionAttribute; + using System; using System.IO; using System.Collections; diff --git a/doc/samples/SqlGuid.cs b/doc/samples/SqlGuid.cs index 47ca37fa49..e182b1ed46 100644 --- a/doc/samples/SqlGuid.cs +++ b/doc/samples/SqlGuid.cs @@ -1,3 +1,5 @@ +namespace SqlGuidCS; + using System; using System.Data; // diff --git a/doc/samples/SqlInt32_IsNull.cs b/doc/samples/SqlInt32_IsNull.cs index fa48b28c99..fa6587ab3c 100644 --- a/doc/samples/SqlInt32_IsNull.cs +++ b/doc/samples/SqlInt32_IsNull.cs @@ -1,3 +1,5 @@ +namespace SqlInt32_IsNull; + using System; using System.Data; // diff --git a/doc/samples/SqlJsonExample.cs b/doc/samples/SqlJsonExample.cs index 7244448c73..c17398f8cf 100644 --- a/doc/samples/SqlJsonExample.cs +++ b/doc/samples/SqlJsonExample.cs @@ -1,3 +1,5 @@ +namespace SqlJsonExample; + // JSONConsoleApp: End-to-end demo of working with // SQL Server JSON datatype via Microsoft.Data.SqlClient // @@ -17,6 +19,8 @@ using Microsoft.Data.SqlClient; using Microsoft.Data.SqlTypes; using System.Text.Json; +using System; +using System.IO; class Program { @@ -273,4 +277,3 @@ private static void InsertJSONWithStr(string connString) } } // - diff --git a/doc/samples/SqlMetaData.cs b/doc/samples/SqlMetaData.cs index a8d0491bd0..c23cf363b7 100644 --- a/doc/samples/SqlMetaData.cs +++ b/doc/samples/SqlMetaData.cs @@ -1,8 +1,11 @@ +#if NETFRAMEWORK +namespace SqlMetaDataCS; + using System; using System.Data; using System.Data.Sql; using System.Data.SqlTypes; -using Microsoft.Data.SqlClient.Server; +using Microsoft.SqlServer.Server; public sealed partial class SqlMetaDataTester { @@ -13,7 +16,7 @@ private SqlMetaDataTester() // // using Microsoft.Data.SqlClient.Server; - [Microsoft.Data.SqlClient.Server.SqlProcedure] + [SqlProcedure] public static void CreateNewRecord() { // Variables. @@ -62,3 +65,4 @@ public static void CreateSqlMetaData2() } // } +#endif diff --git a/doc/samples/SqlMethod.cs b/doc/samples/SqlMethod.cs index 46e8e49b80..6baa30f03c 100644 --- a/doc/samples/SqlMethod.cs +++ b/doc/samples/SqlMethod.cs @@ -1,12 +1,15 @@ +#if NETFRAMEWORK +namespace SqlMethodCS; + using System; using System.Data; // -using Microsoft.Data.SqlClient.Server; +using Microsoft.SqlServer.Server; using System.Data.SqlTypes; using System.Text; [Serializable] -[Microsoft.Data.SqlClient.Server.SqlUserDefinedType(Format.Native, +[SqlUserDefinedType(Format.Native, IsByteOrdered = true, Name = "Point", ValidationMethodName = "ValidatePoint")] public struct Point : INullable @@ -125,3 +128,4 @@ private bool ValidatePoint() return true; } } +#endif diff --git a/doc/samples/SqlParameter.cs b/doc/samples/SqlParameter.cs index 628cb3dde9..5dc9cc5374 100644 --- a/doc/samples/SqlParameter.cs +++ b/doc/samples/SqlParameter.cs @@ -1,3 +1,5 @@ +namespace SqlParameterCS; + using System; using System.Data; // diff --git a/doc/samples/SqlParameterCollection_Add.cs b/doc/samples/SqlParameterCollection_Add.cs index 0a22a5eda9..35706ca0bc 100644 --- a/doc/samples/SqlParameterCollection_Add.cs +++ b/doc/samples/SqlParameterCollection_Add.cs @@ -1,3 +1,5 @@ +namespace SqlParameterCollection_Add; + using System; using System.Data; // @@ -10,4 +12,4 @@ public void AddSqlParameter(SqlCommand command) command.Parameters.Add(new SqlParameter("Description", "Beverages")); } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlParameterCollection_Add1.cs b/doc/samples/SqlParameterCollection_Add1.cs index 1042727cef..c5fdc1865e 100644 --- a/doc/samples/SqlParameterCollection_Add1.cs +++ b/doc/samples/SqlParameterCollection_Add1.cs @@ -1,3 +1,5 @@ +namespace SqlParameterCollection_Add1; + using System; using System.Data; // @@ -13,4 +15,4 @@ public void AddSqlParameter(SqlCommand command) command.Parameters.Add(param); } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlParameterCollection_Add3.cs b/doc/samples/SqlParameterCollection_Add3.cs index d8e6a87877..a2f96a8829 100644 --- a/doc/samples/SqlParameterCollection_Add3.cs +++ b/doc/samples/SqlParameterCollection_Add3.cs @@ -1,3 +1,5 @@ +namespace SqlParameterCollection_Add3; + using System; using System.Data; // @@ -13,4 +15,4 @@ public void AddSqlParameter(SqlCommand command) param.Value = "Beverages"; } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlParameterCollection_Add5.cs b/doc/samples/SqlParameterCollection_Add5.cs index 8e246e31a7..ff27d1b87d 100644 --- a/doc/samples/SqlParameterCollection_Add5.cs +++ b/doc/samples/SqlParameterCollection_Add5.cs @@ -1,3 +1,5 @@ +namespace SqlParameterCollection_Add5; + using System; using System.Data; // @@ -10,4 +12,4 @@ public void AddSqlParameter(SqlCommand cmd) SqlParameter p1 = cmd.Parameters.Add("@Description", SqlDbType.NVarChar, 16, "Description"); } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlParameterCollection_Add6.cs b/doc/samples/SqlParameterCollection_Add6.cs index f2c8502551..76d134b9ad 100644 --- a/doc/samples/SqlParameterCollection_Add6.cs +++ b/doc/samples/SqlParameterCollection_Add6.cs @@ -1,3 +1,6 @@ +#if NETFRAMEWORK +namespace SqlParameterCollection_Add6; + using System; using System.Data; // @@ -27,4 +30,5 @@ public void AddSqlParameters() } } -// \ No newline at end of file +// +#endif diff --git a/doc/samples/SqlParameterCollection_AddWithValue.cs b/doc/samples/SqlParameterCollection_AddWithValue.cs index ee334d95de..645125bae2 100644 --- a/doc/samples/SqlParameterCollection_AddWithValue.cs +++ b/doc/samples/SqlParameterCollection_AddWithValue.cs @@ -1,3 +1,5 @@ +namespace SqlParameterCollection_AddWithValue; + // using System; using System.Data; diff --git a/doc/samples/SqlParameterCollection_Count.cs b/doc/samples/SqlParameterCollection_Count.cs index 7f20fa7b32..8d7e1d54f6 100644 --- a/doc/samples/SqlParameterCollection_Count.cs +++ b/doc/samples/SqlParameterCollection_Count.cs @@ -1,3 +1,5 @@ +namespace SqlParameterCollection_Count; + using System; using System.Data; // @@ -72,4 +74,4 @@ static private string GetConnectionString() "Integrated Security=SSPI"; } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlParameterCollection_Remove.cs b/doc/samples/SqlParameterCollection_Remove.cs index a5790ff631..57c123a444 100644 --- a/doc/samples/SqlParameterCollection_Remove.cs +++ b/doc/samples/SqlParameterCollection_Remove.cs @@ -1,3 +1,6 @@ +#if NETFRAMEWORK +namespace SqlParameterCollection_Remove; + using System; using System.Data; // @@ -22,4 +25,5 @@ public void SearchSqlParams() command.Parameters.Remove(param); } } -// \ No newline at end of file +// +#endif diff --git a/doc/samples/SqlParameter_IsNullable.cs b/doc/samples/SqlParameter_IsNullable.cs index ff12a8752d..82a8bfd62e 100644 --- a/doc/samples/SqlParameter_IsNullable.cs +++ b/doc/samples/SqlParameter_IsNullable.cs @@ -1,3 +1,5 @@ +namespace SqlParameter_IsNullable; + using System; using System.Data; // diff --git a/doc/samples/SqlParameter_ParameterName.cs b/doc/samples/SqlParameter_ParameterName.cs index a3c7a18835..06730a54e9 100644 --- a/doc/samples/SqlParameter_ParameterName.cs +++ b/doc/samples/SqlParameter_ParameterName.cs @@ -1,3 +1,5 @@ +namespace SqlParameter_ParameterName; + using System; using System.Data; // diff --git a/doc/samples/SqlParameter_Precision.cs b/doc/samples/SqlParameter_Precision.cs index 609b6c1557..35f068f878 100644 --- a/doc/samples/SqlParameter_Precision.cs +++ b/doc/samples/SqlParameter_Precision.cs @@ -1,3 +1,5 @@ +namespace SqlParameter_Precision; + using System; using System.Data; // @@ -15,4 +17,4 @@ private static void AddSqlParameter(SqlCommand command) command.Parameters.Add(parameter); } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlParameter_SqlParameter.cs b/doc/samples/SqlParameter_SqlParameter.cs index 78b705eb1c..c3ac3dc55d 100644 --- a/doc/samples/SqlParameter_SqlParameter.cs +++ b/doc/samples/SqlParameter_SqlParameter.cs @@ -1,3 +1,5 @@ +namespace SqlParameter_SqlParameter; + using System; using System.Data; // @@ -17,4 +19,4 @@ private static void AddSqlParameter(SqlCommand command) command.Parameters.Add(parameter); } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlParameter_SqlParameter1.cs b/doc/samples/SqlParameter_SqlParameter1.cs index fa04122b76..8fc66678b1 100644 --- a/doc/samples/SqlParameter_SqlParameter1.cs +++ b/doc/samples/SqlParameter_SqlParameter1.cs @@ -1,3 +1,5 @@ +namespace SqlParameter_SqlParameter1; + using System; using System.Data; // @@ -16,4 +18,4 @@ private static void AddSqlParameter(SqlCommand command) command.Parameters.Add(parameter); } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlParameter_SqlParameter2.cs b/doc/samples/SqlParameter_SqlParameter2.cs index 1ff1f67555..6afb400a57 100644 --- a/doc/samples/SqlParameter_SqlParameter2.cs +++ b/doc/samples/SqlParameter_SqlParameter2.cs @@ -1,3 +1,5 @@ +namespace SqlParameter_SqlParameter2; + using System; using System.Data; // @@ -16,4 +18,4 @@ private static void AddSqlParameter(SqlCommand command, string paramValue) command.Parameters.Add(parameter); } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlParameter_SqlParameter4.cs b/doc/samples/SqlParameter_SqlParameter4.cs index 948506ab3a..7dd8957acd 100644 --- a/doc/samples/SqlParameter_SqlParameter4.cs +++ b/doc/samples/SqlParameter_SqlParameter4.cs @@ -1,3 +1,5 @@ +namespace SqlParameter_SqlParameter4; + using System; using System.Data; // diff --git a/doc/samples/SqlParameter_SqlParameter5.cs b/doc/samples/SqlParameter_SqlParameter5.cs index b793184ab3..14d0bfd266 100644 --- a/doc/samples/SqlParameter_SqlParameter5.cs +++ b/doc/samples/SqlParameter_SqlParameter5.cs @@ -1,3 +1,5 @@ +namespace SqlParameter_SqlParameter5; + using System; using System.Data; // @@ -15,4 +17,4 @@ private static void AddSqlParameter(SqlCommand command) command.Parameters.Add(parameter); } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlParameter_SqlParameter6.cs b/doc/samples/SqlParameter_SqlParameter6.cs index b793184ab3..80dbf88c6e 100644 --- a/doc/samples/SqlParameter_SqlParameter6.cs +++ b/doc/samples/SqlParameter_SqlParameter6.cs @@ -1,3 +1,5 @@ +namespace SqlParameter_SqlParameter6; + using System; using System.Data; // @@ -15,4 +17,4 @@ private static void AddSqlParameter(SqlCommand command) command.Parameters.Add(parameter); } } -// \ No newline at end of file +// diff --git a/doc/samples/SqlParameter_Value.cs b/doc/samples/SqlParameter_Value.cs index ef37364650..6cac425d4d 100644 --- a/doc/samples/SqlParameter_Value.cs +++ b/doc/samples/SqlParameter_Value.cs @@ -1,3 +1,5 @@ +namespace SqlParameter_Value; + using System; using System.Data; // diff --git a/doc/samples/SqlRowUpdatingEventArgs.cs b/doc/samples/SqlRowUpdatingEventArgs.cs index b16f0c94f6..f0d533631a 100644 --- a/doc/samples/SqlRowUpdatingEventArgs.cs +++ b/doc/samples/SqlRowUpdatingEventArgs.cs @@ -1,3 +1,6 @@ +#if NETFRAMEWORK +namespace SqlRowUpdatingEventArgsCS; + using System; using System.Data; // @@ -72,4 +75,5 @@ private static void PrintEventArgs(SqlRowUpdatedEventArgs args) " status=" + args.Status + ")"); } } -// \ No newline at end of file +// +#endif diff --git a/doc/samples/SqlString_Equals.cs b/doc/samples/SqlString_Equals.cs index 5c2d3ab119..df0b44f636 100644 --- a/doc/samples/SqlString_Equals.cs +++ b/doc/samples/SqlString_Equals.cs @@ -3,7 +3,7 @@ // using System.Data.SqlTypes; -namespace SqlNullsCS +namespace SqlString_Equals { class Program { diff --git a/doc/samples/SqlTransactionLocal.cs b/doc/samples/SqlTransactionLocal.cs index 29d29526ab..f5cf1915e0 100644 --- a/doc/samples/SqlTransactionLocal.cs +++ b/doc/samples/SqlTransactionLocal.cs @@ -1,3 +1,5 @@ +namespace SqlTransactionLocal; + // using System; using Microsoft.Data.SqlClient; diff --git a/doc/samples/SqlTransactionScope.cs b/doc/samples/SqlTransactionScope.cs index 77f5d75694..a03cdd5a3c 100644 --- a/doc/samples/SqlTransactionScope.cs +++ b/doc/samples/SqlTransactionScope.cs @@ -1,3 +1,5 @@ +namespace SqlTransactionScope; + // using System; using System.Transactions; diff --git a/doc/samples/SqlUserDefinedAggregate.cs b/doc/samples/SqlUserDefinedAggregate.cs index 7f3792c133..4a3942e2fa 100644 --- a/doc/samples/SqlUserDefinedAggregate.cs +++ b/doc/samples/SqlUserDefinedAggregate.cs @@ -1,3 +1,5 @@ +namespace SqlUserDefinedAggregate; + using System; // using Microsoft.SqlServer.Server; diff --git a/doc/samples/SqlUserDefinedAggregate1.cs b/doc/samples/SqlUserDefinedAggregate1.cs index 58d319d13d..2b65a9cfa1 100644 --- a/doc/samples/SqlUserDefinedAggregate1.cs +++ b/doc/samples/SqlUserDefinedAggregate1.cs @@ -1,8 +1,10 @@ +namespace SqlUserDefinedAggregate1; + //----------------------------------------------------------------------------- // using System; using System.Data.SqlTypes; -using Microsoft.Data.SqlClient.Server; +using Microsoft.SqlServer.Server; [Serializable] [SqlUserDefinedAggregate(Format.Native)] diff --git a/doc/samples/SqlUserDefinedType.cs b/doc/samples/SqlUserDefinedType.cs index acccd7d2b3..f785539ec7 100644 --- a/doc/samples/SqlUserDefinedType.cs +++ b/doc/samples/SqlUserDefinedType.cs @@ -1,12 +1,14 @@ +namespace SqlUserDefinedTypeCS; + using System; using System.Data; // -using Microsoft.Data.SqlClient.Server; +using Microsoft.SqlServer.Server; using System.Data.SqlTypes; using System.Text; [Serializable] -[Microsoft.Data.SqlClient.Server.SqlUserDefinedType(Format.Native, +[SqlUserDefinedType(Format.Native, IsByteOrdered = true, Name = "Point", ValidationMethodName = "ValidatePoint")] public struct Point : INullable diff --git a/doc/samples/SqlUserDefinedType1.cs b/doc/samples/SqlUserDefinedType1.cs index 8f440648c2..06cb959016 100644 --- a/doc/samples/SqlUserDefinedType1.cs +++ b/doc/samples/SqlUserDefinedType1.cs @@ -1,3 +1,5 @@ +namespace SqlUserDefinedType1; + //----------------------------------------------------------------------------- // using System; diff --git a/doc/samples/SqlVectorExample.cs b/doc/samples/SqlVectorExample.cs index c3c8f558fe..31371498d0 100644 --- a/doc/samples/SqlVectorExample.cs +++ b/doc/samples/SqlVectorExample.cs @@ -1,3 +1,5 @@ +namespace SqlVectorExample; + // VectorConsoleApp: End-to-end demo of working with // SQL Server vector datatype via Microsoft.Data.SqlClient // @@ -18,7 +20,9 @@ using Microsoft.Data; using Microsoft.Data.SqlClient; using Microsoft.Data.SqlTypes; +using System; using System.Data; +using System.Threading.Tasks; class VectorConsoleApp { @@ -225,7 +229,7 @@ private static async Task PreparedInsertAsync(SqlConnection conn, int rowCount) var p = new SqlParameter("@VectorData", SqlDbTypeExtensions.Vector); cmd.Parameters.Add(p); - await cmd.PrepareAsync(); + cmd.Prepare(); for (int i = 0; i < rowCount; i++) { diff --git a/doc/samples/TransactionIsolationLevels.cs b/doc/samples/TransactionIsolationLevels.cs index 6abd99e15d..818a3086a5 100644 --- a/doc/samples/TransactionIsolationLevels.cs +++ b/doc/samples/TransactionIsolationLevels.cs @@ -4,7 +4,7 @@ using Microsoft.Data.SqlClient; using System.Threading.Tasks; -namespace Microsoft.Data.SqlClient.Samples +namespace TransactionIsolationLevels { // Use the delegate to call the different threads. public delegate void AsyncAccessDatabase(String connString, IsolationLevel level); @@ -525,4 +525,4 @@ internal static void Main(string[] args) } } } -// \ No newline at end of file +//