load quic early to prevent interaction with tests (#75488) (#75603)

* load quic early to prevent interaction with tests * update Debian10 image for x64 * rever helix change * feedback from review * remove quic reference * Update src/libraries/System.Net.Security/tests/FunctionalTests/TestHelper.cs Co-authored-by: Jan Kotas <jkotas@microsoft.com> Co-authored-by: Jan Kotas <jkotas@microsoft.com>
dotnet · Sep 14, 2022 · 0cc205f · 0cc205f
1 parent 66a9136
commit 0cc205f
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 1 deletion.
diff --git a/...ies/System.Net.Requests/tests/QuicLoad.cs → ...aries/Common/tests/System/Net/QuicLoad.cs b/...ies/System.Net.Requests/tests/QuicLoad.cs → ...aries/Common/tests/System/Net/QuicLoad.cs
diff --git a/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj b/src/libraries/System.Net.Mail/tests/Functional/System.Net.Mail.Functional.Tests.csproj
@@ -4,6 +4,7 @@
  <TargetFrameworks>$(NetCoreAppCurrent)-windows;$(NetCoreAppCurrent)-Unix;$(NetCoreAppCurrent)-Browser;$(NetCoreAppCurrent)-OSX;$(NetCoreAppCurrent)-iOS;$(NetCoreAppCurrent)-Android</TargetFrameworks>
  <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
  <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+ <EnablePreviewFeatures>true</EnablePreviewFeatures>
  </PropertyGroup>
  <ItemGroup>
  <Compile Include="AlternateViewCollectionTest.cs" />
@@ -24,6 +25,8 @@
  Link="Common\System\Diagnostics\Tracing\TestEventListener.cs" />
  <Compile Include="$(CommonTestPath)System\IO\TempFile.cs"
  Link="Common\System\IO\TempFile.cs" />
+ <Compile Include="$(CommonTestPath)System\Net\QuicLoad.cs"
+ Link="Common\System\Net\System\Net\QuicLoad.cs" />
  <Compile Include="$(CommonTestPath)System\Threading\Tasks\TaskTimeoutExtensions.cs"
  Link="Common\System\Threading\Tasks\TaskTimeoutExtensions.cs" />
  </ItemGroup>

diff --git a/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj b/src/libraries/System.Net.Requests/tests/System.Net.Requests.Tests.csproj
@@ -15,7 +15,6 @@
  <Compile Include="AssemblyInfo.cs" />
  <Compile Include="HttpWebRequestTest.cs" />
  <Compile Include="HttpWebResponseTest.cs" />
- <Compile Include="QuicLoad.cs" />
  <Compile Include="RequestStreamTest.cs" />
  <Compile Include="WebRequestTest.cs" />
  <Compile Include="$(CommonTestPath)System\Net\Capability.Security.cs"
@@ -28,6 +27,8 @@
  Link="Common\System\Net\Configuration.Http.cs" />
  <Compile Include="$(CommonTestPath)System\Net\Configuration.Security.cs"
  Link="Common\System\Net\Configuration.Security.cs" />
+ <Compile Include="$(CommonTestPath)System\Net\QuicLoad.cs"
+ Link="Common\System\Net\System\Net\QuicLoad.cs" />
  <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.cs"
  Link="Common\System\Net\Http\LoopbackServer.cs" />
  <Compile Include="$(CommonTestPath)System\Net\Http\LoopbackServer.AuthenticationHelpers.cs"

diff --git a/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj b/src/libraries/System.Net.Security/tests/FunctionalTests/System.Net.Security.Tests.csproj
@@ -7,6 +7,7 @@
  <EnableLibraryImportGenerator>true</EnableLibraryImportGenerator>
  <!-- the res/xml/network_security_config.xml file comes from the System.Net.TestData package -->
  <IncludeNetworkSecurityConfig Condition="'$(TargetOS)' == 'Android'">true</IncludeNetworkSecurityConfig>
+ <EnablePreviewFeatures>true</EnablePreviewFeatures>
  </PropertyGroup>
  <ItemGroup>
  <Compile Include="AssemblyInfo.cs" />
@@ -73,6 +74,8 @@
  Link="Common\System\Net\HttpsTestClient.cs" />
  <Compile Include="$(CommonTestPath)System\Net\HttpsTestServer.cs"
  Link="Common\System\Net\HttpsTestServer.cs" />
+ <Compile Include="$(CommonTestPath)System\Net\QuicLoad.cs"
+ Link="Common\System\Net\System\Net\QuicLoad.cs" />
  <Compile Include="$(CommonTestPath)System\Net\SslProtocolSupport.cs"
  Link="Common\System\Net\SslProtocolSupport.cs" />
  <Compile Include="$(CommonTestPath)System\Net\TestLogging.cs"