huahaofeng
/
aspnetcore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'release/2.2'

This commit is contained in:
= 2018-11-16 00:32:36 -08:00
parent 7e9b11ef3f 1782a70601
commit 35f876e190
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.azure/pipelines/fast-pr-validation.yml
View File

@ -16,8 +16,8 @@ jobs:
jobDisplayName: "Build: Windows"
agentOs: Windows
beforeBuild:
- powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1"
displayName: Setup IISExpress test certificates
- powershell: "& ./src/IISIntegration/tools/UpdateIISExpressCertificate.ps1; & ./src/IISIntegration/tools/update_schema.ps1"
displayName: Setup IISExpress test certificates and schema
- template: jobs/iisintegration-job.yml
parameters:
TestGroupName: IIS

2
src/Servers/Kestrel/test/Interop.FunctionalTests/ChromeTests.cs
View File

@ -65,7 +65,7 @@ namespace Interop.FunctionalTests
};
}
[ConditionalTheory]
[ConditionalTheory(Skip="Disabling while debugging. https://github.com/aspnet/AspNetCore-Internal/issues/1363")]
[OSSkipCondition(OperatingSystems.MacOSX, SkipReason = "Missing SslStream ALPN support: https://github.com/dotnet/corefx/issues/30492")]
[MinimumOSVersion(OperatingSystems.Windows, WindowsVersions.Win81, SkipReason = "Missing Windows ALPN support: https://en.wikipedia.org/wiki/Application-Layer_Protocol_Negotiation#Support")]
[InlineData("", "Interop HTTP/2 GET")]