Revert dotnet#84793

ManickaP · Jun 22, 2023 · 53fdb50 · 53fdb50
1 parent 2f2aaae
commit 53fdb50
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 34 deletions.
diff --git a/eng/docker/build-docker-sdk.ps1 b/eng/docker/build-docker-sdk.ps1
@@ -36,7 +36,6 @@ if ($buildWindowsContainers)
   # 2. Runtime pack (microsoft.netcore.app.runtime.win-x64)
   # 3. targetingpacks.targets, so stress test builds can target the live-built runtime instead of the one in the pre-installed SDK
   # 4. testhost
-  # 5. msquic interop sources (needed for HttpStress)
   $binArtifacts = "$REPO_ROOT_DIR\artifacts\bin"
   $dockerContext = "$REPO_ROOT_DIR\artifacts\docker-context"
 
@@ -52,8 +51,6 @@ if ($buildWindowsContainers)
                      -Destination $dockerContext\testhost
   Copy-Item -Recurse -Path $REPO_ROOT_DIR\eng\targetingpacks.targets `
                      -Destination $dockerContext\targetingpacks.targets
-  Copy-Item -Recurse -Path $REPO_ROOT_DIR\src\libraries\System.Net.Quic\src\System\Net\Quic\Interop `
-                     -Destination $dockerContext\msquic-interop
 
   # In case of non-CI builds, testhost may already contain Microsoft.AspNetCore.App (see build-local.ps1 in HttpStress):
   $testHostAspNetCorePath="$dockerContext\testhost\net$dotNetVersion-windows-$configuration-x64/shared/Microsoft.AspNetCore.App"

diff --git a/eng/docker/libraries-sdk.linux.Dockerfile b/eng/docker/libraries-sdk.linux.Dockerfile
@@ -26,7 +26,6 @@ RUN bash ./dotnet-install.sh --channel $_DOTNET_INSTALL_CHANNEL --quality daily
 # 2. Runtime pack (microsoft.netcore.app.runtime.linux-x64)
 # 3. targetingpacks.targets, so stress test builds can target the live-built runtime instead of the one in the pre-installed SDK
 # 4. testhost
-# 5. msquic interop sources (needed for HttpStress)
 
 COPY --from=corefxbuild \
     /repo/artifacts/bin/microsoft.netcore.app.ref \
@@ -44,10 +43,6 @@ COPY --from=corefxbuild \
     /repo/artifacts/bin/testhost \
     /live-runtime-artifacts/testhost
 
-COPY --from=corefxbuild \
-    /repo/src/libraries/System.Net.Quic/src/System/Net/Quic/Interop \
-    /live-runtime-artifacts/msquic-interop
-
 # Add AspNetCore bits to testhost:
 ENV _ASPNETCORE_SOURCE="/usr/share/dotnet/shared/Microsoft.AspNetCore.App/$VERSION*"
 ENV _ASPNETCORE_DEST="/live-runtime-artifacts/testhost/net$VERSION-linux-$CONFIGURATION-x64/shared/Microsoft.AspNetCore.App"

diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Directory.Build.props b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Directory.Build.props
@@ -6,7 +6,6 @@
         <!-- Stress projects have their own global.json, the directory above that also has it is the repository root. -->
         <RepositoryRoot>$([MSBuild]::GetDirectoryNameOfFileAbove($(MSBuildThisFileDirectory)../, global.json))/</RepositoryRoot>
 
