Merge branch 'master' of https://github.com/dotnet/SqlClient into Dev…

…iceCodeFlow

BUILDGUIDE.md

@@ -4,7 +4,7 @@ This document provides all the necessary details to build the driver and run tes
 
 ## Visual Studio Pre-Requisites
 
-This project should be ideally built with Visual Studio 2017+ for the best compatibility. Use either of the two environments with their required set of compoenents as mentioned below:
+This project should be built with Visual Studio 2019+ for the best compatibility. The required set of components are provided in the below file:
 - **Visual Studio 2019** with imported components: [VS19Components](/tools/vsconfig/VS19Components.vsconfig)
 
 Once the environment is setup properly, execute the desired set of commands below from the _root_ folder to perform the respective operations:
@@ -106,6 +106,7 @@ Manual Tests require the below setup to run:
 |------|--------|-------------------|
 |TCPConnectionString | Connection String for a TCP enabled SQL Server instance. | `Server={servername};Database={Database_Name};Trusted_Connection=True;` <br/> OR `Data Source={servername};Initial Catalog={Database_Name};Integrated Security=True;`|
 |NPConnectionString | Connection String for a Named Pipes enabled SQL Server instance.| `Server=\\{servername}\pipe\sql\query;Database={Database_Name};Trusted_Connection=True;` <br/> OR <br/> `Data Source=np:{servername};Initial Catalog={Database_Name};Integrated Security=True;`|
+|TCPConnectionStringHGSVBS | (Optional) Connection String for a TCP enabled SQL Server with Host Guardian Service (HGS) attestation protocol configuration. | `Server=tcp:{servername}; Database={Database_Name}; UID={UID}; PWD={PWD}; Attestation Protocol = HGS; Enclave Attestation Url = {AttestationURL};`|
 |AADAuthorityURL | (Optional) Identifies the OAuth2 authority resource for `Server` specified in `AADPasswordConnectionString` | `https://login.windows.net/<tenant>`, where `<tenant>` is the tenant ID of the Azure Active Directory (Azure AD) tenant |
 |AADPasswordConnectionString | (Optional) Connection String for testing Azure Active Directory Password Authentication. | `Data Source={server.database.windows.net}; Initial Catalog={Azure_DB_Name};Authentication=Active Directory Password; User ID={AAD_User}; Password={AAD_User_Password};`|
 |AADSecurePrincipalId | (Optional) The Application Id of a registered application which has been granted permission to the database defined in the AADPasswordConnectionString. | {Application ID} |
@@ -204,9 +205,9 @@ Tests can be built and run with custom Target Frameworks. See the below examples
 ```
 
 ```bash
-> msbuild /t:BuildTestsNetCore /p:TargetNetCoreVersion=netcoreapp3.0
+> msbuild /t:BuildTestsNetCore /p:TargetNetCoreVersion=netcoreapp3.1
 # Build the tests for custom TargetFramework (.NET Core)
-# Applicable values: netcoreapp2.1 | netcoreapp2.2 | netcoreapp3.0
+# Applicable values: netcoreapp2.1 | netcoreapp2.2 | netcoreapp3.1 | netcoreapp5.0
 ```
 
 ### Running Tests:
@@ -216,9 +217,9 @@ Tests can be built and run with custom Target Frameworks. See the below examples
 # Use above property to run Functional Tests with custom TargetFramework (.NET Framework)
 # Applicable values: net46 (Default) | net461 | net462 | net47 | net471  net472 | net48
 
-> dotnet test /p:TargetNetCoreVersion=netcoreapp3.0 ...
+> dotnet test /p:TargetNetCoreVersion=netcoreapp3.1 ...
 # Use above property to run Functional Tests with custom TargetFramework (.NET Core)
-# Applicable values: netcoreapp2.1 | netcoreapp2.2 | netcoreapp3.0
+# Applicable values: netcoreapp2.1 | netcoreapp2.2 | netcoreapp3.1 | netcoreapp5.0
 ```
 
 ## Using Managed SNI on Windows
