Async open improvements for NetTcp

Directory.Build.props

@@ -25,8 +25,8 @@
  </PropertyGroup>
 
  <PropertyGroup>
- <ScenarioTestTargetFrameworks>netcoreapp3.1;net5.0;net6.0</ScenarioTestTargetFrameworks>
- <UnitTestTargetFrameworks>netcoreapp3.1;net5.0;net6.0</UnitTestTargetFrameworks>
+ <ScenarioTestTargetFrameworks>netcoreapp3.1;net6.0;net7.0</ScenarioTestTargetFrameworks>
+ <UnitTestTargetFrameworks>netcoreapp3.1;net6.0;net7.0</UnitTestTargetFrameworks>
  <!-- This is the target framework version of the built tests picked up to send to Helix -->
  <XUnitPublishTargetFramework>netcoreapp3.1</XUnitPublishTargetFramework>
  </PropertyGroup>

eng/SendToHelix.proj

@@ -26,15 +26,15 @@
 
  <ItemGroup Condition="'$(TestJob)' == 'Windows' AND '$(RunAsInternal)'" >
  <HelixTargetQueue Include="Windows.10.Amd64" />
- <HelixTargetQueue Include="Debian.9.Amd64" />
+ <HelixTargetQueue Include="(Debian.11.Amd64.Open)ubuntu.2004.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220511124750-0ece9b3" />
  <HelixTargetQueue Include="RedHat.7.Amd64" />
  </ItemGroup>
 
  <ItemGroup Condition="'$(TestJob)' == 'Linux'" >
  <HelixTargetQueue Include="Centos.7.Amd64.Open" />
- <HelixTargetQueue Include="Debian.9.Amd64.Open" />
+ <HelixTargetQueue Include="(Debian.11.Amd64.Open)ubuntu.2004.amd64.open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-11-helix-amd64-20220511124750-0ece9b3" />
  <HelixTargetQueue Include="RedHat.7.Amd64.Open" />
- <HelixTargetQueue Include="SLES.12.Amd64.Open" />
+ <HelixTargetQueue Include="SLES.15.Amd64.Open" />
  <HelixTargetQueue Include="Ubuntu.2004.Amd64.Open" />
  </ItemGroup>
 

global.json

@@ -4,7 +4,7 @@
  "runtimes": {
  "dotnet": [
  "3.1.5",
- "5.0.4"
+ "6.0.5"
  ]
  }
  },

src/System.Private.ServiceModel/src/System/ServiceModel/Channels/DnsCache.cs

@@ -39,7 +39,7 @@ public static string MachineName
  {
  try
  {
- s_machineName = Dns.GetHostEntryAsync(String.Empty).GetAwaiter().GetResult().HostName;
+ s_machineName = Dns.GetHostEntry(string.Empty).HostName;
  }
  catch (SocketException)
  {

src/System.Private.ServiceModel/src/System/ServiceModel/Channels/FramingChannels.cs

@@ -336,7 +336,12 @@ protected internal override async Task OnOpenAsync(TimeSpan timeout)
  IConnection connection;
  try
  {
- connection = await _connectionPoolHelper.EstablishConnectionAsync(timeout);
+ // Execute socket connection code on either IO Thread (Windows) or our own new Thread (Linux)
+ // This is to mitigate sync over async Open calls from failing to progress when there's thread starvation.
+ using (TaskHelpers.RunTaskContinuationsOnOurThreads())
+ {
+ connection = await _connectionPoolHelper.EstablishConnectionAsync(timeout);
+ }
  }
  catch (TimeoutException exception)
  {

src/System.Private.ServiceModel/src/System/ServiceModel/Channels/SocketConnection.cs

@@ -1480,6 +1480,18 @@ private static async Task<IPAddress[]> GetIPAddressesAsync(Uri uri)
  return new IPAddress[] { ipAddress };
  }
 
+ if ("localhost".Equals(uri.DnsSafeHost, StringComparison.OrdinalIgnoreCase))
+ {
+ if (Socket.OSSupportsIPv6)
+ {
+ return new IPAddress[] { IPAddress.IPv6Loopback, IPAddress.Loopback };
+ }
+ else
+ {
+ return new IPAddress[] { IPAddress.Loopback };
+ }
+ }
+
  IPAddress[] addresses = null;
 
  try

src/System.Private.ServiceModel/src/System/ServiceModel/Security/SspiSecurityTokenProvider.cs

@@ -9,6 +9,7 @@
 using System.Net;
 using System.Security.Principal;
 using System.Threading.Tasks;
+using System.Runtime;
 
 namespace System.ServiceModel.Security
 {
@@ -36,9 +37,14 @@ protected override SecurityToken GetTokenCore(TimeSpan timeout)
  return _token;
  }
 
- internal override Task<SecurityToken> GetTokenCoreInternalAsync(TimeSpan timeout)
+ protected override IAsyncResult BeginGetTokenCore(TimeSpan timeout, AsyncCallback callback, object state)
  {
- return Task.FromResult<SecurityToken>(GetTokenCore(timeout));
+ return new CompletedAsyncResult<SecurityToken>(GetTokenCore(timeout), callback, state);
+ }
+
+ protected override SecurityToken EndGetTokenCore(IAsyncResult result)
+ {
+ return CompletedAsyncResult<SecurityToken>.End(result);
  }
  }
 }

src/System.Private.ServiceModel/tests/Scenarios/Security/TransportSecurity/Negotiate/NegotiateStream_Http_Tests.4.1.0.cs

@@ -104,46 +104,6 @@ public static void NegotiateStream_Http_AmbientCredentials()
  }
  }
 
- [WcfFact]
- [Condition(nameof(Windows_Authentication_Available),
- nameof(Root_Certificate_Installed),
- nameof(Ambient_Credentials_Available))]
- [OuterLoop]
- public static void NegotiateStream_Http_AmbientCredentialsForNet50()
- {
- string testString = "Hello";
- ChannelFactory<IWcfService> factory = null;
- IWcfService serviceProxy = null;
-
- try
- {
- // *** SETUP *** \\
- BasicHttpBinding binding = new BasicHttpBinding(BasicHttpSecurityMode.Transport);
- binding.Security.Transport.ClientCredentialType = HttpClientCredentialType.Windows;
- string spn = GetSPN().ToLowerInvariant().Replace("host", "HTTP");
-
- factory = new ChannelFactory<IWcfService>(
- binding,
- new EndpointAddress(new Uri(Endpoints.Https_WindowsAuth_Address), new SpnEndpointIdentity(spn)));
- serviceProxy = factory.CreateChannel();
-
- // *** EXECUTE *** \\
- string result = serviceProxy.Echo(testString);
-
- // *** VALIDATE *** \\
- Assert.Equal(testString, result);
-
- // *** CLEANUP *** \\
- ((ICommunicationObject)serviceProxy).Close();
- factory.Close();
- }
- finally
- {
- // *** ENSURE CLEANUP *** \\
- ScenarioTestHelpers.CloseCommunicationObjects((ICommunicationObject)serviceProxy, factory);
- }
- }
-
  [WcfFact]
  [Condition(nameof(Windows_Authentication_Available),
  nameof(Root_Certificate_Installed),