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

Merge branch 'release/2.1' into dev

This commit is contained in:
Nate McMaster 2018-03-21 22:16:12 -07:00
parent b90766d097 54e538dcb5
commit 12abcd2f68
No known key found for this signature in database
GPG Key ID: A778D9601BD78810
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/Kestrel.Core/CoreStrings.resx
View File

@ -491,7 +491,7 @@
</data> </data>
<data name="NoCertSpecifiedNoDevelopmentCertificateFound" xml:space="preserve"> <data name="NoCertSpecifiedNoDevelopmentCertificateFound" xml:space="preserve">
<value>Unable to configure HTTPS endpoint. No server certificate was specified, and the default developer certificate could not be found. <value>Unable to configure HTTPS endpoint. No server certificate was specified, and the default developer certificate could not be found.
To install the developer certificate first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https'. To trust the certificate (Windows and macOS only) run 'dotnet-dev-certs https --trust'. To generate a developer certificate run 'dotnet dev-certs https'. To trust the certificate (Windows and macOS only) run 'dotnet dev-certs https --trust'.
For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</value> For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.</value>
</data> </data>
<data name="MultipleCertificateSources" xml:space="preserve"> <data name="MultipleCertificateSources" xml:space="preserve">

4
src/Kestrel.Core/Properties/CoreStrings.Designer.cs generated
View File

@ -1748,7 +1748,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core
/// <summary> /// <summary>
/// Unable to configure HTTPS endpoint. No server certificate was specified, and the default developer certificate could not be found. /// Unable to configure HTTPS endpoint. No server certificate was specified, and the default developer certificate could not be found.
/// To install the developer certificate first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https'. To trust the certificate (Windows and macOS only) run 'dotnet-dev-certs https --trust'. /// To generate a developer certificate run 'dotnet dev-certs https'. To trust the certificate (Windows and macOS only) run 'dotnet dev-certs https --trust'.
/// For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. /// For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.
/// </summary> /// </summary>
internal static string NoCertSpecifiedNoDevelopmentCertificateFound internal static string NoCertSpecifiedNoDevelopmentCertificateFound
@ -1758,7 +1758,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.Core
/// <summary> /// <summary>
/// Unable to configure HTTPS endpoint. No server certificate was specified, and the default developer certificate could not be found. /// Unable to configure HTTPS endpoint. No server certificate was specified, and the default developer certificate could not be found.
/// To install the developer certificate first install the dev-certs tool by running 'dotnet install tool dotnet-dev-certs -g --version 2.1.0-preview1-final' and then run 'dotnet-dev-certs https'. To trust the certificate (Windows and macOS only) run 'dotnet-dev-certs https --trust'. /// To generate a developer certificate run 'dotnet dev-certs https'. To trust the certificate (Windows and macOS only) run 'dotnet dev-certs https --trust'.
/// For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054. /// For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?linkid=848054.
/// </summary> /// </summary>
internal static string FormatNoCertSpecifiedNoDevelopmentCertificateFound() internal static string FormatNoCertSpecifiedNoDevelopmentCertificateFound()