Resolve merge conflict

CHANGELOG.md

@@ -4,6 +4,48 @@ 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 5.0.0-preview3.22168.1] - 2022-06-16
+
+This update brings the below changes over the previous release:
+
+### Breaking changes over preview release v5.0.0-preview2
+
+- Dropped classes from the `Microsoft.Data.SqlClient.Server` namespace and replaced them with supported types from the [Microsoft.SqlServer.Server](https://github.com/dotnet/SqlClient/tree/main/src/Microsoft.SqlServer.Server) package.[#1585](https://github.com/dotnet/SqlClient/pull/1585) The affected classes and enums are:
+  - Microsoft.Data.SqlClient.Server.IBinarySerialize -> Microsoft.SqlServer.Server.IBinarySerialize
+  - Microsoft.Data.SqlClient.Server.InvalidUdtException -> Microsoft.SqlServer.Server.InvalidUdtException
+  - Microsoft.Data.SqlClient.Server.SqlFacetAttribute -> Microsoft.SqlServer.Server.SqlFacetAttribute
+  - Microsoft.Data.SqlClient.Server.SqlFunctionAttribute -> Microsoft.SqlServer.Server.SqlFunctionAttribute
+  - Microsoft.Data.SqlClient.Server.SqlMethodAttribute -> Microsoft.SqlServer.Server.SqlMethodAttribute
+  - Microsoft.Data.SqlClient.Server.SqlUserDefinedAggregateAttribute -> Microsoft.SqlServer.Server.SqlUserDefinedAggregateAttribute
+  - Microsoft.Data.SqlClient.Server.SqlUserDefinedTypeAttribute -> Microsoft.SqlServer.Server.SqlUserDefinedTypeAttribute
+  - (enum) Microsoft.Data.SqlClient.Server.DataAccessKind -> Microsoft.SqlServer.Server.DataAccessKind
+  - (enum) Microsoft.Data.SqlClient.Server.Format -> Microsoft.SqlServer.Server.Format
+  - (enum) Microsoft.Data.SqlClient.Server.SystemDataAccessKind -> Microsoft.SqlServer.Server.SystemDataAccessKind
+
+### Added
+
+- Added support for `TDS 8`. To use TDS 8, users should specify Encrypt=Strict in the connection string. Strict mode disables TrustServerCertificate (always treated as False in Strict mode). HostNameInCertificate has been added to help some Strict mode scenarios. [#1608](https://github.com/dotnet/SqlClient/pull/1608)
+- Added support for specifying Server SPN and Failover Server SPN on the connection. [#1607](https://github.com/dotnet/SqlClient/pull/1607)
+- Added support for aliases when targeting .NET Core on Windows. [#1588](https://github.com/dotnet/SqlClient/pull/1588)
+
+### Fixed
+
+- Fixed naming, order, and formatting for `SqlDiagnosticsListener` on .NET Core and .NET. [#1637] (https://github.com/dotnet/SqlClient/pull/1637)
+- Fixed NullReferenceException during Azure Active Directory authentication. [#1625] (https://github.com/dotnet/SqlClient/pull/1625)
+- Added CommandText length validation when using stored procedure command types. [#1484](https://github.com/dotnet/SqlClient/pull/1484)
+- Fixed `GetSchema("StructuredTypeMembers")` to return correct schema information. [#1500] (https://github.com/dotnet/SqlClient/pull/1500), [#1639](https://github.com/dotnet/SqlClient/pull/1639)
+- Fixed NullReferenceException when using `SqlDependency.Start` against an Azure SQL Database.[#1294] (https://github.com/dotnet/SqlClient/pull/1294)
+- Send the correct retained transaction descriptor in the MARS TDS Header when there is no current transaction on .NET 5+ and .NET Core. [#1624] (https://github.com/dotnet/SqlClient/pull/1624)
+- Parallelize SSRP requests (instance name resolution) on Linux and macOS when MultiSubNetFailover is specified. [#1578] (https://github.com/dotnet/SqlClient/pull/1578)
+- Adjust the default ConnectRetryCount against Azure Synapse OnDemand endpoints [#1626] (https://github.com/dotnet/SqlClient/pull/1626)
+
+### Changed
+
+- Code health improvements [#1353](https://github.com/dotnet/SqlClient/pull/1353) [#1354](https://github.com/dotnet/SqlClient/pull/1354) [#1525](https://github.com/dotnet/SqlClient/pull/1525) [#1186](https://github.com/dotnet/SqlClient/pull/1186)
+- Update Azure Identity dependency from 1.5.0 to 1.6.0.[#1611](https://github.com/dotnet/SqlClient/pull/1611)
+- Improved Regex for SqlCommandSet [#1548] (https://github.com/dotnet/SqlClient/pull/1548)
+- Rework on `TdsParserStateObjectManaged` with nullable annotations. [#1555] (https://github.com/dotnet/SqlClient/pull/1555)
+
 ## [Preview Release 5.0.0-preview2.22096.2] - 2022-04-06
 
 This update brings the below changes over the previous release:

build.proj

@@ -71,7 +71,7 @@
   <Target Name="BuildAll" DependsOnTargets="BuildSqlServerLib;BuildNetFx;BuildNetCore" />
   <Target Name="BuildAllConfigurations" DependsOnTargets="Restore;BuildTools;BuildSqlServerLib;BuildNetFx;BuildNetCoreAllOS;GenerateNugetPackage" />
   <Target Name="BuildSqlServerPackage" DependsOnTargets="BuildSqlServerLibAnyOS;GenerateSqlServerPackage"/>
-  <Target Name="BuildTestsNetCore" DependsOnTargets="RestoreTestsNetCore;BuildAKVNetCore;BuildFunctionalTestsNetCore;BuildManualTestsNetCore"/>
+  <Target Name="BuildTestsNetCore" DependsOnTargets="BuildSqlServerLib;RestoreTestsNetCore;BuildAKVNetCore;BuildFunctionalTestsNetCore;BuildManualTestsNetCore"/>
   <Target Name="BuildTestsNetFx" DependsOnTargets="BuildSqlServerLib;RestoreTestsNetFx;BuildAKVNetFx;BuildFunctionalTestsNetFx;BuildManualTestsNetFx" Condition="$(IsEnabledWindows) == 'true'"/>
   <Target Name="BuildTests" DependsOnTargets="BuildTestsNetCore;BuildTestsNetFx"/>
 
@@ -113,7 +113,9 @@
   </Target>
 
   <Target Name="BuildSqlServerLib" DependsOnTargets="RestoreSqlServerLib">
+    <!-- Only build platform specific builds for Package reference types -->
     <MSBuild Projects="@(SqlServerLib)" Properties="$(CI);$(SqlServerLibProperties);Platform=AnyCPU;" RemoveProperties="TargetsWindows;TargetsUnix;" />
+    <MSBuild Projects="@(SqlServerLib)" Properties="$(CI);$(SqlServerLibProperties);Platform=$(Platform);" Condition="$(ReferenceType.Contains('Package'))"/>
   </Target>
 
   <Target Name="BuildNetCore" DependsOnTargets="RestoreNetCore">

doc/samples/IBinarySerialize.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Data;
 using System.Data.SqlTypes;
-using Microsoft.Data.SqlClient.Server;
+using Microsoft.SqlServer.Server;
 using System.Text;
 
 namespace test
@@ -45,7 +45,7 @@ static void Main(string[] args)
         //    Bytes 0 - 19: string text, padded to the right with null characters
         //    Bytes 20+: Double value
 
-        // using Microsoft.Data.SqlClient.Server;
+        // using Microsoft.SqlServer.Server;
         public void Read(System.IO.BinaryReader r)
         {
 
@@ -84,7 +84,7 @@ public void Read(System.IO.BinaryReader r)
         //    Bytes 0 - 19: string text, padded to the right with null characters
         //    Bytes 20+: Double value
 
-        // using Microsoft.Data.SqlClient.Server;
+        // using Microsoft.SqlServer.Server;
         public void Write(System.IO.BinaryWriter w)
         {
             int maxStringSize = 20;

doc/samples/SqlConnection_BeginTransaction.cs

@@ -24,7 +24,7 @@ private static void ExecuteSqlTransaction(string connectionString)
                 SqlTransaction transaction;
 
                 // Start a local transaction.
-                transaction = connection.BeginTransaction("SampleTransaction");
+                transaction = connection.BeginTransaction();
 
                 // Must assign both transaction object and connection
                 // to Command object for a pending local transaction

doc/samples/SqlConnection_BeginTransaction2.cs

@@ -52,7 +52,7 @@ private static void ExecuteSqlTransaction(string connectionString)
                     // Attempt to roll back the transaction.
                     try
                     {
-                        transaction.Rollback();
+                        transaction.Rollback("SampleTransaction");
                     }
                     catch (Exception ex2)
                     {

doc/samples/SqlConnection_BeginTransaction3.cs

@@ -47,7 +47,7 @@ private static void ExecuteSqlTransaction(string connectionString)
                 {
                     try
                     {
-                        transaction.Rollback();
+                        transaction.Rollback("SampleTransaction");
                     }
                     catch (SqlException ex)
                     {

doc/samples/SqlFunctionAttribute.cs

@@ -2,7 +2,7 @@
 using System.IO;
 using System.Collections;
 //<Snippet1>
-using Microsoft.Data.SqlClient.Server;
+using Microsoft.SqlServer.Server;
 
 public class Class1
 {

doc/samples/SqlUserDefinedAggregate.cs

@@ -1,20 +1,20 @@
 using System;
 //<Snippet1>
-using Microsoft.Data.SqlClient.Server;
+using Microsoft.SqlServer.Server;
 using System.IO;
 using System.Data.Sql;
 using System.Data.SqlTypes;
 using System.Text;
 
 [Serializable]
-[Microsoft.Data.SqlClient.Server.SqlUserDefinedAggregate(
-   Microsoft.Data.SqlClient.Server.Format.UserDefined,
+[Microsoft.SqlServer.Server.SqlUserDefinedAggregate(
+   Microsoft.SqlServer.Server.Format.UserDefined,
    IsInvariantToNulls = true,
    IsInvariantToDuplicates = false,
    IsInvariantToOrder = false,
    MaxByteSize = 8000)
         ]
-public class Concatenate : Microsoft.Data.SqlClient.Server.IBinarySerialize
+public class Concatenate : Microsoft.SqlServer.Server.IBinarySerialize
 {
 
     public void Read(BinaryReader r)

doc/samples/SqlUserDefinedType1.cs

@@ -2,7 +2,7 @@
 //<Snippet5>
 using System;
 using System.Data.SqlTypes;
-using Microsoft.Data.SqlClient.Server;
+using Microsoft.SqlServer.Server;
 
 [Serializable()]
 [SqlUserDefinedType(Format.Native)]
@@ -133,7 +133,7 @@ public SqlString Quadrant()
 
 //-----------------------------------------------------------------------------
 //<Snippet12>
-// using Microsoft.Data.SqlClient.Server;
+// using Microsoft.SqlServer.Server;
 
 [SqlUserDefinedType(Format.Native, MaxByteSize = 8000)]
 public class SampleType