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

Merge remote-tracking branch 'release/2.1' into 'release/3.1' 

# Conflicts:
#	build/dependencies.props
#	eng/PatchConfig.props
#	src/Servers/Kestrel/Core/src/CoreStrings.resx
#	src/Servers/Kestrel/Core/src/Internal/HttpsConnectionAdapter.cs
#	src/Servers/Kestrel/Core/src/Properties/CoreStrings.Designer.cs
#	src/Servers/Kestrel/test/FunctionalTests/HttpsTests.cs
#	src/Shared/CertificateGeneration/CertificateManager.cs
#	src/Shared/CertificateGeneration/EnsureCertificateResult.cs
#	src/Tools/FirstRunCertGenerator/test/CertificateManagerTests.cs
#	src/Tools/dotnet-dev-certs/src/Program.cs
This commit is contained in:
Chris R 2020-01-17 10:51:34 -08:00
parent 2dc908d502 6f88144513
commit 4fb0a13618
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Servers/Kestrel/shared/test/TestResources.cs
View File

@ -45,5 +45,10 @@ namespace Microsoft.AspNetCore.Testing
{
return new X509Certificate2(GetCertPath(certName), password);
}
public static X509Certificate2 GetTestCertificate(string certName, string password)
{
return new X509Certificate2(GetCertPath(certName), password);
}
}
}