[Release 3.1] | Address Shim gss api on Linux to delay loading libgssapi_krb5.so while using Net6

pkg/Microsoft.Private.PackageBaseline/packageIndex.json

@@ -1548,9 +1548,10 @@
         "4.8.0",
         "4.8.1",
         "4.8.2",
-        "4.8.3"
+        "4.8.3",
+        "4.8.4"
       ],
-      "BaselineVersion": "4.8.3",
+      "BaselineVersion": "4.8.4",
       "InboxOn": {
         "net461": "4.1.0.0",
         "monoandroid10": "Any",
@@ -1574,7 +1575,8 @@
         "4.6.1.0": "4.8.0",
         "4.6.1.1": "4.8.1",
         "4.6.1.2": "4.8.2",
-        "4.6.1.3": "4.8.3"
+        "4.6.1.3": "4.8.3",
+        "4.6.1.4": "4.8.4"
       }
     },
     "System.Data.SqlXml": {

pkg/Microsoft.Windows.Compatibility/Microsoft.Windows.Compatibility.pkgproj

@@ -30,7 +30,7 @@
     <PrereleaseLibraryPackage Include="System.Data.OleDb" />
     <PrereleaseLibraryPackage Include="System.Data.SqlClient"> 
       <!-- SQL client defines its own version, higher than rest of master --> 
-      <Version>4.8.3</Version>
+      <Version>4.8.4</Version>
     </PrereleaseLibraryPackage>
     <PrereleaseLibraryPackage Include="System.Drawing.Common" />
     <PrereleaseLibraryPackage Include="System.Diagnostics.EventLog" />

src/System.Data.SqlClient/src/Common/Interop/Unix/System.Net.Security.Native/Interop.NetSecurityNative.Extended.cs

@@ -0,0 +1,27 @@
+// Licensed to the .NET Foundation under one or more agreements.
+// The .NET Foundation licenses this file to you under the MIT license.
+// See the LICENSE file in the project root for more information.
+
+using System;
+using System.Runtime.InteropServices;
+
+internal static partial class Interop
+{
+    internal static partial class NetSecurityNative
+    {
+        [DllImport(Interop.Libraries.NetSecurityNative, EntryPoint = "NetSecurityNative_EnsureGssInitialized")]
+        private static extern int EnsureGssInitialized();
+
+        // This constructor is added to address the issue with net6 regarding 
+        // Shim gss api on Linux to delay loading libgssapi_krb5.so
+        // issue https://github.com/dotnet/SqlClient/issues/1390
+        // dotnet runtime issue https://github.com/dotnet/runtime/pull/55037
+        static NetSecurityNative()
+        {
+            if (Environment.Version.Major >= 6)
+            {
+                EnsureGssInitialized();
+            }
+        }
+    }
+}

src/System.Data.SqlClient/src/System.Data.SqlClient.csproj

@@ -480,6 +480,7 @@
     <Compile Include="$(CommonPath)\Microsoft\Win32\SafeHandles\GssSafeHandles.cs">
       <Link>Common\Microsoft\Win32\SafeHandles\GssSafeHandles.cs</Link>
     </Compile>
+    <Compile Include="Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.Extended.cs" />
     <Compile Include="$(CommonPath)\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs">
       <Link>Common\Interop\Unix\System.Net.Security.Native\Interop.NetSecurityNative.cs</Link>
     </Compile>