@@ -256,7 +257,7 @@ There may be times where connection cannot be made to SQL Server, we found below
 
 - Clear Docker images to create clean image from time-to-time, and clear docker cache if needed by running `docker system prune` in Command Prompt.
 
-- If you face `sni.dll not found` errors when debugging, try updating below properties in netcore\Microsoft.Data.SqlClient.csproj file and try again:
+- If you face `Microsoft.Data.SqlClient.SNI.dll not found` errors when debugging, try updating the below properties in the netcore\Microsoft.Data.SqlClient.csproj file and try again:
   ```xml
     <OSGroup>Unix</OSGroup>
     <TargetsWindows>false</TargetsWindows>

CHANGELOG.md

@@ -4,7 +4,31 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/)
 
-## [Preview Release 2.0.0-preview4.20142.4 ] - 2020-05-21
+## [Stable Release 2.0.0] - 2020-06-16
+
+### Added
+- Added internal driver support to provide resiliency to DNS failures [#594](https://github.com/dotnet/SqlClient/pull/594)
+- Added support for `Active Directory Integrated`, `Active Directory Interactive` and `Active Directory Service Principal` authentication mode for .NET Core and .NET Standard [#560](https://github.com/dotnet/SqlClient/pull/560)
+- Added support for `Active Directory Service Principal` authentication mode for .NET Framework [#560](https://github.com/dotnet/SqlClient/pull/560)
+- Added support for optional `ORDER` hints in `SqlBulkCopy` for improved performance [#540](https://github.com/dotnet/SqlClient/pull/540)
+
+### Fixed
+- Fixed `SqlSequentialStream` multipacket read stalling issue in .NET Core [#603](https://github.com/dotnet/SqlClient/pull/603)
+- Fixed code page issue for Kazakh collation in SQL Server [#584](https://github.com/dotnet/SqlClient/pull/584)
+- Fixed stalled application issues when end of stream is reached [#577](https://github.com/dotnet/SqlClient/pull/577)
+- Fixed driver behavior to not throw exception for invalid configuration file [#573](https://github.com/dotnet/SqlClient/pull/573)
+- Fixed Object null reference issue when failover partner is set [#588](https://github.com/dotnet/SqlClient/pull/588)
+- Fixed `applicationintent` connection string property issue [#585](https://github.com/dotnet/SqlClient/pull/585)
+
+### Changes
+- Raise warning message when insecure TLS protocols are in use [#591](https://github.com/dotnet/SqlClient/pull/591)
+
+### Breaking Changes
+- Modified enclave provider interface `SqlColumnEncryptionEnclaveProvider` to be internal [#602](https://github.com/dotnet/SqlClient/pull/602) - _This change is not likely to impact customer applications since secure enclaves is a relatively new feature and they would have had to implement their own enclave provider, which is not a trivial task_.
+- Updated `SqlClientMetaDataCollectionNames` exposed constants by removing non-existing constants and adding new to the metadata collection [#580](https://github.com/dotnet/SqlClient/pull/580)
+
+
+## [Preview Release 2.0.0-preview4.20142.4] - 2020-05-21
 
 ### Added
 - Microsoft.Data.SqlClient (.NET Core and .NET Standard) on Windows is now dependent on **Microsoft.Data.SqlClient.SNI.runtime**, replacing the previous dependency on **runtime.native.System.Data.SqlClient.SNI** [#570](https://github.com/dotnet/SqlClient/pull/570)

README.md

@@ -24,9 +24,9 @@ The Microsoft.Data.SqlClient NuGet package is available on [NuGet.org](https://w
 
 ## SNI Package References
 
-For the .NET Framework driver on Windows, a package reference to [Microsoft.Data.SqlClient.SNI](https://www.nuget.org/packages/Microsoft.Data.SqlClient.SNI/) loads `x64` and `x86` native `SNI.dll` libraries into the client's build directories.
+For the .NET Framework driver on Windows, a package reference to [Microsoft.Data.SqlClient.SNI](https://www.nuget.org/packages/Microsoft.Data.SqlClient.SNI/) loads native `Microsoft.Data.SqlClient.SNI.x64.dll` and `Microsoft.Data.SqlClient.SNI.x86.dll` libraries into the client's build directories.
 
-For the .NET Core driver on Windows, a package reference to [runtime.native.System.Data.SqlClient.sni](https://www.nuget.org/packages/runtime.native.System.Data.SqlClient.sni/) loads `arm64`, `x64` and `x86` native `SNI.dll` libraries into the client's build directories.
+For the .NET Core driver on Windows, a package reference to [Microsoft.Data.SqlClient.SNI.runtime](https://www.nuget.org/packages/Microsoft.Data.SqlClient.SNI.runtime/) loads `arm`, `arm64`, `x64` and `x86` native `Microsoft.Data.SqlClient.SNI.dll` libraries into the client's build directories.
 
 ## Helpful Links
 
@@ -48,9 +48,10 @@ We thank you for your continuous support in improving the SqlClient library!
 
 - Wraith ([@Wraith2](https://github.com/Wraith2))
 - Erik Ejlskov Jensen ([@ErikEJ](https://github.com/ErikEJ))
+- Simon Cropp ([@SimonCropp](https://github.com/SimonCropp))
 - Stefán Jökull Sigurðarson ([@stebet](https://github.com/stebet))
-- Stephen Toub ([@stephentoub](https://github.com/stephentoub))
 - Shay Rojansky ([@roji](https://github.com/roji))
+- Stephen Toub ([@stephentoub](https://github.com/stephentoub))
 - Rasmus Melchior Jacobsen ([@rmja](https://github.com/rmja))
 - Phillip Haydon ([@phillip-haydon](https://github.com/phillip-haydon))
 - Robin Sue ([@Suchiman](https://github.com/Suchiman))

doc/samples/SqlBulkCopyOptions_Default.cs

@@ -72,6 +72,10 @@ static void Main()
                 }
                 catch (Exception ex)
                 {
+                    // Print the number of rows processed using the 
+                    // RowsCopied property.
+                    Console.WriteLine("{0} rows were processed.",
+                        bulkCopy.RowsCopied);
                     Console.WriteLine(ex.Message);
                 }
                 finally
@@ -82,6 +86,8 @@ static void Main()
 
             // Perform a final count on the destination 
             // table to see how many rows were added.
+            // Note that for this scenario, the value will 
+            // not be equal to the RowsCopied property.
             long countEnd = System.Convert.ToInt32(
                 commandRowCount.ExecuteScalar());
             Console.WriteLine("Ending row count = {0}", countEnd);
@@ -92,8 +98,8 @@ static void Main()
     }
 
     private static string GetConnectionString()
-        // To avoid storing the sourceConnection string in your code, 
-        // you can retrieve it from a configuration file. 
+    // To avoid storing the sourceConnection string in your code, 
+    // you can retrieve it from a configuration file. 
     {
         return "Data Source=(local); " +
             " Integrated Security=true;" +

doc/samples/SqlBulkCopyOptions_UseInternalTransaction.cs

@@ -78,6 +78,10 @@ static void Main()
                 }
                 catch (Exception ex)
                 {
+                    // Print the number of rows processed using the 
+                    // RowsCopied property.
+                    Console.WriteLine("{0} rows were processed.",
+                        bulkCopy.RowsCopied);
                     Console.WriteLine(ex.Message);
                 }
                 finally
@@ -88,6 +92,8 @@ static void Main()
 
             // Perform a final count on the destination 
             // table to see how many rows were added.
+            // Note that for this scenario, the value will 
+            // not be equal to the RowsCopied property.
             long countEnd = System.Convert.ToInt32(
                 commandRowCount.ExecuteScalar());
             Console.WriteLine("Ending row count = {0}", countEnd);
@@ -98,8 +104,8 @@ static void Main()
     }
 
     private static string GetConnectionString()
-        // To avoid storing the sourceConnection string in your code, 
-        // you can retrieve it from a configuration file. 
+    // To avoid storing the sourceConnection string in your code, 
+    // you can retrieve it from a configuration file. 
     {
         return "Data Source=(local); " +
             " Integrated Security=true;" +

doc/samples/SqlBulkCopy_ExternalTransaction.cs

@@ -81,6 +81,10 @@ static void Main()
                         }
                         catch (Exception ex)
                         {
+                            // Print the number of rows processed using the 
+                            // RowsCopied property.
+                            Console.WriteLine("{0} rows were processed.",
+                                bulkCopy.RowsCopied);
                             Console.WriteLine(ex.Message);
                             transaction.Rollback();
                         }
@@ -104,8 +108,8 @@ static void Main()
     }
 
     private static string GetConnectionString()
-        // To avoid storing the sourceConnection string in your code, 
-        // you can retrieve it from a configuration file. 
+    // To avoid storing the sourceConnection string in your code, 
+    // you can retrieve it from a configuration file. 
     {
         return "Data Source=(local); " +
             " Integrated Security=true;" +

doc/samples/SqlBulkCopy_WriteToServer.cs

@@ -54,6 +54,10 @@ static void Main()
                     {
                         // Write from the source to the destination.
                         bulkCopy.WriteToServer(reader);
+                        // Print the number of rows processed using the 
+                        // RowsCopied property.
+                        Console.WriteLine("{0} rows were processed.",
+                            bulkCopy.RowsCopied);
                     }
                     catch (Exception ex)
                     {
@@ -81,8 +85,8 @@ static void Main()
     }
 
     private static string GetConnectionString()
-        // To avoid storing the sourceConnection string in your code, 
-        // you can retrieve it from a configuration file. 
+    // To avoid storing the sourceConnection string in your code, 
+    // you can retrieve it from a configuration file. 
     {
         return "Data Source=(local); " +
             " Integrated Security=true;" +

doc/samples/SqlClientEventSource.cs

@@ -0,0 +1,60 @@
+// <Snippet1>
+using System;
+using System.Diagnostics.Tracing;
+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 
+// it the ability to create events.
+public class SqlClientListener : EventListener
+{
+    protected override void OnEventSourceCreated(EventSource eventSource)
+    {
+        // Only enable events from SqlClientEventSource.
+        if (eventSource.Name.Equals("Microsoft.Data.SqlClient.EventSource"))
+        {
+            // Use EventKeyWord 2 to capture basic application flow events.
+            // See the above table for all available keywords.
+            EnableEvents(eventSource, EventLevel.Informational, (EventKeywords)2);
+        }
+    }
+
+    // This callback runs whenever an event is written by SqlClientEventSource.
+    // Event data is accessed through the EventWrittenEventArgs parameter.
+    protected override void OnEventWritten(EventWrittenEventArgs eventData)
+    {
+        // Print event data.
+        Console.WriteLine(eventData.Payload[0]);
+    }
+}
+
+class Program
+{
+    public static void Main()
+    {
+        // Create a new event listener.
+        using (SqlClientListener listener = new SqlClientListener())
+        {
+            string connectionString = "Data Source=localhost; " +
+                "Initial Catalog=AdventureWorks; Integrated Security=true";
+
+            // Open a connection to the AdventureWorks database.
+            using (SqlConnection connection = new SqlConnection(connectionString))
+            {
+                connection.Open();
+
+                string sql = "SELECT * FROM Sales.Currency";
+                SqlCommand command = new SqlCommand(sql, connection);
+
+                // Perform a data operation on the server.
+                SqlDataReader reader = command.ExecuteReader();
+                while (reader.Read())
+                {
+                    // Read the data.
+                }
+                reader.Close();
+            }
+        }
+    }
+}
+// </Snippet1>