Skip to content

Commit fe6a3fc

Browse files
authored
Fix some issues causing aspnetcore-helix-matrix failures (#26840)
1 parent d0978cd commit fe6a3fc

File tree

5 files changed

+9
-7
lines changed

5 files changed

+9
-7
lines changed

eng/targets/Helix.Common.props

+2-2
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
<HelixAvailableTargetQueue Include="Debian.9.Amd64.Open" Platform="Linux" />
3434
<HelixAvailableTargetQueue Include="Redhat.7.Amd64.Open" Platform="Linux" />
3535
<HelixAvailableTargetQueue Include="(Fedora.28.Amd64.Open)Ubuntu.1604.Amd64.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:fedora-28-helix-09ca40b-20190508143249" Platform="Linux" />
36-
</ItemGroup>
36+
</ItemGroup>
3737
<ItemGroup Condition="'$(TargetArchitecture)' == 'x64' AND '$(IsHelixDaily)' == 'true'">
3838
<HelixAvailableTargetQueue Include="Windows.7.Amd64.Open" Platform="Windows" />
3939
<HelixAvailableTargetQueue Include="Windows.81.Amd64.Open" Platform="Windows" />
@@ -43,7 +43,7 @@
4343
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true' AND '$(IsWindowsOnlyTest)' != 'true'">
4444
<HelixAvailableTargetQueue Include="(Debian.9.Arm64.Open)Ubuntu.1804.Armarch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:debian-9-helix-arm64v8-a12566d-20190807161036" Platform="Linux" />
4545
</ItemGroup>
46-
<ItemGroup Condition="'$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true'">
46+
<ItemGroup Condition="'$(IsWindowsOnlyTest)' != 'true' AND '$(TargetArchitecture)' == 'arm64' AND '$(IsHelixDaily)' == 'true'">
4747
<HelixAvailableTargetQueue Include="Windows.10.Arm64.Open" Platform="Windows" />
4848
</ItemGroup>
4949
</Project>

src/DataProtection/Extensions/test/DataProtectionProviderTests.cs

+1-1
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ public void System_UsesProvidedDirectory_WithConfigurationCallback()
115115

116116
[ConditionalFact]
117117
[X509StoreIsAvailable(StoreName.My, StoreLocation.CurrentUser)]
118-
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720", Queues = "All.OSX")]
118+
[SkipOnHelix("https://github.com/dotnet/aspnetcore/issues/6720 and https://github.com/dotnet/aspnetcore/issues/26871", Queues = "All.OSX;Windows.10.Arm64.Open")]
119119
public void System_UsesProvidedDirectoryAndCertificate()
120120
{
121121
var filePath = Path.Combine(GetTestFilesPath(), "TestCert.pfx");

src/Security/Authentication/Negotiate/test/Negotiate.FunctionalTest/NegotiateHandlerFunctionalTests.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ public async Task Anonymous_Challenge_401Negotiate_Win7()
6969

7070
[ConditionalTheory]
7171
[MemberData(nameof(Http11And2))]
72-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "Windows only supports ALPN on 8.1 and later.")]
72+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10, SkipReason = "Windows only supports ALPN and required ciphers on 10 and later.")]
7373
public async Task Anonymous_NoChallenge_NoOps(Version version)
7474
{
7575
using var host = await CreateHostAsync();
@@ -84,7 +84,7 @@ public async Task Anonymous_NoChallenge_NoOps(Version version)
8484

8585
[ConditionalTheory]
8686
[MemberData(nameof(Http11And2))]
87-
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "Windows only supports ALPN on 8.1 and later.")]
87+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10, SkipReason = "Windows only supports ALPN and required ciphers on 10 and later.")]
8888
public async Task Anonymous_Challenge_401Negotiate(Version version)
8989
{
9090
using var host = await CreateHostAsync();

src/Servers/IIS/IIS/test/Common.FunctionalTests/RequestResponseTests.cs

+1
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,7 @@ await connection.Send(
666666

667667
[ConditionalFact]
668668
[MaximumOSVersion(OperatingSystems.Windows, WindowsVersions.Win10_20H1, SkipReason = "Shutdown hangs https://github.com/dotnet/aspnetcore/issues/25107")]
669+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "NullReferenceException https://github.com/dotnet/aspnetcore/issues/26839")]
669670
public async Task ClientDisconnectStress()
670671
{
671672
var maxRequestSize = 1000;

src/Servers/Kestrel/test/InMemory.FunctionalTests/EventSourceTests.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -268,7 +268,8 @@ public async Task Http2_EmitsStartAndStopEventsWithActivityIds()
268268
Assert.Equal(eventIndex, events.Count);
269269
}
270270

271-
[Fact]
271+
[ConditionalFact]
272+
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win8, SkipReason = "SslStream.AuthenticateAsServerAsync() doesn't throw on Win 7 when the client tries SSL 2.0.")]
272273
public async Task TlsHandshakeFailure_EmitsStartAndStopEventsWithActivityIds()
273274
{
274275
int port;
@@ -298,7 +299,7 @@ public async Task TlsHandshakeFailure_EmitsStartAndStopEventsWithActivityIds()
298299
{
299300
TargetHost = "localhost",
300301

301-
// Only enabling SslProtocols.Ssl2 should cause a handshake failure on all platforms.
302+
// Only enabling SslProtocols.Ssl2 should cause a handshake failure on most platforms.
302303
#pragma warning disable CS0618 // Type or member is obsolete
303304
EnabledSslProtocols = SslProtocols.Ssl2,
304305
#pragma warning restore CS0618 // Type or member is obsolete

0 commit comments

Comments
 (0)