DEV | Drop support for Net461 and add support for Net462 (#1574)

Author: DavoudEshtehari

BUILDGUIDE.md

@@ -70,7 +70,7 @@ msbuild -t:BuildTestsNetCore
 
 ```bash
 msbuild -t:BuildTestsNetFx
-# Build the tests for the .NET Framework (NetFx) driver in 'Debug' Configuration. Default .NET Framework version is 4.6.1.
+# Build the tests for the .NET Framework (NetFx) driver in 'Debug' Configuration. Default .NET Framework version is 4.6.2.
 ```
 
 ```bash
@@ -281,7 +281,7 @@ Tests can be built and run with custom Target Frameworks. See the below examples
 ```bash
 msbuild -t:BuildTestsNetFx -p:TargetNetFxVersion=net462
 # Build the tests for custom TargetFramework (.NET Framework)
-# Applicable values: net461 (Default) | net462 | net47 | net471  net472 | net48
+# Applicable values: net462 (Default) | net462 | net47 | net471  net472 | net48
 ```
 
 ```bash
@@ -295,7 +295,7 @@ msbuild -t:BuildTestsNetCore -p:TargetNetCoreVersion=netcoreapp3.1
 ```bash
 dotnet test -p:TargetNetFxVersion=net462 ...
 # Use above property to run Functional Tests with custom TargetFramework (.NET Framework)
-# Applicable values: net461 (Default) | net462 | net47 | net471  net472 | net48
+# Applicable values: net462 (Default) | net462 | net47 | net471  net472 | net48
 
 dotnet test -p:TargetNetCoreVersion=netcoreapp3.1 ...
 # Use above property to run Functional Tests with custom TargetFramework (.NET Core)

README.md

@@ -12,7 +12,7 @@ Microsoft.Data.SqlClient is a data provider for Microsoft SQL Server and Azure S
 
 The Microsoft.Data.SqlClient package supports the below environments:
 
-- .NET Framework 4.6.1+
+- .NET Framework 4.6.2+
 - .NET Core 3.1+
 - .NET Standard 2.0+
 

RunTests.cmd

@@ -16,7 +16,7 @@
 
   <!--These properties can be modified locally to target .NET version of choice to build and test entire test suite-->
   <PropertyGroup>
-    <TargetNetFxVersion Condition="'$(TargetNetFxVersion)' == ''">net461</TargetNetFxVersion>
+    <TargetNetFxVersion Condition="'$(TargetNetFxVersion)' == ''">net462</TargetNetFxVersion>
     <TargetNetStandardVersion Condition="'$(TargetNetStandardVersion)' == ''">netstandard2.0</TargetNetStandardVersion>
     <TargetNetCoreVersion Condition="'$(TargetNetCoreVersion)' == ''">netcoreapp3.1</TargetNetCoreVersion>
   </PropertyGroup>
@@ -37,7 +37,7 @@
       <PropertyGroup>
         <TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetstandard' OR '$(TestTargetOS)' == 'Unixnetstandard'">netstandard2.0;netstandard2.1</TargetFrameworks>
         <TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetcoreapp' OR '$(TestTargetOS)' == 'Unixnetcoreapp'">netcoreapp3.1</TargetFrameworks>
-        <TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetfx'">net461</TargetFrameworks>
+        <TargetFrameworks Condition="'$(TestTargetOS)' == 'Windowsnetfx'">net462</TargetFrameworks>
       </PropertyGroup>
     </Otherwise>
   </Choose>

src/Microsoft.Data.SqlClient/add-ons/Directory.Build.props

@@ -13,7 +13,7 @@
 using System.Diagnostics.Tracing;
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
-#if NET461
+#if net462
 using System.Security;
 #endif
 
@@ -45,7 +45,7 @@ namespace System.Net
     //   method that takes an object and optionally provides a string representation of it, in case a particular library wants to customize further.
 
     /// <summary>Provides logging facilities for System.Net libraries.</summary>
-#if NET461
+#if net462
     [SecuritySafeCritical]
 #endif
     internal sealed partial class NetEventSource : EventSource

src/Microsoft.Data.SqlClient/netcore/src/Common/src/System/Net/Logging/NetEventSource.Common.cs

@@ -370,7 +370,7 @@ private void EnlistNonNull(Transaction tx)
                 // NOTE: Global Transactions is an Azure SQL DB only
                 // feature where the Transaction Manager (TM) is not
                 // MS-DTC. Sys.Tx added APIs to support Non MS-DTC
-                // promoter types/TM in .NET 4.6.1. Following directions
+                // promoter types/TM in .NET 4.6.2. Following directions
                 // from .NETFX shiproom, to avoid a "hard-dependency"
                 // (compile time) on Sys.Tx, we use reflection to invoke
                 // the new APIs. Further, the _isGlobalTransaction flag

src/Microsoft.Data.SqlClient/netcore/src/Microsoft/Data/SqlClient/SqlInternalConnection.cs

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
   <PropertyGroup>
     <EnableDefaultCompileItems>false</EnableDefaultCompileItems>
-    <TargetFramework>net461</TargetFramework>
+    <TargetFramework>net462</TargetFramework>
     <IntermediateOutputPath>$(ObjFolder)$(Configuration)\$(AssemblyName)\ref\</IntermediateOutputPath>  
     <OutputPath>$(BinFolder)$(Configuration)\$(AssemblyName)\ref\</OutputPath>
     <DocumentationFile>$(OutputPath)\Microsoft.Data.SqlClient.xml</DocumentationFile>

src/Microsoft.Data.SqlClient/netfx/ref/Microsoft.Data.SqlClient.csproj

@@ -4,7 +4,7 @@
   <PropertyGroup>
     <ProjectGuid>{407890AC-9876-4FEF-A6F1-F36A876BAADE}</ProjectGuid>
     <RootNamespace>SqlClient</RootNamespace>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <EnableLocalAppContext>true</EnableLocalAppContext>
     <ResxFileName>Strings</ResxFileName>
     <ResourceFileName>SqlClient.Resources.$(ResxFileName)</ResourceFileName>

src/Microsoft.Data.SqlClient/netfx/src/Microsoft.Data.SqlClient.csproj

@@ -475,7 +475,7 @@ private void EnlistNonNull(SysTx.Transaction tx)
                     // NOTE: Global Transactions is an Azure SQL DB only 
                     // feature where the Transaction Manager (TM) is not
                     // MS-DTC. Sys.Tx added APIs to support Non MS-DTC
-                    // promoter types/TM in .NET 4.6.1. Following directions
+                    // promoter types/TM in .NET 4.6.2. Following directions
                     // from .NETFX shiproom, to avoid a "hard-dependency"
                     // (compile time) on Sys.Tx, we use reflection to invoke
                     // the new APIs. Further, the _isGlobalTransaction flag