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

Change OSX to macOS in error message (#12756)

This commit is contained in:
James Newton-King 2019-08-01 08:30:56 +12:00 committed by GitHub
parent 2969001a75
commit 1434e239d6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/ProjectTemplates/test/GrpcTemplateTest.cs
View File

@ -44,7 +44,7 @@ namespace Templates.Test
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{ {
Assert.True(serverProcess.Process.HasExited, "built"); Assert.True(serverProcess.Process.HasExited, "built");
Assert.Contains("System.NotSupportedException: HTTP/2 over TLS is not supported on OSX due to missing ALPN support.", Assert.Contains("System.NotSupportedException: HTTP/2 over TLS is not supported on macOS due to missing ALPN support.",
ErrorMessages.GetFailedProcessMessageOrEmpty("Run built service", Project, serverProcess.Process)); ErrorMessages.GetFailedProcessMessageOrEmpty("Run built service", Project, serverProcess.Process));
} }
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && Environment.OSVersion.Version < new Version(6, 2)) else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && Environment.OSVersion.Version < new Version(6, 2))
@ -68,7 +68,7 @@ namespace Templates.Test
if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX)) if (RuntimeInformation.IsOSPlatform(OSPlatform.OSX))
{ {
Assert.True(aspNetProcess.Process.HasExited, "published"); Assert.True(aspNetProcess.Process.HasExited, "published");
Assert.Contains("System.NotSupportedException: HTTP/2 over TLS is not supported on OSX due to missing ALPN support.", Assert.Contains("System.NotSupportedException: HTTP/2 over TLS is not supported on macOS due to missing ALPN support.",
ErrorMessages.GetFailedProcessMessageOrEmpty("Run published service", Project, aspNetProcess.Process)); ErrorMessages.GetFailedProcessMessageOrEmpty("Run published service", Project, aspNetProcess.Process));
} }
else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && Environment.OSVersion.Version < new Version(6, 2)) else if (RuntimeInformation.IsOSPlatform(OSPlatform.Windows) && Environment.OSVersion.Version < new Version(6, 2))

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

@ -606,7 +606,7 @@ For more information on configuring HTTPS see https://go.microsoft.com/fwlink/?l
<value>The request trailers are not available yet. They may not be available until the full request body is read.</value> <value>The request trailers are not available yet. They may not be available until the full request body is read.</value>
</data> </data>
<data name="HTTP2NoTlsOsx" xml:space="preserve"> <data name="HTTP2NoTlsOsx" xml:space="preserve">
<value>HTTP/2 over TLS is not supported on OSX due to missing ALPN support.</value> <value>HTTP/2 over TLS is not supported on macOS due to missing ALPN support.</value>
</data> </data>
<data name="HTTP2NoTlsWin7" xml:space="preserve"> <data name="HTTP2NoTlsWin7" xml:space="preserve">
<value>HTTP/2 over TLS is not supported on Windows 7 due to missing ALPN support.</value> <value>HTTP/2 over TLS is not supported on Windows 7 due to missing ALPN support.</value>

2
src/Servers/Kestrel/test/FunctionalTests/Http2/HandshakeTests.cs
View File

@ -53,7 +53,7 @@ namespace Microsoft.AspNetCore.Server.Kestrel.FunctionalTests.Http2
}); });
})); }));
Assert.Equal("HTTP/2 over TLS is not supported on OSX due to missing ALPN support.", ex.Message); Assert.Equal("HTTP/2 over TLS is not supported on macOS due to missing ALPN support.", ex.Message);
} }