-        <MsQuicInteropIncludes Condition="'$(MsQuicInteropIncludes)' == ''">$(RepositoryRoot)src/libraries/System.Net.Quic/src/System/Net/Quic/Interop/*.cs</MsQuicInteropIncludes>
         <TargetingPacksTargetsLocation Condition="'$(TargetingPacksTargetsLocation)' == ''">$(RepositoryRoot)eng/targetingpacks.targets</TargetingPacksTargetsLocation>
         <ProductVersion>8.0.0</ProductVersion>
         <NetCoreAppCurrent>net8.0</NetCoreAppCurrent>

diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Dockerfile
@@ -28,7 +28,6 @@ WORKDIR /app
 COPY . .
 
 RUN dotnet build -c $CONFIGURATION \
-    -p:MsQuicInteropIncludes="/live-runtime-artifacts/msquic-interop/*.cs" \
     -p:TargetingPacksTargetsLocation=/live-runtime-artifacts/targetingpacks.targets \
     -p:MicrosoftNetCoreAppRefPackDir=/live-runtime-artifacts/microsoft.netcore.app.ref/ \
     -p:MicrosoftNetCoreAppRuntimePackDir=/live-runtime-artifacts/microsoft.netcore.app.runtime.linux-x64/$CONFIGURATION/

diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/HttpStress.csproj
@@ -17,11 +17,6 @@
     <PackageReference Include="System.Net.Http.WinHttpHandler" Version="4.5.4" />
   </ItemGroup>
 
-  <!-- Shared production code -->
-  <ItemGroup>
-    <Compile Include="$(MsQuicInteropIncludes)" LinkBase="MsQuicInterop" />
-  </ItemGroup>
-
   <PropertyGroup>
     <!-- These may lead to duplicate generated classes with local (non-docker) Linux builds. -->
     <GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>

diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Program.cs b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/Program.cs
@@ -14,7 +14,6 @@
 using System.Net;
 using HttpStress;
 using System.Net.Quic;
-using Microsoft.Quic;
 
 [assembly:SupportedOSPlatform("windows")]
 [assembly:SupportedOSPlatform("linux")]
@@ -186,23 +185,6 @@ private static async Task<ExitCode> Run(Configuration config)
             Console.WriteLine("Query Parameters: " + config.MaxParameters);
             Console.WriteLine();
 
-            if (config.HttpVersion == HttpVersion.Version30 && IsQuicSupported)
-            {
-                unsafe
-                {
-                    // If the system gets overloaded, MsQuic has a tendency to drop incoming connections, see https://github.com/dotnet/runtime/issues/55979.
-                    // So in case we're running H/3 stress test, we're using the same hack as for System.Net.Quic tests, which increases the time limit for pending operations in MsQuic thread pool.
-                    object msQuicApiInstance = msQuicApiType.GetProperty("Api", BindingFlags.NonPublic | BindingFlags.Static).GetGetMethod(true).Invoke(null, Array.Empty<object?>());
-                    QUIC_API_TABLE* apiTable = (QUIC_API_TABLE*)(Pointer.Unbox(msQuicApiType.GetProperty("ApiTable").GetGetMethod().Invoke(msQuicApiInstance, Array.Empty<object?>())));
-                    QUIC_SETTINGS settings = default(QUIC_SETTINGS);
-                    settings.IsSet.MaxWorkerQueueDelayUs = 1;
-                    settings.MaxWorkerQueueDelayUs = 2_500_000u; // 2.5s, 10x the default
-                    if (MsQuic.StatusFailed(apiTable->SetParam(null, MsQuic.QUIC_PARAM_GLOBAL_SETTINGS, (uint)sizeof(QUIC_SETTINGS), (byte*)&settings)))
-                    {
-                        Console.WriteLine($"Unable to set MsQuic MaxWorkerQueueDelayUs.");
-                    }
-                }
-            }
 
             StressServer? server = null;
             if (config.RunMode.HasFlag(RunMode.server))

diff --git a/src/libraries/System.Net.Http/tests/StressTests/HttpStress/windows.Dockerfile b/src/libraries/System.Net.Http/tests/StressTests/HttpStress/windows.Dockerfile
@@ -12,7 +12,6 @@ ARG VERSION=8.0
 ARG CONFIGURATION=Release
 
 RUN dotnet build -c $env:CONFIGURATION `
-    -p:MsQuicInteropIncludes="C:/live-runtime-artifacts/msquic-interop/*.cs" `
     -p:TargetingPacksTargetsLocation=C:/live-runtime-artifacts/targetingpacks.targets `
     -p:MicrosoftNetCoreAppRefPackDir=C:/live-runtime-artifacts/microsoft.netcore.app.ref/ `
     -p:MicrosoftNetCoreAppRuntimePackDir=C:/live-runtime-artifacts/microsoft.netcore.app.runtime.win-x64/$env:CONFIGURATION/