Make RunCommonHostLogic synchronous

Author: rokonec

src/libraries/System.Net.Sockets/System.Net.Sockets.sln

@@ -1,4 +1,8 @@
-Microsoft Visual Studio Solution File, Format Version 12.00
+
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio Version 17
+VisualStudioVersion = 17.10.34928.147
+MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "StreamConformanceTests", "..\Common\tests\StreamConformanceTests\StreamConformanceTests.csproj", "{E5699508-7F83-4125-9495-C73BD4C43046}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestUtilities", "..\Common\tests\TestUtilities\TestUtilities.csproj", "{AEDCC778-C0D1-4155-9DD2-45EBF160CDA0}"
@@ -43,11 +47,11 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{2C7108F0-035
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{51E336C9-CFE7-4459-B407-FD5D9E760D85}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "tools\gen", "{CCBA19A8-17AB-402A-96E6-A1C92784EAC2}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "gen", "gen", "{CCBA19A8-17AB-402A-96E6-A1C92784EAC2}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "tools\src", "{99B1FC8E-726F-4DBF-887D-38AC7F63C230}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{99B1FC8E-726F-4DBF-887D-38AC7F63C230}"
 EndProject
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "tools\ref", "{2D08A54A-C557-444C-9D8D-0BF0E20CDE5A}"
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{2D08A54A-C557-444C-9D8D-0BF0E20CDE5A}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tools", "tools", "{725DA203-1DB5-47D5-991A-8440E254BB23}"
 EndProject
@@ -136,27 +140,31 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{E5699508-7F83-4125-9495-C73BD4C43046} = {FAD51322-998C-42D4-8FAA-EA479A3A0E82}
 		{AEDCC778-C0D1-4155-9DD2-45EBF160CDA0} = {FAD51322-998C-42D4-8FAA-EA479A3A0E82}
-		{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2} = {FAD51322-998C-42D4-8FAA-EA479A3A0E82}
 		{3C5413D5-7662-4E7C-8A1D-C8E6C527782F} = {FC5FEA3E-33B9-4AEE-8E41-367BB73182EF}
 		{5BE2193A-9EAB-4F1C-B2F4-E969C84F2614} = {FC5FEA3E-33B9-4AEE-8E41-367BB73182EF}
 		{EAEEEA1F-FE18-4CA1-88C9-59CD1097C593} = {FC5FEA3E-33B9-4AEE-8E41-367BB73182EF}
 		{FDFDE647-E25F-4B21-B002-4EEEFC42EFA1} = {FC5FEA3E-33B9-4AEE-8E41-367BB73182EF}
-		{293F6DBE-2ECA-4F22-AF58-4AC1668F028B} = {FC5FEA3E-33B9-4AEE-8E41-367BB73182EF}
-		{F7A848B6-8307-4702-AEEE-20223FB73F29} = {FC5FEA3E-33B9-4AEE-8E41-367BB73182EF}
 		{FD313302-FE04-414E-8A62-3BC8894115C1} = {2C7108F0-035E-44A5-8451-FE9535F53D43}
+		{69A7DCCE-B05B-44F3-B7BC-17A90759D1A2} = {FAD51322-998C-42D4-8FAA-EA479A3A0E82}
 		{85782EDD-90A7-4600-89EB-4E2C0AAAD446} = {51E336C9-CFE7-4459-B407-FD5D9E760D85}
 		{0CAE4AA4-2C81-4CA4-978A-F86DD25FA338} = {51E336C9-CFE7-4459-B407-FD5D9E760D85}
 		{3DD27643-568B-4BA1-82F2-FACFC8365836} = {51E336C9-CFE7-4459-B407-FD5D9E760D85}
+		{293F6DBE-2ECA-4F22-AF58-4AC1668F028B} = {FC5FEA3E-33B9-4AEE-8E41-367BB73182EF}
+		{F7A848B6-8307-4702-AEEE-20223FB73F29} = {FC5FEA3E-33B9-4AEE-8E41-367BB73182EF}
 		{FA256A4B-476D-4BCA-8E62-C2A11DF778CE} = {CCBA19A8-17AB-402A-96E6-A1C92784EAC2}
 		{6D7B425E-F07B-4572-98D8-728E3053E30F} = {CCBA19A8-17AB-402A-96E6-A1C92784EAC2}
-		{CCBA19A8-17AB-402A-96E6-A1C92784EAC2} = {725DA203-1DB5-47D5-991A-8440E254BB23}
 		{21411575-DD1A-45E1-8B10-6D4EA58684CD} = {99B1FC8E-726F-4DBF-887D-38AC7F63C230}
 		{FA935CE3-6C83-4993-B565-95DF3129A43B} = {99B1FC8E-726F-4DBF-887D-38AC7F63C230}
-		{99B1FC8E-726F-4DBF-887D-38AC7F63C230} = {725DA203-1DB5-47D5-991A-8440E254BB23}
 		{C2011D8C-93D7-486E-8B01-0792262F4EF8} = {2D08A54A-C557-444C-9D8D-0BF0E20CDE5A}
+		{CCBA19A8-17AB-402A-96E6-A1C92784EAC2} = {725DA203-1DB5-47D5-991A-8440E254BB23}
+		{99B1FC8E-726F-4DBF-887D-38AC7F63C230} = {725DA203-1DB5-47D5-991A-8440E254BB23}
 		{2D08A54A-C557-444C-9D8D-0BF0E20CDE5A} = {725DA203-1DB5-47D5-991A-8440E254BB23}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {BA222465-FBD4-4377-8A8A-783BF85E01F7}
 	EndGlobalSection
+	GlobalSection(SharedMSBuildProjectFiles) = preSolution
+		..\..\tools\illink\src\ILLink.Shared\ILLink.Shared.projitems*{6d7b425e-f07b-4572-98d8-728e3053e30f}*SharedItemsImports = 5
+		..\..\tools\illink\src\ILLink.Shared\ILLink.Shared.projitems*{fa935ce3-6c83-4993-b565-95df3129a43b}*SharedItemsImports = 5
+	EndGlobalSection
 EndGlobal

src/libraries/System.Net.Sockets/tests/FunctionalTests/SocketDuplicationTests.cs

@@ -324,7 +324,7 @@ public async Task DuplicateAndClose_TcpServerHandler(AddressFamily addressFamily
                 if (sameProcess)
                 {
                     Task handlerCode = Task.Run(() => HandlerServerCode(_ipcPipeName));
-                    await RunCommonHostLogic(Environment.ProcessId);
+                    RunCommonHostLogic(Environment.ProcessId);
                     await handlerCode;
                 }
                 else
@@ -334,18 +334,16 @@ public async Task DuplicateAndClose_TcpServerHandler(AddressFamily addressFamily
                     // Since RunCommonHostLogic can throw, we need to make sure the server process is disposed
                     try
                     {
-                        await RunCommonHostLogic(hServerProc.Process.Id);
+                        RunCommonHostLogic(hServerProc.Process.Id);
                     }
                     finally
                     {
                         await hServerProc.DisposeAsync();
                     }
                 }
 
-                async Task RunCommonHostLogic(int processId)
+                void RunCommonHostLogic(int processId)
                 {
-                    await Task.CompletedTask.ConfigureAwait(ConfigureAwaitOptions.ForceYielding);
-                    
                     pipeServerStream.WaitForConnection();
 
                     // Duplicate the socket: