Refactor and update sample project build.

doc/samples/ApplicationClientIdAzureAuthenticationProvider.cs

@@ -2,7 +2,7 @@
 using System;
 using Microsoft.Data.SqlClient;
 
-namespace CustomAppIdAuthProviderExample
+namespace ApplicationClientIdAzureAuthenticationProvider
 {
     public class Program
     {

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
     {

doc/samples/AzureKeyVaultProviderWithEnclaveProviderExample.cs

@@ -1,4 +1,5 @@
-using System;
+/*
+using System;
 //<Snippet1>
 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)
     }
 }
 //</Snippet1>
+*/

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
     {

doc/samples/AzureKeyVaultProvider_ColumnEncryptionKeyCacheScope.cs

@@ -3,7 +3,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider;
 
-namespace AzureKeyVaultProviderExample
+namespace AzureKeyVaultProvider_ColumnEncryptionKeyCacheScope
 {
     // <Snippet1>
     class Program

doc/samples/ConnectionStringSettings_RetrieveFromConfig.cs

@@ -1,4 +1,6 @@
-using System;
+namespace ConnectionStringSettings_RetrieveFromConfig;
+
+using System;
 // <Snippet1>
 using System.Configuration;
 

doc/samples/ConnectionStringSettings_RetrieveFromConfigByName.cs

@@ -1,4 +1,6 @@
-using System;
+namespace ConnectionStringSettings_RetrieveFromConfigByName;
+
+using System;
 using System.Configuration;
 
 class Program

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;

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()
     }
     // </Snippet1>
 }
+#endif
+*/

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()
     {
     }
     // <Snippet1>
-    static void ToggleConfigEncryption(string exeFile)
+    static void ToggleConfigEncryption(string exeConfigName)
     {
         // Takes the executable file name without the
         // .config extension.

doc/samples/CustomDeviceCodeFlowAzureAuthenticationProvider.cs

@@ -7,7 +7,7 @@
 using Microsoft.Data.SqlClient;
 using Microsoft.Identity.Client;
 
-namespace CustomDeviceCodeFlowAuthProviderExample
+namespace CustomDeviceCodeFlowAzureAuthenticationProviderExample
 {
     /// <summary>
     /// Example demonstrating creating a custom device code flow authentication provider and attaching it to the driver.

doc/samples/DataColumn_DataType.cs

@@ -1,3 +1,5 @@
+namespace DataColumn_DataType;
+
 using System;
 using System.Data;
 // <Snippet1>

doc/samples/DataTableReader_GetValues.cs

@@ -1,3 +1,5 @@
+namespace DataTableReader_GetValues;
+
 // <Snippet1>
 using System;
 using System.Data;

doc/samples/IBinarySerialize.cs

@@ -5,7 +5,7 @@
 using Microsoft.SqlServer.Server;
 using System.Text;
 
-namespace test
+namespace IBinarySerializeCS
 {
 
     public class Class1 : IBinarySerialize

doc/samples/IDbCommand_CommandTimeout.cs

@@ -1,3 +1,6 @@
+#if NETFRAMEWORK
+namespace IDbCommand_CommandTimeout;
+
 // <Snippet1>
 using System;
 using System.Xml;
@@ -20,3 +23,4 @@ public void CreateSqlCommand()
     }
     // </Snippet1>
 }
+#endif

doc/samples/Isolation_Snapshot.cs

@@ -1,3 +1,5 @@
+namespace Isolation_Snapshot;
+
 using System;
 using System.Data;
 // <Snippet1>

doc/samples/Isolation_Snapshot1.cs

@@ -1,3 +1,5 @@
+namespace Isolation_Snapshot1;
+
 using System;
 using System.Data;
 // <Snippet1>

doc/samples/Microsoft.Data.SqlClient.Samples.csproj

@@ -1,6 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
+    <TargetFrameworks>net8.0;net462</TargetFrameworks>
     <OutputType>Library</OutputType>
     <ImplicitUsings>disable</ImplicitUsings>
     <Nullable>enable</Nullable>
@@ -16,10 +17,11 @@
     <PackageReference Include="Microsoft.Data.SqlClient" />
     <PackageReference Include="Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider" />
     <PackageReference Include="Newtonsoft.Json" />
+    <PackageReference Include="System.Configuration.ConfigurationManager" />
   </ItemGroup>
 
   <!-- .NET Framework references -->
-  <ItemGroup Condition="$(TargetGroup) == 'netfx'">
+  <ItemGroup Condition="'$(TargetFramework)' == 'net462'">
     <PackageReference Include="System.Runtime.InteropServices.RuntimeInformation" />
     <Reference Include="System.Transactions" />
     <Reference Include="System.Windows.Forms" />

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
     {

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)
    }
 }
 //</Snippet1>
-}
+}

doc/samples/Microsoft.SqlServer.Server/csharp/DataWorks_SqlUserDefinedAggregateAttribute_Sample.cs

@@ -1,4 +1,6 @@
-//<Snippet1>
+namespace DataWorks_SqlUserDefinedAggregateAttribute_Sample;
+
+//<Snippet1>
 using System;
 using System.IO;
 using Microsoft.SqlServer.Server;

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;

doc/samples/Microsoft.SqlServer.Server/csharp/SqlFunctionAttribute_SqlFunction.cs

@@ -1,4 +1,6 @@
-using System.Collections;
+namespace SqlFunctionAttribute_SqlFunction;
+
+using System.Collections;
 //-----------------------------------------------------------------------------
 //<Snippet4>
 using System.Data.SqlTypes;

doc/samples/Microsoft.SqlServer.Server/csharp/SqlMethod.cs

@@ -1,3 +1,5 @@
+namespace SqlMethodCSExample;
+
 using System;
 // <Snippet1>
 using Microsoft.SqlServer.Server;

doc/samples/Microsoft.SqlServer.Server/csharp/SqlUserDefinedAggregateAttribute_Aggregate1.cs

@@ -1,4 +1,6 @@
-//-----------------------------------------------------------------------------
+namespace SqlUserDefinedAggregateAttribute_Aggregate1;
+
+//-----------------------------------------------------------------------------
 //<Snippet2>
 using System;
 using System.Data.SqlTypes;

doc/samples/Microsoft.SqlServer.Server/csharp/SqlUserDefinedTypeAttribute_Type1.cs

@@ -1,4 +1,6 @@
-//-----------------------------------------------------------------------------
+namespace SqlUserDefinedTypeAttribute_Type1;
+
+//-----------------------------------------------------------------------------
 //<Snippet5>
 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);
     }
 

doc/samples/RegisterCustomKeyStoreProvider_CommandPrecedence.cs

@@ -1,7 +1,14 @@
-// <Snippet1>
+namespace RegisterCustomKeyStoreProvider_CommandPrecedence;
+
+using System.Collections.Generic;
+using Azure.Identity;
+using Microsoft.Data.SqlClient;
+using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider;
+
+// <Snippet1>
 class Program
 {
-    static void Main()
+    static void Main(string connectionString)
     {
         Dictionary<string, SqlColumnEncryptionKeyStoreProvider> customKeyStoreProviders = new Dictionary<string, SqlColumnEncryptionKeyStoreProvider>();
         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()
     }
 }
 // </Snippet1>
+
+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];
+    }
+}

doc/samples/RegisterCustomKeyStoreProvider_ConnectionPrecedence.cs

@@ -1,7 +1,15 @@
-// <Snippet1>
+namespace RegisterCustomKeyStoreProvider_ConnectionPrecedence;
+
+using System.Collections.Generic;
+using Azure.Core;
+using Azure.Identity;
+using Microsoft.Data.SqlClient;
+using Microsoft.Data.SqlClient.AlwaysEncrypted.AzureKeyVaultProvider;
+
+// <Snippet1>
 class Program
 {
-    static void Main()
+    static void Main(string connectionString)
     {
         Dictionary<string, SqlColumnEncryptionKeyStoreProvider> customKeyStoreProviders = new Dictionary<string, SqlColumnEncryptionKeyStoreProvider>();
         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()
     }
 }
 // </Snippet1>
+
+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];
+    }
+}

doc/samples/RegisterCustomKeyStoreProvider_Example.cs

@@ -1,4 +1,7 @@
-// <Snippet1>
+namespace RegisterCustomKeyStoreProvider_Example;
+
+// <Snippet1>
+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;
         }